From 21cc38ed73409813ad19643a1feee2cf475d515e Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 12 Sep 2024 21:40:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E9=A5=BC?= =?UTF-8?q?=E5=9B=BE=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c72c063..182785f 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -623,12 +623,11 @@ const fundPieOption = ref({ align: 'left', icon: 'circle', textStyle: { - color: '#000', + color:'rgba(0,0,0,0.6)', fontSize: '14px' }, formatter: function (name) { let data = fundPieOption.value.series[0].data - // console.log(data, 'data') let total = 0 let tarValue for (let i = 0; i < data.length; i++) { @@ -657,15 +656,16 @@ const fundPieOption = ref({ series: [ { type: 'pie', - radius: [85, 100], + radius: [75, 100], center: ['50%', '50%'], top: '10%', label: { show: false, - formatter: '{b}: {c} ({d}%)', }, itemStyle: { normal: { + borderWidth: 10,//设置边框粗细 + borderColor: '#fff', color: function (params) { const colorList = [ ['#6101ff', '#a965ff'], @@ -687,7 +687,7 @@ const fundPieOption = ref({ }, data: [ {value: 75, name: '专项资金',}, - {value: 20, name: '非专项资金',}, + {value: 20, name: '非专项资金',selected:true }, ], }, { @@ -738,10 +738,14 @@ const moneyPieOption = ref({ } }, }, + itemStyle:{ + borderWidth: 10,//设置边框粗细 + borderColor: '#fff' + }, data: [ {value: 30000, name: '智汇未来科技公司',}, - {value: 10000, name: '云航信息技术公司',}, - {value: 5000, name: '融智投资管理公司',}, + {value: 10000, name: '云航信息技术公司'}, + {value: 5000, name: '融智投资管理公司' }, ], }, ] From fa977c5134f467d540011633fb3e81df89c3a84a Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Thu, 12 Sep 2024 21:55:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=BE=85=E7=AB=8B=E9=A1=B9=E7=AD=89=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/index.vue | 57 ++++++++++++++----- .../implementation/index.vue | 6 ++ .../project-management/initiation/index.vue | 6 ++ 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 182785f..488e80d 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -22,16 +22,15 @@ 刷新一下
- +
- 您有{{ todoNum }}条待办需要处理 + 您有{{ todoList.length }}条待办需要处理
- 查看更多 @@ -150,7 +149,6 @@
专项资金项目统计图
- @@ -273,28 +271,32 @@ const taskTabList = ref([ color: '#CEE8FA', textColor: '#0043C5', icon: 'home1.png', - num: 21 + num: 21, + type: 'pending' }, { title: '已立项', color: '#DCCEFA', textColor: '#8600C5', icon: 'home2.png', - num: 2 + num: 2, + type: 'approved' }, { title: '实施中', color: '#FAE6CE', textColor: '#F47D0E', icon: 'home3.png', - num: 4 + num: 4, + type: 'carryout' }, { title: '已验收', color: '#CEFAD8', textColor: '#01A089', icon: 'home4.png', - num: 1 + num: 1, + type: 'check' } ]) const todoList = ref([ @@ -623,7 +625,7 @@ const fundPieOption = ref({ align: 'left', icon: 'circle', textStyle: { - color:'rgba(0,0,0,0.6)', + color: 'rgba(0,0,0,0.6)', fontSize: '14px' }, formatter: function (name) { @@ -687,7 +689,7 @@ const fundPieOption = ref({ }, data: [ {value: 75, name: '专项资金',}, - {value: 20, name: '非专项资金',selected:true }, + {value: 20, name: '非专项资金', selected: true}, ], }, { @@ -738,14 +740,14 @@ const moneyPieOption = ref({ } }, }, - itemStyle:{ + itemStyle: { borderWidth: 10,//设置边框粗细 borderColor: '#fff' }, data: [ {value: 30000, name: '智汇未来科技公司',}, {value: 10000, name: '云航信息技术公司'}, - {value: 5000, name: '融智投资管理公司' }, + {value: 5000, name: '融智投资管理公司'}, ], }, ] @@ -765,7 +767,36 @@ window.addEventListener('resize', () => { }) const clickGotoListPage = (item) => { - console.info("🚀 ~method:clickGotoListPage -----", item.title) + console.info("🚀 ~method:clickGotoListPage -----", item.type) + if (item.type === 'pending') { + router.push({ + name: 'Initiation', + query: { + state: 0 + } + }) + } else if (item.type === 'approved') { + router.push({ + name: 'Initiation', + query: { + state: 4 + } + }) + } else if (item.type === 'carryout') { + router.push({ + name: 'Implementation', + query: { + state: 0 + } + }) + } else if (item.type === 'check') { + router.push({ + name: 'Implementation', + query: { + state: 4 + } + }) + } } const getImgUrl = (name) => { diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue index a16f15f..eb93706 100644 --- a/src/views/project-management/implementation/index.vue +++ b/src/views/project-management/implementation/index.vue @@ -12,6 +12,7 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue' import {toThousands} from '@/utils/changePrice.js' import { getSubCompOpt } from '@/api/user/user.js'; +const route = useRoute() const router = useRouter() const shortcuts = [ { @@ -443,6 +444,11 @@ const handlePhaseChangeEdit = (row) => { const init = async () => { const res = await getSubCompOpt() searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data + if(route.query.state=='0'){ + search({state:route.query.state}) + }else if(route.query.state=='4'){ + search({state:route.query.state}) + } } init() diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue index 18f2fc4..14b32b7 100644 --- a/src/views/project-management/initiation/index.vue +++ b/src/views/project-management/initiation/index.vue @@ -11,6 +11,7 @@ import fvSelect from '@/fvcomponents/fvSelect/index.vue' import {toThousands} from '@/utils/changePrice.js' import { getSubCompOpt } from '@/api/user/user.js'; +const route = useRoute() const router = useRouter() const shortcuts = [ { @@ -355,6 +356,11 @@ const handleApply = (row) => { const init = async () => { const res = await getSubCompOpt() searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data + if(route.query.state=='0'){ + search({state:route.query.state}) + }else if(route.query.state=='4'){ + search({state:route.query.state}) + } } init()