修改

dsk-operate-ui/src/router/index.js

@@ -116,7 +116,7 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/financingDetails',
+    path: '/financing',
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
@@ -125,7 +125,7 @@ export const constantRoutes = [
         path: '/macro/financing/details/:id(\\d+)',
         component: () => import('@/views/macro/financing/details'),
         name: 'financingDetails',
-        meta: { title: '区域专项债详情'}
+        meta: { title: '区域专项债详情',icon: ''}
       }
     ]
   },

dsk-operate-ui/src/views/macro/economies/index.vue

@@ -32,7 +32,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'four',
+      activeName: 'first',
       dataQuery:{},
       province:''
     }

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -68,7 +68,7 @@
   // import LocalEnterprises from './component/localEnterprises'
   // import Offsite from './component/offsite'
   import aptitudeCode from '@/assets/json/aptitudeCode'
-  import { countGroupByMonth,countGroupByProvince,getYear } from '@/api/macro/macro'
+  import { enterprise } from '@/api/macro/macro'
 export default {
   name: 'Enterprises',
   // components: {LocalEnterprises,Offsite},

dsk-operate-ui/src/views/macro/financing/index.vue

@@ -11,15 +11,16 @@
             :data="tableData"
             element-loading-text="Loading"
             border
+            show-summary
             height="360"
             fit
             @sort-change="sortChange"
             highlight-current-row
           >
             <el-table-column prop="name" label="项目类型" width="150" />
-            <el-table-column prop="value" label="项目个数" sortable="custom" width="140" />
-            <el-table-column prop="totalInvestment" label="投资额（亿元）" sortable="custom" width="140" />
-            <el-table-column prop="proportion" label="比例" width="140" sortable="custom" />
+            <el-table-column prop="number" label="项目个数" sortable="custom" width="140" />
+            <el-table-column prop="value" label="投资额（亿元）" sortable="custom" width="140" />
+            <el-table-column prop="proportion" label="比例（%）" width="140" sortable="custom" />
           </el-table>
         </div>
       </div>
@@ -37,6 +38,7 @@
           v-loading="tableLoading"
           :data="listData"
           element-loading-text="Loading"
+          @sort-change="sortChange1"
           border
           fit
           highlight-current-row
@@ -49,10 +51,10 @@
               <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
             </template>
           </el-table-column>
-          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" sortable width="155" />
-          <el-table-column prop="projectCapital" label="项目资本金（亿）" sortable  width="155" />
-          <el-table-column prop="econData007" label="项目收益倍数（倍）" width="150" />
-          <el-table-column prop="zxz" label="专项债金额（亿）" width="150" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" sortable="custom" width="155" />
+          <el-table-column prop="projectCapital" label="项目资本金（亿）" sortable="custom"  width="155" />
+          <el-table-column prop="econData007" label="项目收益倍数（倍）" sortable="custom" width="150" />
+          <el-table-column prop="zxz" label="专项债金额（亿）" sortable="custom" width="150" />
           <el-table-column prop="specialCapital" label="专项债用作资本金（亿）" width="170" />
           <el-table-column prop="projectEntity" label="项目主体">
             <!--<template slot-scope="scope">-->
@@ -126,8 +128,9 @@ export default {
         for(var i=0;i<res.data.length;i++){
           var obj={};
           obj.name=res.data[i].projectType;
-          obj.value=res.data[i].count;
-          obj.totalInvestment=res.data[i].totalInvestment;
+          obj.value=res.data[i].totalInvestment;
+          obj.number=res.data[i].count;
+          // obj.totalInvestment=res.data[i].totalInvestment;
           obj.proportion=res.data[i].proportion;
           list.push(obj)
         }
@@ -140,8 +143,6 @@ export default {
         for(let i=0; i<10; i++){
           data.push(arr[i])
         }
-        console.log(arr)
-        console.log(data)
         this.initChart(data)
       })
     },
@@ -156,8 +157,8 @@ export default {
           formatter: function (params) {
             var result = ''
             result+='<h3 style="color: #232226;padding: 0 0 5px 0;margin: 0;">'+ params.data.name +'</h3>'
-            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.value +'个</p>'
-            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.totalInvestment +'亿元</p>'
+            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.number +'个</p>'
+            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.value +'亿元</p>'
             result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.proportion +'%</p>'
             return result;
           },
@@ -189,8 +190,10 @@ export default {
       myChart.setOption(option);
     },
     sortChange({ column, prop, order }){
-      if(prop === 'value'){
+      if(prop === 'number'){
         this.queryParams.field = 'count'
+      }else if(prop === 'value'){
+        this.queryParams.field = 'totalInvestment '
       }else {
         this.queryParams.field = prop
       }
@@ -233,6 +236,19 @@ export default {
       this.pageIndex = val
       this.getData()
     },
+    sortChange1({ column, prop, order }){
+      this.tableParams.field = prop;
+      if(column.order === "ascending"){
+        this.tableParams.order = 'asc'
+      }else if(column.order === "descending"){
+        this.tableParams.order = 'desc'
+      }else {
+        this.tableParams.order=''
+        this.tableParams.field=''
+      }
+      this.pageIndex=1;
+      this.getData()
+    },
   }
 }
 </script>