Merge pull request 'master' (#766) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/766

src/views/home/index.vue

@@ -22,16 +22,15 @@
                 刷新一下
                 <div style="width: 31px"></div>
               </template>
-              <el-tab-pane :label="'待办（'+todoNum +'）'" name="first">
+              <el-tab-pane :label="'待办（'+todoList.length +'）'" name="first">
                 <div class="todo-top">
                   <div class="bell">
                     <el-icon size="20" color="#F55815">
                       <BellFilled/>
                     </el-icon>
-                    <span>您有{{ todoNum }}条待办需要处理</span>
+                    <span>您有{{ todoList.length }}条待办需要处理</span>
                   </div>
                   <div class="todo-more">
-                    <!--                    <el-icon color="#1F63E6" size="18"><RefreshRight /></el-icon>-->
                     <span>查看更多</span>
                     <el-icon color="#1F63E6" size="18">
                       <ArrowRight/>
@@ -150,7 +149,6 @@
             </div>
             <div class="fund-pie">专项资金项目统计图</div>
           </div>
-
         </div>
       </el-col>
       <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
@@ -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,12 +625,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 +658,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 +689,7 @@ const fundPieOption = ref({
       },
       data: [
         {value: 75, name: '专项资金',},
-        {value: 20, name: '非专项资金',},
+        {value: 20, name: '非专项资金', selected: true},
       ],
     },
     {
@@ -738,10 +740,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: '融智投资管理公司'},
       ],
     },
   ]
@@ -761,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) => {

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()

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()