调试web驾驶舱

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

@@ -2,12 +2,14 @@
 <template>
   <div class="static_info report">
     <div ref="orgchart"></div>
-    <div class="chart-template other">
-      <!-- <div class="line"></div> -->
-      <p>
-        <span> 其它(本月) </span>
-      </p>
-      <div ref="otherchart"></div>
+    <div class="other">
+      <div class="chart-template">
+        <!-- <div class="line"></div> -->
+        <p>
+          <span> 其它(本月) </span>
+        </p>
+        <div ref="otherchart"></div>
+      </div>
     </div>
   </div>
 </template>
@@ -116,7 +118,7 @@ export default {
             color: "rgb(245, 245, 245)",
           },
         },
-        color: ["#5470c6", "#91cc75", "#fac858"],
+        color: ["#5470c6", "#91cc75", "#ee6666"],
         series: [
           {
             name: "来访",
@@ -126,15 +128,14 @@ export default {
             label: {
               // show:false,
               color: "#fff",
-              
               formatter: (p) => {
                 return `${p.name}\r\n(${p.value},${p.percent}%)`;
               },
             },
-            labelLine:{
+            labelLine: {
               // smooth:true
-              length:5,
-              length2:5,
+              length: 5,
+              length2: 5,
             },
             data: [
               {
@@ -162,10 +163,10 @@ export default {
                 return `${p.name}\r\n(${p.value},${p.percent}%)`;
               },
             },
-             labelLine:{
+            labelLine: {
               // smooth:true
-              length:5,
-              length2:5,
+              length: 5,
+              length2: 5,
             },
             data: [
               {
@@ -344,7 +345,7 @@ export default {
   margin: 5px;
 
   & > div {
-    height:calc(100% - 10px);
+    height: calc(100% - 10px);
   }
   & > div:first-child {
     width: 35%;
@@ -355,8 +356,10 @@ export default {
 }
 
 .other {
-  background-image: url(@/assets/board/bg.png);
-  background-position: 100%;
-  background-color: rgba(8, 8, 8);
+  background-image: url(@/assets/board/area_border.png);
+  background-size: 100% 100%;
+  // background-image: url(@/assets/board/area_title-bg.png);
+  // background-position: 100%;
+  // background-color: rgba(8, 8, 8);
 }
 </style>

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

@@ -29,14 +29,14 @@ import {
 } from "../../utils.js";
 import { orgGA38 } from "@/api/board/cockpit.js";
 const types = [
-  {
-    text: "今天",
-    value: "1",
-  },
-  {
-    text: "近7天",
-    value: "2",
-  },
+  // {
+  //   text: "今天",
+  //   value: "1",
+  // },
+  // {
+  //   text: "近7天",
+  //   value: "2",
+  // },
   {
     text: "近30天",
     value: "3",
@@ -196,7 +196,7 @@ export default {
           top: "20px",
           containLabel: true,
         },
-
+        color:['#5470c6','#91cc75','#ee6666'],
         xAxis: [
           {
             type: "category",
@@ -228,11 +228,15 @@ export default {
             //   let m = value.max == Math.ceil(value.max) ? Math.ceil(value.max * 1.0001) : Math.ceil(value.max);
             //   return m
             // },
+          },{
+            type: "value",
+            min: 0,
+            max: 100,
+            show: false,
           },
         ],
-        series: [
-          {
-            name: "GA38-2021",
+        series: [{
+            name: "GA38-2015",
             type: "bar",
             stack: "ga38",
             barWidth: "14",
@@ -240,46 +244,23 @@ export default {
             //   show: true,
             //   position: 'top',
             // },
-            data: this.data.ga2021,
-            // itemStyle: {
-            //   normal: {
-            //     label: {
-            //       formatter: function (param) {
-            //         // if (t.data.all[param.dataIndex]) {
-            //         //   let rate = param.value / t.data.all[param.dataIndex];
-            //         //   return (Math.floor(rate * 1000) / 10).toFixed(1) + "%";
-            //         // } else {
-            //         //   return "";
-            //         // }
-            //         return parseFloat(param.value).toFixed(0) + "%";
-            //       },
-            //       show: true,
-            //       position: "top",
-            //       textStyle: {
-            //         fontWeight: "bolder",
-            //         fontSize: "10",
-            //         color: "rgb(245, 245, 245)",
-            //       },
-            //     },
-            //   },
-            // },
+            data: this.data.ga2015,
+            yAxisIndex: 0,
           },
           {
-            name: "GA38-2015",
+            name: "GA38-2021",
             type: "bar",
             stack: "ga38",
             barWidth: "14",
-            // label: {
-            //   show: true,
-            //   position: 'top',
-            // },
-            data: this.data.ga2015,
-          },
+            data: this.data.ga2021,      
+            yAxisIndex: 0,      
+          },          
           {
             name: "达标率",
-            type: "bar",
+            type: "line",
             stack: "ga38",
             barWidth: "14",
+            yAxisIndex: 1,
             tooltip: {
               valueFormatter: (v) => `${v}%`,
             },

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

@@ -52,7 +52,7 @@ const types = [
 ];
 export default {
   props: {
-    orgId:{
+    orgId: {
       type: String,
       isRequired: true,
     },
@@ -201,7 +201,7 @@ export default {
         // },
         tooltip: {
           trigger: "item",
-          show:false,
+          show: false,
           // formatter: "{a} <br/>{b} : {c} ({d}%)",
         },
         title: {
@@ -212,22 +212,22 @@ export default {
           textStyle: {
             fontSize: 16,
             color: "#fff",
-            fontWeight:200,
+            fontWeight: 200,
             // fontFamily:'SYNormal, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif',
             align: "center",
           },
           subtextStyle: {
             fontSize: 16,
             color: "#fff",
-            fontWeight:200,
+            fontWeight: 200,
             // fontFamily:'SYNormal, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif',
             align: "center",
           },
         },
-   
+
         legend: {
           show: false,
-          selectedMode:false,
+          selectedMode: false,
           // type: "scroll",
           // orient: "vertical",
           // right: 10,

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

@@ -195,7 +195,7 @@ export default {
         grid: {
           left: "3%",
           right: "4%",
-          bottom: "2%",
+          bottom: 20,
           top: "20px",
           containLabel: true,
 
@@ -217,8 +217,8 @@ export default {
               },
             },
             axisLabel: {
-              interval: 0,
-              rotate: -45,
+              // interval: 0,
+              // rotate: -45,
               fontSize: 12,
               color: "#fff",
             },

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

@@ -20,7 +20,7 @@
         style="
           position: absolute;
           right: 0px;
-          top: 28px;
+          top: 35px;
           height: calc(100% - 50px);
         "
       >
@@ -176,7 +176,7 @@ export default {
           type: "scroll",
           right: 5,
         },
-        color: ["#91cc75", "#fac858"],
+        color:['#5470c6','#91cc75','#ee6666'],
         grid: {
           // left: "3%",
           // right: "4%",

src/views/board/index.vue

@@ -129,7 +129,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(["orgId", "depTree", "orgName"]),
+    ...mapGetters(["orgId", "depTree", "orgName","orgType"]),
     orgOptions() {
       let deps = this.depTree;
       let recursion = (deps) => {
@@ -190,10 +190,10 @@ export default {
     //   });
     // });
     this.selectedOrg = {
-      id: this.orgId,
+      id: this.orgId,      
       name: this.orgName,
     };
-
+    this.setMaxDiagram(this.orgType)    
     this.orgCascaderSelectedIds = [this.orgId];
   },
   beforeDestroy() {
@@ -231,12 +231,15 @@ export default {
         name: checked[0].data.shortName,
       };
 
-      if (checked[0].data.type == 3) {
+     this. setMaxDiagram(checked[0].data.type)      
+    },
+    setMaxDiagram(type){
+      if (type == 3) {
         this.maxDiagram = 10;
       } else {
         this.maxDiagram = null;
       }
-    },
+    }
   },
 };
 </script>

src/views/resumption/plan/distribute.vue

@@ -124,6 +124,7 @@ export default {
     },
     onHide() {
       this.info = this.emptyInfo();
+      this.filterName=null;
       this.isShow = false;
     },
     onSubmit() {

src/views/safetycheck/plan/distribute.vue

@@ -128,6 +128,7 @@ export default {
     },
     onHide() {
       this.info = this.emptyInfo();
+      this.filterName=null;
       this.isShow = false;
     },
     onSubmit() {

src/views/safetycheck/task/index.vue

@@ -608,6 +608,7 @@ export default {
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
       this.queryParams.range = [new Date(),new Date()];
 
+      this.refresh();
     },
     handleAdd() {
       let path = "/safetycheck/tempregister/add";
@@ -628,6 +629,11 @@ export default {
           }
         });
     },
+    refresh(){
+      this.queryParams.pageNum=1;
+      this.queryParams.pageSize=10;
+      this.getList();
+    },
     async getList() {
       // console.log(this.queryParams, "this.queryParams2222");
       this.loading = true;