修改

dsk-operate-ui/src/views/detail/party-a/component/skeleton.vue

+<template>
+  <el-skeleton  animated>
+    <template slot="template">
+      <el-skeleton-item variant="text" style="width: 60%;"/>
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 60%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+    </template>
+  </el-skeleton>
+</template>
+
+<script>
+  export default {
+    name: 'skeleton'
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-skeleton__item{
+  height: 20px;
+  border-radius: 0;
+  margin: 9px 0;
+  background: #f0f0f0;
+}
+</style>

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -8,9 +8,9 @@
       :isExcel="true"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
-      :tableLoading="tableLoading"
+      v-if="!isSkeleton"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -27,11 +27,12 @@ import {
   abnormalYears
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'BusinessAnomaly',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -56,6 +57,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -68,11 +70,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       abnormalPage(data).then(res => {
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     years(){

dsk-operate-ui/src/views/detail/party-a/riskInformation/courtNotice.vue

@@ -8,9 +8,9 @@
       :isExcel="true"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
-      :tableLoading="tableLoading"
+      v-if="!isSkeleton"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -29,11 +29,12 @@ import {
   noticesCaseReason
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'CourtNotice',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -60,6 +61,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -74,11 +76,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       noticesPage(data).then(res => {
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     // 公告

dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue

@@ -8,10 +8,10 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
+      v-if="!isSkeleton"
       :index-fixed="true"
-      :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -27,11 +27,12 @@ import {
   executedPage
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'Dishonesty',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -56,6 +57,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -67,11 +69,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       executedPage(data).then(res => {
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     }
   }

dsk-operate-ui/src/views/detail/party-a/riskInformation/ifThePerson.vue

@@ -8,9 +8,9 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
-      :tableLoading="tableLoading"
+      v-if="!isSkeleton"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -26,11 +26,12 @@ import {
   executedPersonsPage
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'IfThePerson',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -53,6 +54,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -64,11 +66,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       executedPersonsPage(data).then(res => {
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     }
   }

dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue

@@ -8,9 +8,9 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
-      :tableLoading="tableLoading"
+      v-if="!isSkeleton"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -35,11 +35,12 @@ import {
   lawsuitsRole
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'Judgment',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -68,6 +69,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -81,14 +83,14 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       lawsuitsPage(data).then(res => {
         this.tableData = res.rows
         for (var i=0;i<this.tableData.length;i++){
           this.tableData[i].relatedCompanies = JSON.parse(this.tableData[i].relatedCompanies)
         }
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     lawsuitsCauseActions(){

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -8,10 +8,10 @@
       :isExcel="false"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
       :index-fixed="true"
-      :tableLoading="tableLoading"
+      v-if="!isSkeleton"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -35,11 +35,12 @@ import {
   kaitingPureRole
 } from '@/api/detail/party-a/riskInformation'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'OpenacourtsessionNotice',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -71,6 +72,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -88,14 +90,14 @@ export default {
     },
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       kaitingPage(data).then(res => {
         this.tableData = res.rows
         for (var i=0;i<this.tableData.length;i++){
           this.tableData[i].relatedCompanies = JSON.parse(this.tableData[i].relatedCompanies)
         }
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     kaitingCauseActions(){

dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue

@@ -8,10 +8,10 @@
       :isExcel="true"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
+      v-if="!isSkeleton"
       :indexFixed="true"
-      :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
       :tableDataTotal="tableDataTotal"
@@ -35,11 +35,12 @@ import {
   penalizePage,
   penalizeReasonType
 } from '@/api/detail/party-a/riskInformation'
+import skeleton from '../component/skeleton'
 export default {
   name: 'Punish',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -66,6 +67,7 @@ export default {
       tableData:[],
       tableDataTotal:0,
       showList:[],
+      isSkeleton:true
     }
   },
   created() {
@@ -78,11 +80,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       penalizePage(data).then((res) => {
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     penalizeReasonTypeData(){

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/landAcquisition.vue

@@ -8,8 +8,9 @@
       :isExcel="true"
       @handle-search="handleSearch"
     />
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
+      v-if="!isSkeleton"
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
@@ -32,11 +33,12 @@ import {
   landUse
 } from '@/api/detail/party-a/urbanLnvestment'
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 export default {
   name: 'landAcquisition',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId'],
   data() {
@@ -66,6 +68,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   created() {
@@ -78,11 +81,11 @@ export default {
   methods: {
     handleQuery(params) {
       let data = params ? params : this.queryParams
-      this.tableLoading = true
+      this.isSkeleton = true
       landTransactionPage(data).then(res=>{
         this.tableData = res.rows
         this.tableDataTotal = res.total
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     //土地用途

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -6,7 +6,8 @@
       </div>
       <div class="params-dw"><img src="@/assets/images/addree.png" />{{ addressList }}</div>
     </div>
-    <div class="table-item">
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+    <div class="table-item" v-if="!isSkeleton">
       <el-table
         :tableLoading="tableLoading"
         :data="getValues"
@@ -29,13 +30,14 @@
 
 <script>
 import dataRegion from '@/assets/json/dataRegion'
+import skeleton from '../component/skeleton'
 import {
   regionalEconomy
 } from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'regionalEconomies',
   components: {
-
+    skeleton
   },
   props: ['companyId','companyInfo'],
   data() {
@@ -209,7 +211,8 @@ export default {
           label: '债务率-宽口径（%）',
         },
       ],
-      tableLoading: true
+      tableLoading: true,
+      isSkeleton:true
     }
   },
   created() {
@@ -228,11 +231,11 @@ export default {
   methods: {
     //地区
     regionalEconomys() {
-      this.tableLoading = true
+      this.isSkeleton = true
       if(this.companyInfo){
         regionalEconomy(this.params).then(res => {
           this.tableData = res.data
-          this.tableLoading = false
+          this.isSkeleton = false
         })
         this.dataRegion(this.companyInfo.provinceId, this.companyInfo.cityId)
       }

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -87,8 +87,9 @@
         </div>
       </template>
     </head-form>
-
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
     <tables
+      v-if="!isSkeleton"
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
@@ -118,6 +119,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
+import skeleton from '../component/skeleton'
 import dataRegion from '@/assets/json/dataRegion'
 import {
   urbanInvestmentPage,
@@ -127,7 +129,7 @@ export default {
   name: 'SameRegion',
   mixins: [mixin],
   components: {
-
+    skeleton
   },
   props: ['companyId', 'companyInfo'],
   data() {
@@ -200,6 +202,7 @@ export default {
       tableLoading:false,
       tableData:[],
       tableDataTotal:0,
+      isSkeleton:true
     }
   },
   watch:{
@@ -338,12 +341,12 @@ export default {
     },
 
     handleQuery(params){
-      this.tableLoading = true
+      this.isSkeleton = true
       let data = params ? params : this.queryParams
       urbanInvestmentPage(data).then(res => {
           this.tableData = res.data.list
           this.tableDataTotal = res.data.totalCount
-        this.tableLoading = false
+        this.isSkeleton = false
       })
     },
     //排序

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

@@ -108,6 +108,9 @@
 export default {
   name: 'comparison',
   props:['dataQuery','provinceId'],
+  components: {
+
+  },
   data() {
     return {
       queryParams: {
@@ -292,7 +295,8 @@ export default {
       regionData:[],
       compareList:[{},{},{},{},{}],
       fixed: false,
-      StyWidth:null
+      StyWidth:null,
+      isSkeleton:true
     }
   },
   watch: {

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

 <template>
   <div class="regionalEconomy">
-    <div class="flex-box query-box">
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+    <div v-if="!isSkeleton" class="flex-box query-box">
       <div class="flex-box query-params">
         <span class="common-title">主要指标</span>
         <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
@@ -15,7 +16,7 @@
         <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
-    <div class="content">
+    <div v-if="!isSkeleton" class="content">
       <div class="content-left">
         <div id="echarts"  style="height: 400px"></div>
         <p class="tips">  注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
@@ -29,18 +30,19 @@
           highlight-current-row
           :summary-method="getSummaries"
           show-summary
+          @sort-change="sortChange"
         >
           <el-table-column label="序号" width="60" align="left">
             <template slot-scope="scope">{{ scope.$index + 2 }}</template>
           </el-table-column>
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
-            <el-table-column prop="money" label="金额（亿元）" sortable></el-table-column>
-            <el-table-column prop="rate" label="占比（%）"> </el-table-column>
+            <el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus"></el-table-column>
+            <el-table-column prop="rate" label="占比（%）" sortable> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
-            <el-table-column prop="lastMoney" label="金额（亿元）" sortable> </el-table-column>
-            <el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
+            <el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus"> </el-table-column>
+            <el-table-column prop="lastRate" label="占比（%）"  sortable> </el-table-column>
           </el-table-column>
         </el-table>
       </div>
@@ -57,9 +59,13 @@
 <script>
   import * as echarts from 'echarts';
   import { bidGroupCountByProjectType,bidMoneyGroupByProjectType,getYears } from '@/api/macro/macro'
+  import skeleton from '../../component/skeleton'
 export default {
   name: 'industrialStructure',
   props:['dataQuery','provinceId'],
+  components: {
+    skeleton
+  },
   data() {
     return {
       queryParams: {
@@ -68,11 +74,13 @@ export default {
       },
       yearOptions: [],
       tableData:[],
+      tabData:[],
       tableLoading: false,
       data:[],
       oneYear:'',
       twoYear:'',
-      state:false
+      state:false,
+      isSkeleton:true
     }
   },
   watch: {
@@ -86,11 +94,11 @@ export default {
       this.yearOptions=res.data.reverse();
       this.queryParams.year = this.yearOptions[0].year;
     })
-    this.getData()
-    this.getGroupCount()
 
-    this.$nextTick(()=>{
 
+    this.$nextTick(()=>{
+      this.getData()
+      this.getGroupCount()
     })
   },
   methods: {
@@ -112,6 +120,7 @@ export default {
       if(this.provinceId.length >= 2){
         params.county=this.provinceId[2]
       }
+
       bidMoneyGroupByProjectType(params).then(res => {
         if(res.data.length > 0){
           let list=[]
@@ -133,16 +142,18 @@ export default {
             }
           }
           for(let i=0; i<list.length; i++){
-            list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
+            // list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
             list[i].rate=list[i].rate ? Number(list[i].rate).toFixed(2) : '-';
-            list[i].lastMoney=list[i].lastMoney ? Number(list[i].lastMoney).toFixed(2) : '-';
+            // list[i].lastMoney=list[i].lastMoney ? Number(list[i].lastMoney).toFixed(2) : '-';
             list[i].lastRate=list[i].lastRate ? Number(list[i].lastRate).toFixed(2) : '-';
           }
           this.tableData=list.reverse()
+          this.tabData=list.reverse()
         }
       })
     },
     getGroupCount(){
+      this.isSkeleton = true
       let mydate=new Date();
       let startTime=''
       let endTime=''
@@ -164,6 +175,7 @@ export default {
         params.county=this.provinceId[2]
       }
       bidGroupCountByProjectType(params).then(res => {
+        this.isSkeleton = false
         if(res.code === 200){
           let list=[]
           for(let i=0; i<res.data.length; i++){
@@ -174,7 +186,9 @@ export default {
           }
           this.data=list;
           // if(list.length > 0){
+          this.$nextTick(() => {
             this.initChart()
+          })
           // }
         }
       })
@@ -270,6 +284,47 @@ export default {
       });
       return sums;
     },
+    sortChange(column) {
+      if (column.order !== null && column.prop) {
+        let data1 = [];
+        let data2 = [];
+        for (let i = 0; i < this.tableData.length; i++) {
+          this.tableData[i].money=this.tableData[i].money ? Number(this.tableData[i].money) : 0
+          this.tableData[i].lastMoney=Number(this.tableData[i].lastMoney)
+          let temp = null;
+          temp = this.tableData[i][column.prop];
+          if (temp === null || typeof temp == "undefined") {
+            data2.push(this.tableData[i]);
+          } else {
+            data1.push(this.tableData[i]);
+          }
+        }
+        if (column.order === "ascending") {
+          data1 = data1.sort(this.compare(column.prop, "ascending"));
+        } else {
+          data1 = data1.sort(this.compare(column.prop, "descending"));
+        }
+        this.$nextTick(() => {
+          this.tableData = data1.concat(data2);
+        });
+      }
+      if (column.order === null) {
+        this.tableData = this.tabData; // tabData存放的是list副本，不排序时恢复到初始状态
+      }
+      this.$forceUpdate()
+    },
+    compare(property, type, prop) {
+      return function(obj1, obj2) {
+        if (type === "ascending") {
+          return obj1[property] - obj2[property];
+        } else {
+          return obj2[property] - obj1[property];
+        }
+      };
+    },
+    formatStatus: function(row, column, cellValue) {
+      return cellValue? Number(cellValue).toFixed(2) : '-'
+    },
 
   }
 }

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

 <template>
   <div class="regionalEconomy">
-    <div class="content">
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+    <div v-if="!isSkeleton" class="content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">经济数据</span>
@@ -52,15 +53,18 @@
         <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
   import { nationalPage,getYears } from '@/api/macro/macro'
+  import skeleton from '../../component/skeleton'
 export default {
   name: 'localEconomy',
   props:['dataQuery','provinceId'],
+  components: {
+    skeleton
+  },
   data() {
     return {
       queryParams: {
@@ -74,7 +78,8 @@ export default {
       pageSize: 20,
       tableDataTotal: 0,
       show_page:true,
-      MaxPage:500
+      MaxPage:500,
+      isSkeleton:true
     }
   },
   watch: {
@@ -95,6 +100,7 @@ export default {
   },
   methods: {
     getData(){
+      this.isSkeleton = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:2 }
       if(this.queryParams.field){
         params.field=this.queryParams.field
@@ -113,6 +119,7 @@ export default {
       }
       // params.provinceIds=[this.dataQuery.provinceId]
       nationalPage(params).then(res => {
+        this.isSkeleton = false
         this.tableData = res.data.list
         this.tableDataTotal = res.data.totalCount
       })

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

@@ -3,25 +3,28 @@
     <div class="header">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
-        <el-tab-pane label="全国招标市场分析" name="second"></el-tab-pane>
+        <el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
         <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
+        <el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
       </el-tabs>
     </div>
 
     <Economic v-if="activeName === 'first'"></Economic>
-    <ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
-    <ZhongBiao v-if="activeName === 'third'"></ZhongBiao>
+    <Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
+    <Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
+    <Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
   </div>
 </template>
 
 <script>
   import Economic from './component/qgjjdq'
-  import ZhaoBiao from './component/zhaobiao'
-  import ZhongBiao from './component/zhongbiao'
+  import Sjxmfx from './component/sjxmfx'
+  import Jzqyfx from './component/jzqyfx'
+  import Zhongbiao from './component/zhongbiao'
 export default {
   name: 'NationalEconomies',
   components: {
-    Economic,ZhaoBiao,ZhongBiao
+    Economic,Sjxmfx,Jzqyfx,Zhongbiao
   },
   data() {
     return {

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -128,7 +128,6 @@
       }
       getGZDB(params).then(result=>{
         this.datalist = result.code == 200?result:[]
-        console.log(this.datalist.rows)
         if(this.datalist){
           this.yqnum = `已逾期 ${this.datalist.rows.length} 条`;
         }
@@ -140,7 +139,6 @@
         this.value = ""
       },
       add(){
-
         // if(this.queryParam.task == '' || this.queryParam.dueTime == '')
         if(this.queryParam.task == '')
           return this.$message.warning('时间和内容需填写完整！')