修改

dsk-operate-ui/src/api/macro/macro.js

@@ -174,6 +174,31 @@ export function enterprise(param) {
   })
 }
 
+//城投平台-企业查询选项
+export function uipGroupData() {
+  return request({
+    url: '/enterprise/uipGroupData',
+    method: 'POST'
+  })
+}
+
+//城投平台-分页列表
+export function urbanInvestmentPage(param) {
+  return request({
+    url: '/urbanInvestment/page',
+    method: 'POST',
+    data: param
+  })
+}
+//城投平台-城投平台统计
+export function urbanInvestmentStatistics(param) {
+  return request({
+    url: '/urbanInvestment/statistics',
+    method: 'POST',
+    data: param
+  })
+}
+
 
 
 

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -24,7 +24,11 @@
           highlight-current-row
           @sort-change="sortChange"
         >
-          <el-table-column prop="province" label="下辖区" width="100" :formatter="formatStatus"/>
+          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus">
+            <template slot-scope="scope">
+              {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
+            </template>
+          </el-table-column>
           <el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="gdpGrowth" label="GDP增速" sortable width="100" :formatter="formatStatus"/>
           <el-table-column prop="gdpPerCapita" label="人均GDP（元）" sortable width="130" :formatter="formatStatus"/>

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

@@ -182,10 +182,11 @@ export default {
       var year = date.getFullYear()
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
       var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-      var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-      var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-      var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-      return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+      // var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+      // var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+      // var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
     }
   }
 }

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

@@ -139,6 +139,7 @@ export default {
         let arr=this.tableData.sort((old,New)=>{
           return  New.value - old.value
         })
+        console.log(arr)
         let data=[]
         for(let i=0; i<10; i++){
           data.push(arr[i])
@@ -215,13 +216,12 @@ 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.proportion=res.data[i].proportion;
           list.push(obj)
         }
         this.tableData=list;
-
       })
     },
 

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -41,9 +41,9 @@
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="地区" min-width="70" align="left" fixed>
+          <el-table-column label="地区" min-width="150" align="left" fixed>
             <template slot-scope="scope">
-              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}</router-link>
+              <router-link :to="{path:'/macro/economies',query:{id:scope.row.id,provinceId:scope.row.provinceId}}" tag="a" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</router-link>
             </template>
           </el-table-column>
           <el-table-column label="年度明细" prop="id" width="90" align="center" fixed>