基础指标对标服务联调

src/components/assessment/benchmarkingIndicBasicPage.vue

@@ -68,12 +68,12 @@
                 <el-table :data="benchmarkBasicPageData" style="width: 100%" :class="unitRatingTableSty()" v-else>
                     <el-table-column type="index" label="序号" align="center"></el-table-column>
                     <el-table-column prop="time" label="频度" align="center"></el-table-column>
-                    <el-table-column v-for="(it, index) in benchmarkBasicHeader" :key="index" :label="it.name"
+                    <el-table-column v-for="(it, index) in benchmarkBasic2Header" :key="index" :label="it.name"
                         align="center">
 
                         <el-table-column prop="state" label="本期" align="center">
                             <template #default="scope">
-                                <span>{{scope.row[it.code+'_b']}}</span>
+                                <span>{{scope.row[it.code]}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="city" label="同期" v-if="showType === '2'" align="center">
@@ -96,8 +96,8 @@
 
 <script>
     import seachs from '../seachGroup.vue'
-    import baxicjson from '../basicJSON.json'
-    import baxic2json from '../basic2JSON.json'
+    // import baxicjson from '../basicJSON.json'
+    // import baxic2json from '../basic2JSON.json'
     import {
         apiPostbenchmarkBasicList,
         apiPostbenchmarkcontemporaneousData,
@@ -115,6 +115,7 @@
                 statesVisible: false,
                 benchmarkBasicPageData: [],
                 benchmarkBasicHeader: [],
+                benchmarkBasic2Header: [],
                 orgVal: [],
                 itemVal: '',
                 evalVal: '',
@@ -127,8 +128,8 @@
                 winPix: window.devicePixelRatio,
                 innerWidth: window.innerWidth,
                 showType: '1',
-                baxicjson: baxicjson,
-                baxic2json: baxic2json
+                // baxicjson: baxicjson,
+                // baxic2json: baxic2json
             }
         },
         created() {
@@ -148,7 +149,7 @@
         },
         mounted() {
             this.getorgSelectList()
-            this.getbenchmarkBasicList('1')
+            // this.getbenchmarkBasicList('1')
             this.resAnnual = [this.getTime(new Date(new Date().getTime() - 6 * 30 * 24 * 60 * 60 * 1000)), this.getTime(
                 new Date(new Date().getTime()))]
         },
@@ -251,27 +252,16 @@
                     }
                 }
                 apiPostbenchmarkBasicList(params).then(datas => {
+                    this.benchmarkBasicPageData = []
                     if (type === '1') {
                         that.changeLineData(datas, type)
                     } else {
                         that.changeBarData(datas, type)
                     }
                 })
-                // if (type === '1') {
-
-                //     // that.changeLineData(that.baxicjson)
-                // } else if (type === '2') {
-                //     apiPostbenchmarkcontemporaneousData(params).then(datas => {
-                //         that.changeData(datas, type)
-                //     })
-                //     // that.changeBarData(that.baxic2json, type)
-                // } else if (type === '3') {
-                //     apiPostbenchmarkpreviousPeriodData(params).then(datas => {
-                //         that.changeData(datas, type)
-                //     })
-                // }
             },
             changeLineData(showData) {
+                this.benchmarkBasicHeader = []
                 if (showData.data.title) {
                     this.benchmarkBasicHeader = showData.data.title
                 }
@@ -301,8 +291,13 @@
                 }
             },
             changeBarData(showData, type) {
+                this.benchmarkBasic2Header = []
                 if (showData.data.title) {
-                    this.benchmarkBasicHeader = showData.data.title
+                    showData.data.title.forEach(iv =>{
+                        if (iv.code !== 'time') {
+                            this.benchmarkBasic2Header.push(iv)
+                        }
+                    })
                 }
                 if (showData.data.list) {
                     this.benchmarkBasicPageData = showData.data.list
@@ -311,13 +306,13 @@
                     this.benchmarkBasicPageData.forEach(it => {
                         xaxisArr.push(it.time)
                     })
-                    this.benchmarkBasicHeader.forEach(iv => {
+                    this.benchmarkBasic2Header.forEach(iv => {
                         if (iv.code !== 'time') {
                             let seriesitemArrB = []
                             let seriesitemArrT = []
                             let seriesitemArrS = []
                             this.benchmarkBasicPageData.forEach(item => {
-                                seriesitemArrB.push(item[iv.code + '_b'])
+                                seriesitemArrB.push(item[iv.code])
                                 if (type === '2') {
                                     seriesitemArrT.push(item[iv.code + '_t'])
                                 } else {
@@ -330,7 +325,7 @@
                                 data: seriesitemArrB
                             }
                             let obj1 = {
-                                name: iv.name + type === '2' ? '同期' : '上期',
+                                name: type === '2' ? iv.name + '同期' : iv.name + '上期',
                                 type: 'bar',
                                 data: type === '2' ? seriesitemArrT : seriesitemArrS
                             }