修改

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

@@ -65,9 +65,9 @@
       <div class="common-title">经济信息</div>
       <div class="content-box">
         <span><img src="@/assets/images/economies/icon_1.png">下属辖区 <label>{{recentlyYear.subordinateJurisdiction}}<i>个</i></label></span>
-        <span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>亿</i></label></span>
-        <span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>个</i></label></span>
-        <span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>家</i></label></span>
+        <span><img src="@/assets/images/economies/icon_2.png">城投平台 <label>{{recentlyYear.urbanInvestmentPlatform}}<i>家</i></label></span>
+        <span><img src="@/assets/images/economies/icon_3.png">城投平台授信余额 <label>{{recentlyYear.creditBalance}}<i>亿</i></label></span>
+        <span><img src="@/assets/images/economies/icon_4.png">城投平台营收账款 <label>{{recentlyYear.accountsReceivable}}<i>亿</i></label></span>
         <span><img src="@/assets/images/economies/icon_5.png">城投平台有息债务 <label>{{recentlyYear.uipInterestBearingDebt}}<i>亿</i></label></span>
       </div>
     </div>

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

@@ -11,6 +11,7 @@
             :data="tableData"
             element-loading-text="Loading"
             border
+            :summary-method="getSummaries"
             show-summary
             height="360"
             fit
@@ -51,11 +52,11 @@
               <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="项目总投资（亿）" :formatter="formatStatus" sortable="custom" width="155" />
-          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" sortable="custom"  width="155" />
-          <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" sortable="custom" width="150" />
-          <el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" :formatter="formatStatus" width="170" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
+          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
+          <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
+          <!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
           <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
@@ -226,7 +227,35 @@ export default {
         this.tableData=list;
       })
     },
+    getSummaries(param){
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }
+        if (index === 3) {
+          sums[index] = '100';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        sums[index] = values.reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return Number(Number(prev) + Number(curr)).toFixed(3)
+          } else {
+            return prev;
+          }
+        }, 0);
 
+        if (index === 1) {
+          sums[index] = Number(sums[index]).toFixed(0);
+          return;
+        }
+      });
+      return sums;
+    },
     // 重置页数
     handleSizeChange(val) {
       this.pageIndex = 1

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

@@ -473,39 +473,60 @@ export default {
     changeType(item,index){
       switch (index) {
         case 1:
+          if(item === ''){
+            this.queryParams.uipBusinessType=[]
+          }else {
             if (this.queryParams.uipBusinessType.indexOf(item) !== -1) {
               this.queryParams.uipBusinessType.splice(this.queryParams.uipBusinessType.indexOf(item), 1);
             } else {
               this.queryParams.uipBusinessType.push(item);
             }
+          }
           break;
         case 2:
+          if(item === ''){
+            this.queryParams.bratingSubjectLevel=[]
+          }else {
             if (this.queryParams.bratingSubjectLevel.indexOf(item) !== -1) {
               this.queryParams.bratingSubjectLevel.splice(this.queryParams.bratingSubjectLevel.indexOf(item), 1);
             } else {
               this.queryParams.bratingSubjectLevel.push(item);
             }
+          }
           break;
         case 3:
+          if(item === ''){
+            this.queryParams.shareholderBg=[]
+          }else {
             if (this.queryParams.shareholderBg.indexOf(item) !== -1) {
               this.queryParams.shareholderBg.splice(this.queryParams.shareholderBg.indexOf(item), 1);
             } else {
               this.queryParams.shareholderBg.push(item);
             }
+          }
+
           break;
         case 4:
+          if(item === ''){
+            this.queryParams.equityRelationship=[]
+          }else {
             if (this.queryParams.equityRelationship.indexOf(item) !== -1) {
               this.queryParams.equityRelationship.splice(this.queryParams.equityRelationship.indexOf(item), 1);
             } else {
               this.queryParams.equityRelationship.push(item);
             }
+          }
           break;
         case 5:
+          if(item === ''){
+            this.queryParams.platformImportance=[]
+          }else {
             if (this.queryParams.platformImportance.indexOf(item) !== -1) {
               this.queryParams.platformImportance.splice(this.queryParams.platformImportance.indexOf(item), 1);
             } else {
               this.queryParams.platformImportance.push(item);
             }
+          }
           break;
       }
       this.pageIndex = 1;
@@ -560,6 +581,7 @@ export default {
         .search-box{
           display: inline-block;
           margin-right: 32px;
+          margin-left: 32px;
           /*cursor: pointer;*/
           color:#232323;
           position: relative;