coys пре 1 година
родитељ
комит
2868d73b96
2 измењених фајлова са 53 додато и 17 уклоњено
  1. 43 9
      src/views/menu/cockpit/index.vue
  2. 10 8
      src/views/menu/cockpit/indexEcharts.js

+ 43 - 9
src/views/menu/cockpit/index.vue

@@ -27,8 +27,8 @@
                 </div>
               </van-col>
             </van-row>
-            <chartsCom ref="charts" :id="'main'" :option="dataopntion"></chartsCom>
-            <chartsCom ref="charts" :id="'mainBank'" :option="dataBankopntion"></chartsCom>
+            <chartsCom ref="chartsdataopntion" :id="'main'" :option="dataopntion"></chartsCom>
+            <chartsCom ref="chartsdataBankopntion" :id="'mainBank'" :option="dataBankopntion"></chartsCom>
           </div>
 
           <div class="boxCard">
@@ -45,7 +45,7 @@
               </van-col>
             </van-row>
             <!-- 网点业务库总览 -->
-            <chartsCom ref="charts" :id="'wdyw'" :option="dotPieData"></chartsCom>
+            <chartsCom ref="chartsdotPieData" :id="'wdyw'" :option="dotPieData"></chartsCom>
           </div>
           <div class="boxCard">
             <van-row>
@@ -61,7 +61,7 @@
               </van-col>
             </van-row>
             <!-- 保安配备情况 -->
-            <chartsCom ref="charts" :id="'baqk'" :option="securityPieData"></chartsCom>
+            <chartsCom ref="chartssecurityPieData" :id="'baqk'" :option="securityPieData"></chartsCom>
           </div>
           <!-- 自助银行设备 -->
           <div class="GA38">
@@ -75,13 +75,13 @@
             </van-row>
             <van-row>
               <van-col :span="24">
-                <chartsCom ref="chartsff" :id="'lhszz'" :option="ZHSdata"></chartsCom>
+                <chartsCom ref="chartsffZHSdata" :id="'lhszz'" :option="ZHSdata"></chartsCom>
               </van-col>
             </van-row>
           </div>
         </van-tab>
         <van-tab title="综合数据">
-          <compreDataCom ref="compreDataCom" :orgId="cascaderValue"></compreDataCom>
+          <compreDataCom ref="compreDataComcascaderValue" :orgId="cascaderValue"></compreDataCom>
         </van-tab>
         <van-tab title="履职情况"
           ><div class="boxCard">
@@ -178,7 +178,7 @@ export default {
       ZHSdata: ZHSData('在行式自助银行'),
       //履职情况
       resumptionData: resumption(),
-      heightData: '700px' //履职情况高度
+      heightData: '0px' //履职情况高度
     }
   },
   computed: {
@@ -301,13 +301,47 @@ export default {
       let num = list.reduce((a, b) => a + b)
 
       this.dotPieData = dotData('网点业务库总览', list, num,listNames)
+     this.initEchartsChange()
+    },
+    //机构变化图表刷新重置
+    initEchartsChange(){
+      if (this.$refs.chartsdataopntion) {
+        this.$nextTick(() => {
+          this.$refs.chartsdataopntion.initEcharts()
+        })
+      }
+      if (this.$refs.chartsdataBankopntion) {
+        this.$nextTick(() => {
+          this.$refs.chartsdataBankopntion.initEcharts()
+        })
+      }
+      if (this.$refs.chartsdotPieData) {
+        this.$nextTick(() => {
+          this.$refs.chartsdotPieData.initEcharts()
+        })
+      }
+      if (this.$refs.chartssecurityPieData) {
+        this.$nextTick(() => {
+          this.$refs.chartssecurityPieData.initEcharts()
+        })
+      }
+      if (this.$refs.chartsffZHSdata) {
+        this.$nextTick(() => {
+          this.$refs.chartsffZHSdata.initEcharts()
+        })
+      }
+      if (this.$refs.compreDataComcascaderValue) {
+        this.$nextTick(() => {
+          this.$refs.compreDataComcascaderValue.initEcharts()
+        })
+      }
     },
     //履职情况
     resumptionInit() {
      
       
-      this.heightData = 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) {

+ 10 - 8
src/views/menu/cockpit/indexEcharts.js

@@ -287,7 +287,7 @@ let dotData = (
 
   data = [],
   num = 0,
-  listNames= ['一类库', '二类库', '三类库', '四类库']
+  listNames = ['一类库', '二类库', '三类库', '四类库']
 ) => {
   var colors = ['#146de0', '#27ef5e', '#ffc140', '#d151d8', 'red']
   let option = {
@@ -304,21 +304,23 @@ let dotData = (
         show: true,
         data: data,
         type: 'bar',
-       
-       
+
         label: {
-          show:true,
+          show: true,
           //数值展示的位置
           textStyle: {
             color: 'black',
             fontSize: 12
           },
           position: 'top', // 顶部显示
-          formatter: function(params) {
-            return data[params.dataIndex] + '(' + ((data[params
-              .dataIndex] /num*100)).toFixed(0) + '%)'
+          formatter: function (params) {
+            return (
+              data[params.dataIndex] +
+              '(' +
+              (data[params.dataIndex] ?  (data[params.dataIndex] / num) * 100:0).toFixed(0) +
+              '%)'
+            )
           }
-
         },
 
         barWidth: 40,