驾驶舱缺陷

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

@@ -129,7 +129,7 @@ export default {
               // show:false,
               color: "#fff",
               formatter: (p) => {
-                return `${p.name}\r\n(${p.value},${p.percent}%)`;
+                return `${p.name}\r\n(${p.value},${p.percent==undefined?0:p.percent}%)`;
               },
             },
             labelLine: {
@@ -160,7 +160,7 @@ export default {
               // show:false,
               color: "#fff",
               formatter: (p) => {
-                return `${p.name}\r\n(${p.value},${p.percent}%)`;
+                return `${p.name}\r\n(${p.value},${p.percent==undefined?0:p.percent}%)`;
               },
             },
             labelLine: {

src/views/board/index.vue

@@ -47,7 +47,7 @@
       <div>
         <div>
           <div>
-            <mapChart :orgId="selectedOrg.id" :orgName="selectedOrg.name"/>
+            <mapChart :orgId="selectedOrg.id" :orgName="selectedOrg.name" />
           </div>
           <div>
             <comprehesive-chart :orgId="selectedOrg.id" />
@@ -129,7 +129,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(["orgId", "depTree", "orgName","orgType"]),
+    ...mapGetters(["orgId", "depTree", "orgName", "orgType"]),
     orgOptions() {
       let deps = this.depTree;
       let recursion = (deps) => {
@@ -147,6 +147,16 @@ export default {
         }
       };
       recursion(deps);
+      this.$nextTick(() => {
+        if (deps.length > 0) {
+          this.selectedOrg = {
+            id: deps[0].id,
+            name: deps[0].shortName,
+          };
+          this.setMaxDiagram(deps[0].type);
+          this.orgCascaderSelectedIds = [deps[0].id];
+        }
+      });
       // console.info(deps);
       return deps;
     },
@@ -190,11 +200,11 @@ export default {
     //   });
     // });
     this.selectedOrg = {
-      id: this.orgId,      
+      id: this.orgId,
       name: this.orgName,
     };
-    this.setMaxDiagram(this.orgType)    
-    this.orgCascaderSelectedIds = [this.orgId];
+    this.setMaxDiagram(this.orgType);
+    //this.orgCascaderSelectedIds = [this.orgId];
   },
   beforeDestroy() {
     clearInterval(this.orgtimer);
@@ -231,15 +241,15 @@ export default {
         name: checked[0].data.shortName,
       };
 
-     this. setMaxDiagram(checked[0].data.type)      
+      this.setMaxDiagram(checked[0].data.type);
     },
-    setMaxDiagram(type){
+    setMaxDiagram(type) {
       if (type == 3) {
         this.maxDiagram = 10;
       } else {
         this.maxDiagram = null;
       }
-    }
+    },
   },
 };
 </script>

src/views/safetycheck/task/index.vue

@@ -270,6 +270,24 @@
                 </span>
               </template>
             </el-table-column>
+            <!-- <el-table-column
+              prop="dqOrgName"
+              label="所属地区"
+              align="center"
+              width="150px"
+              show-overflow-tooltip
+              v-if="columns[5].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="hsOrgName"
+              label="行社"
+              align="center"
+              width="150px"
+              show-overflow-tooltip
+              v-if="columns[5].visible"
+            >
+            </el-table-column> -->
             <el-table-column
               prop="orgName"
               label="受检机构"