驾驶舱功能调试；

src/assets/map/index.js → src/assets/map/config.js

@@ -1,7 +1,14 @@
 import map from "./fj.json";
 import zhangzhou from "./zhangzhou.json";
 import fuzhou from "./fuzhou.json";
-const config = {
+import ningde from "./ningde.json";
+import longyan from './longyan.json'
+import nangping from './nanping.json'
+import quangzhou from './quanzhou.json'
+import sanming from './sanming.json'
+import xiameng from './xiameng.json'
+
+export default {
   default: {
     map,
     coordinates: [],
@@ -12,7 +19,7 @@ const config = {
       { name: "漳州农商行", value: [117.675264, 24.524648, 10] },
       { name: "龙海农商行", value: [117.813678, 24.453241, 10] },
       { name: "云霄县农联社", value: [117.347455, 23.94945, 10] },
-      { name: "漳浦县农联社", value: [117.628503,24.12591, 10] },
+      { name: "漳浦县农联社", value: [117.628503, 24.12591, 10] },
       { name: "诏安县农联社", value: [117.185518, 23.717786, 10] },
       { name: "长泰县农联社", value: [117.755306, 24.626603, 10] },
       { name: "东山县农联社", value: [117.432607, 23.713423, 10] },
@@ -37,36 +44,28 @@ const config = {
       // { name: "马尾农商行", value: [, 10] },
     ],
   },
-};
-
-export default {
-  /**获取地图数据 */
-  getMap(orgName) {
-    if (config[orgName]) {
-      return config[orgName].map;
-    }
-
-    return config.default.map;
+  宁德地区行社: {
+    map: ningde,
+    coordinates: [],
   },
-  /**
-   * 获取坐标
-   * @param {} orgName
-   */
-  getCoord(orgName) {
-    if (config[orgName]) {
-      return config[orgName].coordinates;
-    }
-
-    let coordinates = [];
-    for (let p in config) {
-      if (!config[p].coordinates) {
-        continue;
-      }
-
-      coordinates = coordinates.concat(config[p].coordinates);
-    }
-
-    return coordinates;
+  厦门地区行社: {
+    map: xiameng,
+    coordinates: [],
+  },
+  泉州地区行社: {
+    map: quangzhou,
+    coordinates: [],
+  },
+  三明地区行社: {
+    map: sanming,
+    coordinates: [],
+  },
+  南平地区行社: {
+    map: nangping,
+    coordinates: [],
+  },
+  龙岩地区行社: {
+    map: longyan,
+    coordinates: [],
   },
 };
-// coordinates

src/views/board/charts/map/mapConfig.js

@@ -0,0 +1,33 @@
+import config from "@/assets/map/config";
+
+export default {
+  /**获取地图数据 */
+  getMap(orgName) {
+    if (config[orgName]) {
+      return config[orgName].map;
+    }
+
+    return config.default.map;
+  },
+  /**
+   * 获取坐标
+   * @param {} orgName
+   */
+  getCoord(orgName) {
+    if (config[orgName]) {
+      return config[orgName].coordinates;
+    }
+
+    let coordinates = [];
+    for (let p in config) {
+      if (!config[p].coordinates) {
+        continue;
+      }
+
+      coordinates = coordinates.concat(config[p].coordinates);
+    }
+
+    return coordinates;
+  },
+};
+// coordinates

src/views/board/charts/map/report.vue

@@ -7,7 +7,7 @@
 <script>
 import "./../../board.scss";
 import * as echarts from "echarts";
-import mapConfig from "@/assets/map/index.js";
+import mapConfig from "./mapConfig.js";
 import {
   findMaxIndex,
   getChartDOMSize,

src/views/board/charts/org/report.vue

@@ -6,22 +6,22 @@
       <div class="title">GA38达标率统计</div>
       <div class="content">
         <div>
-          <div v-if="data.length>=1" v-for="item in data[0]">
+          <div v-if="data.length >= 1" v-for="item in data[0]">
             {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <div>
-          <div  v-if="data.length>=1" v-for="item in data[1]">
+          <div v-if="data.length >= 1" v-for="item in data[1]">
             {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <div>
-          <div  v-if="data.length>=2" v-for="item in data[2]">
+          <div v-if="data.length >= 2" v-for="item in data[2]">
             {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <div>
-          <div  v-if="data.length>=3" v-for="item in data[3]">
+          <div v-if="data.length >= 3" v-for="item in data[3]">
             {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
@@ -35,7 +35,16 @@ import "./../../board.scss";
 import { orgGA38 } from "@/api/board/cockpit.js";
 
 export default {
-  props: ["orgId"],
+  props: {
+    orgId: {
+      type: String,
+      isRequired: true,
+    },
+    orgName: {
+      type: String,
+      isRequired: true,
+    },
+  },
   data() {
     return {
       data: {
@@ -85,42 +94,8 @@ export default {
       this.isMouseOver = false;
     },
     async getData() {
-      // let bs = parseInt(this.activeName) + 1;
-      // let data = [
-      //   {
-      //     orgName: "福州地区行社",
-      //     all: 500,
-      //     rate: 0.99,
-      //   },
-      //   {
-      //     orgName: "漳州地区行社",
-      //     all: 500,
-      //     rate: 0.96,
-      //   },
-      //   {
-      //     orgName: "泉州地区行社",
-      //     all: 500,
-      //     rate: 0.99,
-      //   },
-      //   {
-      //     orgName: "三明地区行社",
-      //     all: 500,
-      //     rate: 0.98,
-      //   },
-      //   {
-      //     orgName: "南平地区行社",
-      //     all: 500,
-      //     rate: 0.97,
-      //   },
-      //   {
-      //     orgName: "宁德地区行社",
-      //     all: 500,
-      //     rate: 0.98,
-      //   },
-      // ];
-
       let columnCount = 4;
-      let r =(await orgGA38(this.orgId)).data;
+      let r = (await orgGA38(this.orgId)).data;
       let data = [];
 
       for (let i in r) {
@@ -128,12 +103,18 @@ export default {
         if (!data[columnIndex]) {
           data[columnIndex] = [];
         }
-        r[i].orgName = parseInt(i) + 1 + "." + r[i].orgName;
+
+        let orgName = r[i].orgName;
+
+        if (r[i].orgName.startsWith(this.orgName)) {
+          orgName = r[i].orgName.substr(this.orgName.length);
+        }
+        r[i].orgName = parseInt(i) + 1 + "." + orgName;
         data[columnIndex].push(r[i]);
       }
 
-      this.data=data;
-      console.info("data",this.data);
+      this.data = data;
+      console.info("data", this.data);
     },
 
     windowResize() {
@@ -173,7 +154,7 @@ export default {
 
   ::v-deep .title {
     width: 100%;
-    height: 30px;
+    height: 25px;
     text-align: center;
     font-size: 16px;
   }

src/views/board/charts/resumption/report_bar.vue

@@ -55,6 +55,10 @@ export default {
       type: String,
       isRequired: true,
     },
+    orgName:{
+      type: String,
+      isRequired: true,
+    },
     title: {
       type: String,
       isRequired: true,
@@ -134,62 +138,22 @@ export default {
       };
 
       for (let item of r) {
+        if(data.all.length>=16){
+          break;
+        }
         data.all.push(item.taskTotal);
         data.completed.push(item.completedCount);
         data.rate.push((item.completedRate * 100).toFixed(0));
-        data.name.push(item.orgName);
+        
+        if(item.orgName.startsWith(this.orgName)){
+          data.name.push(item.orgName.substr(this.orgName.length));
+        }else{
+          data.name.push(item.orgName);
+        }
       }
       this.data = data;
-      // let bs = parseInt(this.activeName) + 1;
-      // this.data = {
-      //   all: [
-      //     210 * bs,
-      //     101 * bs,
-      //     117 * bs,
-      //     78 * bs,
-      //     107 * bs,
-      //     105 * bs,
-      //     210 * bs,
-      //     101 * bs,
-      //     117 * bs,
-      //     78 * bs,
-      //     107 * bs,
-      //     105 * bs,
-      //   ],
-      //   completed: [
-      //     155 * bs,
-      //     99 * bs,
-      //     110 * bs,
-      //     78 * bs,
-      //     104 * bs,
-      //     102 * bs,
-      //     155 * bs,
-      //     99 * bs,
-      //     110 * bs,
-      //     78 * bs,
-      //     104 * bs,
-      //     102 * bs,
-      //   ],
-      //   name: [
-      //     "福州地区行社",
-      //     "漳州地区行社",
-      //     "泉州地区行社",
-      //     "三明地区行社",
-      //     "南平地区行社",
-      //     "宁德地区行社",
-      //     "福州地区行社",
-      //     "漳州地区行社",
-      //     "泉州地区行社",
-      //     "三明地区行社",
-      //     "南平地区行社",
-      //     "宁德地区行社",
-      //   ],
-      // };
-      // this.data.rate = [];
-      // this.data.all.forEach((v, i) => {
-      //   this.data.rate[i] = (this.data.completed[i] / this.data.all[i]) * 100;
-      // });
-      console.info(this.data);
+      
+      // console.info(this.data);
     },
 
     windowResize() {
@@ -214,7 +178,8 @@ export default {
           confine: true,
           axisPointer: {
             type: "shadow",
-          },
+          },         
+          
           formatter: "完成率：{c}%",
         },
         legend: {
@@ -229,6 +194,7 @@ export default {
           bottom: "2%",
           top: "20px",
           containLabel: true,
+
         },
 
         xAxis: [
@@ -248,7 +214,7 @@ export default {
             },
             axisLabel: {
               interval: 0,
-              rotate: -30,
+              rotate: -45,
               fontSize: 12,
               color: "#fff",
             },
@@ -300,7 +266,7 @@ export default {
                   position: "top",
                   textStyle: {
                     fontWeight: "bolder",
-                    fontSize: "12",
+                    fontSize: "10",
                     color: "rgb(245, 245, 245)",
                   },
                 },

src/views/board/index.vue

@@ -28,13 +28,13 @@
     <div class="main">
       <div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id" :api="api.resumption" title="日常安全履职" />
+          <resumptionReport :orgId="selectedOrg.id" :api="api.resumption" :orgName="selectedOrg.name" title="日常安全履职" />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.monitor"  title="监控调阅" />
+          <resumptionReport :orgId="selectedOrg.id"  :api="api.monitor" :orgName="selectedOrg.name" title="监控调阅" />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.safetyCheck" title="日常安全检查" />
+          <resumptionReport :orgId="selectedOrg.id"  :api="api.safetyCheck" :orgName="selectedOrg.name" title="日常安全检查" />
         </div>
       </div>
       <div>
@@ -43,7 +43,7 @@
             <mapChart :orgId="selectedOrg.id" :orgName="selectedOrg.name" />
           </div>
           <div>
-            <orgStatis :orgId="selectedOrg.id" />
+            <orgStatis :orgId="selectedOrg.id" :orgName="selectedOrg.name" />
           </div>
         </div>
       </div>
@@ -52,10 +52,10 @@
           <question :orgId="selectedOrg.id" />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id"  :api="api.drill"  title="预案演练" />
+          <resumptionReport :orgId="selectedOrg.id"  :api="api.drill" :orgName="selectedOrg.name" title="预案演练" />
         </div>
         <div>
-          <resumptionReport :orgId="selectedOrg.id" :api="api.edu"  title="教育培训" />
+          <resumptionReport :orgId="selectedOrg.id" :api="api.edu" :orgName="selectedOrg.name" title="教育培训" />
         </div>
        
         <!-- <div>
@@ -198,7 +198,7 @@ export default {
         return;
       }
 
-      this.selectedOrg = { ...checked[0].data };
+      this.selectedOrg = {id: checked[0].data.id,name:checked[0].data.shortName };
     },
     // handleSelect(e) {
     //   var item = this.branchlist.find((o) => o.orgId === parseInt(e));