浏览代码

驾驶舱修改

coys 1 年之前
父节点
当前提交
26bbe73d9d

+ 1 - 1
src/views/home/works.vue

@@ -278,7 +278,7 @@ export default {
         }
         //演练登记评价跳转
         if (val == 4 && taskType == 2) {
-          pathInfo = '/rehearsalTaskSign/' + id + '_evaluate'
+          pathInfo = '/rehearsalTasinfo/' + id + '_evaluate'
         }
         //演练登记签名跳转
         if (val == 4 && taskType == 1) {

+ 1 - 1
src/views/menu/cockpit/components/comprehensiveData.vue

@@ -163,7 +163,7 @@
             </van-col>
             <van-col :span="6" class="boxmain centerTwoBox">
               <div>已检查</div>
-              <div class="wj-title-blue font5vw">{{ taskInfoByTypeList[item].checkedCount }}%</div>
+              <div class="wj-title-blue font5vw">{{ taskInfoByTypeList[item].checkedCount }}</div>
             </van-col>
             <van-col :span="6" class="boxmain">
               <div>完成率</div>

+ 5 - 5
src/views/menu/cockpit/components/overviewCom.vue

@@ -43,7 +43,7 @@
             <div class="numCls wj-title-blue tal">
               <van-icon v-if="allData.ga38['GA382021'].compare > 0" name="play" class="wj-title-red rate270" />
               <van-icon v-else name="play" class="wj-title-green rate" />
-              <span>{{ Math.abs(parseInt(allData.ga38['GA382021'].compare * 100)) }}%</span>
+              <span>{{ Math.abs(parseInt(allData.ga38['GA382021'].compare * 100)).toFixed(2) }}%</span>
             </div>
             <div class="fontCls">较上月增长率</div>
           </div>
@@ -53,7 +53,7 @@
       <div class="moduleCom">
         <div class="titleText"><span class="leftSty"></span><span>GA38-2015</span></div>
         <div class="complete">
-          <div class="numCls wj-title-blue">{{ parseInt((allData.ga38['GA382015'].currentCompletedRate||0) * 100) }}%</div>
+          <div class="numCls wj-title-blue">{{ parseInt((allData.ga38['GA382015'].currentCompletedRate||0) * 100).toFixed(2) }}%</div>
         </div>
         <div class="moduleItem">
           <div>
@@ -65,7 +65,7 @@
               <van-icon v-if="allData.ga38['GA382015'].compare > 0" name="play" class="wj-title-red rate270" />
               <van-icon v-else name="play" class="wj-title-green rate" />
 
-              <span>{{ Math.abs(parseInt(allData.ga38['GA382015'].compare * 100)) }}%</span>
+              <span>{{ Math.abs(parseInt(allData.ga38['GA382015'].compare * 100)).toFixed(2) }}%</span>
             </div>
             <div class="fontCls">较上月增长率</div>
           </div>
@@ -94,7 +94,7 @@
             <div class="numCls wj-title-blue tal">
               <van-icon name="play" class="wj-title-green rate " />
               <span
-                >{{ Math.abs(parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare * 100)) }}%</span
+                >{{ Math.abs(parseInt(allData.taskInfo[Object.keys(allData.taskInfo)[index]].compare * 100)).toFixed(2) }}%</span
               >
             </div>
             <div class="fontCls">完成率(较上月)</div>
@@ -324,7 +324,7 @@ export default {
 ::v-deep.van-icon-play {
   font-size: 40px;
   position: absolute;
-  left: 62%;
+  left: 49%;
   top: 62%;
 }
 </style>

+ 41 - 39
src/views/menu/cockpit/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="index-container">
-    <NavBar  />
+    <NavBar />
     <van-row>
       <van-col span="24">
         <org-tree v-model="cascaderValue" :name="'sss'" :isHangsheTree="true" @changeItem="getDataList"></org-tree>
@@ -30,8 +30,7 @@
             <chartsCom ref="charts" :id="'main'" :option="dataopntion"></chartsCom>
             <chartsCom ref="charts" :id="'mainBank'" :option="dataBankopntion"></chartsCom>
           </div>
-         
-         
+
           <div class="boxCard">
             <van-row>
               <van-col :span="24">
@@ -71,15 +70,13 @@
                 <div class="titleText">
                   <span class="leftSty"></span>
                   <span>自助银行设备</span>
-                
                 </div>
               </van-col>
             </van-row>
             <van-row>
               <van-col :span="24">
-                <chartsCom ref="chartsff"  :id="'lhszz'" :option="ZHSdata"></chartsCom>
+                <chartsCom ref="chartsff" :id="'lhszz'" :option="ZHSdata"></chartsCom>
               </van-col>
-              
             </van-row>
           </div>
         </van-tab>
@@ -104,7 +101,7 @@
             </van-row>
             <chartsCom
               ref="chartsresumption"
-              :chartsHeight="'700px'"
+              :chartsHeight="heightData"
               :option="resumptionData"
               :id="'lzqk'"
             ></chartsCom></div
@@ -127,9 +124,7 @@ import {
   LHSData,
   resumption,
   ZHSData,
-  
-  dotData,
-  
+  dotData
 } from '@/views/menu/cockpit/indexEcharts.js'
 import { baseInfoApi } from '@/views/menu/cockpit/baseInfoMixins.js'
 import { newDateMonth } from '@/utils/date.js'
@@ -154,7 +149,7 @@ export default {
       showlz: false, //
       showEndDate: false, //
       columns: ['本月', '上月'],
-      columnsLz: ['升序', '降序'],
+      columnsLz: ['前10名', '最后10名'],
       cascaderValue: '', //机构ID
       tabOptions: [
         {
@@ -172,18 +167,17 @@ export default {
       ],
       // 安全防范改造情况
       dataopntion: aqsecurity(),
-      dataBankopntion:ddsecurity(),
-      
-     
-    
+      dataBankopntion: ddsecurity(),
+
       // 网点业务库总览
       dotPieData: dotData('网点业务库总览'),
       // 保安情况
       securityPieData: securityPrecautions(''),
-    
+
       ZHSdata: ZHSData('在行式自助银行'),
       //履职情况
-      resumptionData: resumption()
+      resumptionData: resumption(),
+      heightData: '700px' //履职情况高度
     }
   },
   mounted() {
@@ -191,7 +185,7 @@ export default {
     this.getBaseInfoHandler({ orgId: this.cascaderValue })
     //设置默认排序
 
-    if (this.lvVal == '升序' || this.lvVal == '履职排名') {
+    if (this.lvVal == '前10名' || this.lvVal == '履职排名') {
       this.desc = 0
     } else {
       this.desc = 1
@@ -219,7 +213,7 @@ export default {
     },
     onConfirmLz(val) {
       this.lvVal = val
-      if (val == '升序') {
+      if (val == '前10名') {
         this.desc = 0
       } else {
         this.desc = 1
@@ -235,29 +229,33 @@ export default {
         onlineATMPropertyRight,
         offlineATMPropertyRight,
         securityPeopleInfo,
-        banking2021,
-        offlineATM2021,
-        offlineATM2015,
+        bankingGa38,
+        offlineGa38,
+        onlineGa38,
         banking2015
       } = this.baseData
       let dataopntionList = []
+
     
-      if (securityFacilities.ga382021) {
         dataopntionList.push({ value: securityFacilities.ga382021, name: 'GA38-2021' })
-      }
-      if (securityFacilities.ga382015) {
+    
+      
         dataopntionList.push({ value: securityFacilities.ga382015, name: 'GA38-2015' })
-      }
-      if (securityFacilities.ga38Unreached) {
+     
+      
         dataopntionList.push({ value: securityFacilities.ga38Unreached, name: '未达标' })
-      }
-      this.dataopntion = aqsecurity(dataopntionList)
-      // this.dataBankopntion=
      
+      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],//在线式银行
+      })
+
       // 保安配备情况
       let baList = []
       if (securityPeopleInfo['未配备']) {
@@ -274,21 +272,25 @@ export default {
         { value: offlineATMPropertyRight['穿墙式设备'], name: '离行式自助银行穿墙式设备' },
         { value: offlineATMPropertyRight['大堂式设备'], name: '离行式自助银行大堂式设备' }
       ])
-      
+
       let list = []
       Object.keys(businessStoreInfo).map(item => {
         // if (businessStoreInfo[item]) {
         list.push({ value: businessStoreInfo[item], name: item })
         // }
       })
-      let num=list.map(item=>item.value).reduce((a,b)=>a+b)
-      
-      this.dotPieData = dotData('网点业务库总览', list,num)
+      let num = list.map(item => item.value).reduce((a, b) => a + b)
+
+      this.dotPieData = dotData('网点业务库总览', list, num)
     },
     //履职情况
     resumptionInit() {
-      console.log(this.resumptionList, 'resumptionList')
+     
+      
+      this.heightData = parseInt(50 * this.resumptionList.length) + 'px'
+
       this.resumptionData = resumption(this.resumptionList)
+      // this.resumptionData = resumption(list)
       if (this.$refs.chartsresumption) {
         this.$nextTick(() => {
           this.$refs.chartsresumption.initEcharts()
@@ -319,7 +321,7 @@ export default {
   margin: 10px;
   font-weight: bold;
   position: relative;
-    .leftSty {
+  .leftSty {
     display: inline-block;
     width: 10px;
     height: 5vw;
@@ -329,7 +331,7 @@ export default {
     transform: translateY(-1px);
     background-color: #008cd6;
   }
-  .postionRightTop{
+  .postionRightTop {
     position: absolute;
     font-size: 20px;
     top: 0px;

+ 11 - 6
src/views/menu/cockpit/indexEcharts.js

@@ -120,7 +120,13 @@ let aqsecurity = (
   return option
 }
 //柱状图堆叠
-let ddsecurity = () => {
+let ddsecurity = (
+  data = {
+    bankingGa38: [1, 2, 3],
+    offlineGa38: [1, 2, 3],
+    onlineGa38: [1, 2, 3]
+  }
+) => {
   let option = {
     tooltip: {
       trigger: 'axis',
@@ -159,7 +165,7 @@ let ddsecurity = () => {
         emphasis: {
           focus: 'series'
         },
-        data: [320, 302, 301, 334, 390, 330, 320]
+        data: data.onlineGa38
       },
       {
         name: '离行式自助银行',
@@ -173,7 +179,7 @@ let ddsecurity = () => {
         emphasis: {
           focus: 'series'
         },
-        data: [120, 132, 101, 134, 90, 230, 210]
+        data: data.offlineGa38
       },
       {
         name: '营业网点',
@@ -186,7 +192,7 @@ let ddsecurity = () => {
         emphasis: {
           focus: 'series'
         },
-        data: [220, 182, 191, 234, 290, 330, 310]
+        data: data.bankingGa38
       }
     ]
   }
@@ -372,8 +378,7 @@ let ZHSData = (
             textStyle: {
               color: '#656565' // 改变标示文字的颜色
             }
-          },
-          
+          }
         },
         emphasis: {
           itemStyle: {

+ 1 - 1
src/views/menu/rehearsalTask/index.vue

@@ -496,7 +496,7 @@ export default {
     },
     //评价
     evaluate(id) {
-      this.$router.push('/rehearsalTaskSign/' + id + '_evaluate')
+      this.$router.push('/rehearsalTasinfo/' + id + '_evaluate')
     },
     //关闭弹框
     beforeClose() {