diff --git a/web/src/assets/images/circlec.png b/web/src/assets/images/circlec.png new file mode 100644 index 0000000..69567a2 Binary files /dev/null and b/web/src/assets/images/circlec.png differ diff --git a/web/src/assets/images/circley.png b/web/src/assets/images/circley.png new file mode 100644 index 0000000..9525daa Binary files /dev/null and b/web/src/assets/images/circley.png differ diff --git a/web/src/views/login/index.vue b/web/src/views/login/index.vue index 56bb59a..7d9cbdf 100644 --- a/web/src/views/login/index.vue +++ b/web/src/views/login/index.vue @@ -61,11 +61,14 @@ const loginInfo = ref({ initLoginInfo() function initLoginInfo() { - const localLoginInfo = lStorage.get('loginInfo') - if (localLoginInfo) { - loginInfo.value.phone = localLoginInfo.phone || '' - loginInfo.value.password = localLoginInfo.password || '' + if(localStorage.getItem('phone')){ + loginInfo.value.phone = localStorage.getItem('phone') } + // const localLoginInfo = lStorage.get('loginInfo') + // if (localLoginInfo) { + // loginInfo.value.phone = localLoginInfo.phone || '' + // loginInfo.value.password = localLoginInfo.password || '' + // } } const loading = ref(false) @@ -93,7 +96,7 @@ async function handleLogin() { setToken(res.error.access_token) if (query.redirect) { const path = query.redirect - console.log('path', { path, query }) + localStorage.setItem('phone', phone) Reflect.deleteProperty(query, 'redirect') router.push({ path, query }) } else { diff --git a/web/src/views/pages/index.vue b/web/src/views/pages/index.vue index 81d17ff..3d8d61e 100644 --- a/web/src/views/pages/index.vue +++ b/web/src/views/pages/index.vue @@ -511,8 +511,11 @@ 文化价值评估 -
90
-
综合评估
+
活态传承系数评估:优秀
纹样基因熵值评估:优秀
@@ -521,7 +524,11 @@ 文化价值风险控制 -
5
+
综合评估
风险调整系数:
@@ -559,6 +566,8 @@ import backgroundImg1 from '@/assets/images/bgc.png'; import backgroundImg2 from '@/assets/images/bgy.png'; import backgroundImg3 from '@/assets/images/bgg.png'; import backgroundImg4 from '@/assets/images/circleg.png'; +import backgroundImg5 from '@/assets/images/circley.png'; +import backgroundImg6 from '@/assets/images/circlec.png'; const status = ref('create') const message = useMessage() const modalFormRef = ref(null) @@ -572,7 +581,7 @@ const steps = [ ]; const loading = ref(false) const actionUrl = 'https://value.cdcee.net/api/v1/upload/image' -const currentStep = ref(0) +const currentStep = ref(4) const historyList = ref([]) const modalForm = reactive({ asset_name: '', @@ -879,16 +888,16 @@ const fundingOptions2 = [ const circulationOptions = [ { label:'孤品:全球唯一,不可复制(如特定版权、唯一实物)', - value: '0', + value: '孤品:全球唯一,不可复制(如特定版权、唯一实物)', },{ label:'限量:总发行份数 ≤100份', - value: '1', + value: '限量:总发行份数 ≤100份', },{ label:'稀有:总发行份数∈[100, 1000]份,或二级市场流通率 < 5%', - value: '2', + value: '稀有:总发行份数∈[100, 1000]份,或二级市场流通率 < 5%', },{ label:'流通:总发行份数 >1000份,或二级市场流通率 ≥ 5%', - value: '3', + value: '流通:总发行份数 >1000份,或二级市场流通率 ≥ 5%', }, ] const activityOptions = [ @@ -1031,14 +1040,7 @@ import { unref } from 'vue' const router = useRouter() const navToLogin = () => { - console.log(221) - const currentRoute = unref(router.currentRoute) - const needRedirect = - !currentRoute.meta.requireAuth && !['/404', '/login'].includes(router.currentRoute.value.path) - router.replace({ - path: '/login', - query: needRedirect ? { ...currentRoute.query, redirect: currentRoute.path } : {}, - }) + userStore.logout() } const nextStep = () => { console.log(modalForm) @@ -1072,8 +1074,8 @@ const submit = () => { historical_evidence: { artifacts: modalForm.historical_evidence[0], ancient_literature: modalForm.historical_evidence[1], - inheritor_testimony: modalForm.historical_evidence[3], - modern_research: modalForm.historical_evidence[4] + inheritor_testimony: modalForm.historical_evidence[2], + modern_research: modalForm.historical_evidence[3] }, patent_certificates: modalForm.patent_certificates.map(item => item.url), pattern_images: modalForm.pattern_images.map(item => item.url), @@ -1151,8 +1153,10 @@ const selectTimeBox = (item) => { selectedObj.value = item if(item.status == 'success'){ setTimeout(() => { - getEcharts() - }, 500); + getEcharts(economy.value, 75, '#16CEB9', '#6648FF') + getEcharts(culture.value, 50, '#ffdd00', '#ffbb05') + getEcharts(risk.value, 5, '#5ad775', '#2fab43') + }, 0); } } @@ -1178,15 +1182,19 @@ const deleteValuations = (item) => { } import * as echarts from 'echarts'; import type { ECharts, EChartsOption } from 'echarts'; +import { useUserStore } from '@/store' +const userStore = useUserStore() const economy = ref(null); +const culture = ref(null); +const risk = ref(null); // 存储ECharts实例 const chartInstance = ref(null); -const getEcharts= ()=>{ - console.log(economy.value) - if (!economy.value) return; +const getEcharts= (item, value, color1, color2)=>{ + console.log(item) + if (!item) return; // 创建实例 - chartInstance.value = echarts.init(economy.value); + chartInstance.value = echarts.init(item); // 定义半圆形进度环配置 const chartOptions = ref({ title: [{ @@ -1198,7 +1206,7 @@ const getEcharts= ()=>{ fontWeight: 100, } }, { - text: '75', + text: value, top: '45%', textStyle: { fontSize: '26', @@ -1230,14 +1238,14 @@ const getEcharts= ()=>{ roundCap: true, barWidth: 90, data: [{ - value: 75, + value: value, itemStyle: { color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{ offset: 1, - color: '#16CEB9', + color: color1, },{ offset: 0, - color: '#6648FF', + color: color2, }, ]), }