coys

src/views/menu/cockpit/index.vue

@@ -128,7 +128,7 @@ import {
 } from '@/views/menu/cockpit/indexEcharts.js'
 import { baseInfoApi } from '@/views/menu/cockpit/baseInfoMixins.js'
 import { newDateMonth } from '@/utils/date.js'
-import {mapGetters} from "vuex";
+import { mapGetters } from 'vuex'
 export default {
   name: 'works',
   mixins: [baseInfoApi],
@@ -182,23 +182,21 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['orgTree','orgTreeHangshe'])
+    ...mapGetters(['orgTree', 'orgTreeHangshe'])
   },
-  watch:{
-    orgTreeHangshe(val){
-      this.cascaderValue =val[0].id
-      
+  watch: {
+    orgTreeHangshe(val) {
+      this.cascaderValue = val[0].id
+
       this.getBaseInfoHandler({ orgId: this.cascaderValue })
       this.getResumptionfoHandler({ desc: this.desc, month: this.month, orgId: this.cascaderValue })
-    },
-    
+    }
   },
   mounted() {
-    
-    if(this.orgTreeHangshe){
-      this.cascaderValue =this.orgTreeHangshe[0].id
+    if (this.orgTreeHangshe) {
+      this.cascaderValue = this.orgTreeHangshe[0].id
     }
-    
+
     this.getBaseInfoHandler({ orgId: this.cascaderValue })
     //设置默认排序
 
@@ -253,25 +251,31 @@ export default {
       } = this.baseData
       let dataopntionList = []
 
-    
-        dataopntionList.push({ value: securityFacilities.ga382021, name: 'GA38-2021' })
-    
-      
-        dataopntionList.push({ value: securityFacilities.ga382015, name: 'GA38-2015' })
-     
-      
-        dataopntionList.push({ value: securityFacilities.ga38Unreached, name: '未达标' })
-     
+      dataopntionList.push({ value: securityFacilities.ga382021, name: 'GA38-2021' })
+
+      dataopntionList.push({ value: securityFacilities.ga382015, name: 'GA38-2015' })
+
+      dataopntionList.push({ value: securityFacilities.ga38Unreached, name: '未达标' })
+
       this.dataopntion = aqsecurity(dataopntionList)
       //堆叠图
-      
-     
-      this.dataBankopntion=ddsecurity({
-        bankingGa38:[bankingGa38.ga382015, bankingGa38.ga382021, bankingGa38.notreach],//营业网点
-       
-        offlineGa38:[offlineGa38.ga382015, offlineGa38.ga382021, offlineGa38.notreach],//离行式银行
-        onlineGa38:[onlineGa38.ga382015, onlineGa38.ga382021, onlineGa38.notreach],//在线式银行
-      })
+      // {
+      //   bankingGa38:[bankingGa38.ga382015, bankingGa38.ga382021, bankingGa38.notreach],//营业网点
+      //   offlineGa38:[offlineGa38.ga382015, offlineGa38.ga382021, offlineGa38.notreach],//离行式银行
+      //   onlineGa38:[onlineGa38.ga382015, onlineGa38.ga382021, onlineGa38.notreach],//在线式银行
+      // }
+      this.dataBankopntion=ddsecurity(
+        {
+         bankingGa38:[onlineGa38.notreach, offlineGa38.notreach, bankingGa38.notreach],//营业网点
+         offlineGa38:[onlineGa38.ga382015, offlineGa38.ga382015, bankingGa38.ga382015],//离行式银行
+         onlineGa38:[onlineGa38.ga382021, offlineGa38.ga382021, bankingGa38.ga382021],//在线式银行
+       }
+      )
+      console.log( {
+         bankingGa38:[bankingGa38.ga382015, bankingGa38.ga382021, bankingGa38.notreach],//营业网点
+         offlineGa38:[offlineGa38.ga382015, offlineGa38.ga382021, offlineGa38.notreach],//离行式银行
+         onlineGa38:[onlineGa38.ga382015, onlineGa38.ga382021, onlineGa38.notreach],//在线式银行
+       })
 
       // 保安配备情况
       let baList = []
@@ -291,20 +295,18 @@ export default {
       ])
 
       let list = []
-      let listNames=[]
+      let listNames = []
       Object.keys(businessStoreInfo).map(item => {
-        
-        list.push( businessStoreInfo[item])
-        listNames.push(item )
-       
+        list.push(businessStoreInfo[item])
+        listNames.push(item)
       })
       let num = list.reduce((a, b) => a + b)
 
-      this.dotPieData = dotData('网点业务库总览', list, num,listNames)
-     this.initEchartsChange()
+      this.dotPieData = dotData('网点业务库总览', list, num, listNames)
+      this.initEchartsChange()
     },
     //机构变化图表刷新重置
-    initEchartsChange(){
+    initEchartsChange() {
       if (this.$refs.chartsdataopntion) {
         this.$nextTick(() => {
           this.$refs.chartsdataopntion.initEcharts()
@@ -338,10 +340,9 @@ export default {
     },
     //履职情况
     resumptionInit() {
-     
-      
-      this.heightData = parseInt(50 * this.resumptionList.length)<450? 450 + 'px':parseInt(50 * this.resumptionList.length)+'px'
-      
+      this.heightData =
+        parseInt(50 * this.resumptionList.length) < 450 ? 450 + 'px' : parseInt(50 * this.resumptionList.length) + 'px'
+
       this.resumptionData = resumption(this.resumptionList)
       // this.resumptionData = resumption(list)
       if (this.$refs.chartsresumption) {

src/views/menu/cockpit/indexEcharts.js

@@ -165,7 +165,7 @@ let ddsecurity = (
         emphasis: {
           focus: 'series'
         },
-        data: data.onlineGa38
+        data: data.offlineGa38
       },
       {
         name: 'GA38-2021',
@@ -179,7 +179,7 @@ let ddsecurity = (
         emphasis: {
           focus: 'series'
         },
-        data: data.offlineGa38
+        data: data.onlineGa38
       },
       {
         name: '未达标',