驾驶舱调试

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

@@ -3,21 +3,26 @@
   <div class="chart-template report">
     <!-- <div class="line"></div> -->
     <div class="static_info">
-      <div class="title">GA38达标统计</div>
+      <div class="title">GA38达标率统计</div>
       <div class="content">
         <div>
-          <div v-for="item in data[0]">
-            {{ item.orgName }},达标率:{{ item.reachRate * 100 + "%" }}
+          <div v-if="data.length>=1" v-for="item in data[0]">
+            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <div>
-          <div v-for="item in data[1]">
-            {{ item.orgName }},达标率:{{ item.reachRate * 100 + "%" }}
+          <div  v-if="data.length>=1" v-for="item in data[1]">
+            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <div>
-          <div v-for="item in data[2]">
-            {{ item.orgName }},达标率:{{ item.reachRate * 100 + "%" }}
+          <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]">
+            {{ item.orgName }}:{{ item.reachRate * 100 + "%" }}
           </div>
         </div>
         <!-- <div><div v-for="item in data[3]">{{item.orgName}},达标率:{{item.rate*100+'%'}}</div></div> -->
@@ -114,20 +119,21 @@ export default {
       //   },
       // ];
 
-      // let columnCount = 3;
-      let r = await orgGA38(this.orgId);
-      this.data = [];
+      let columnCount = 4;
+      let r =(await orgGA38(this.orgId)).data;
+      let data = [];
 
       for (let i in r) {
         let columnIndex = i % columnCount;
-        if (!this.data[columnIndex]) {
-          this.data[columnIndex] = [];
+        if (!data[columnIndex]) {
+          data[columnIndex] = [];
         }
-        data[i].orgName = parseInt(i) + 1 + "." + data[i].orgName;
-        this.data[columnIndex].push(data[i]);
+        r[i].orgName = parseInt(i) + 1 + "." + r[i].orgName;
+        data[columnIndex].push(r[i]);
       }
 
-      console.info(this.data);
+      this.data=data;
+      console.info("data",this.data);
     },
 
     windowResize() {

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

@@ -122,8 +122,14 @@ export default {
       //   notQuestion: 4*bs,
       //   reformed: (500 - 112 - 20 - 50 - 4)*bs,
       // };
-      let r = question({ orgId: this.orgId, period: this.activeName });
+      let r = (await  question({ orgId: this.orgId, period: this.activeName })).data;
+
       this.data = r;
+      if(r.total==0){
+        this.data.reformRate=1;
+      }else{
+        this.data.reformRate=(r.reformed/r.total).toFixed(2);
+      }
     },
 
     windowResize() {
@@ -195,7 +201,7 @@ export default {
               color: "#fff",
               fontSize: 14,
               formatter: function (value) {
-                return "总数:100\n" + "\n整改率:78%";
+                return `总数:${t.data.total}\n\n整改率:${t.data.reformRate*100}%`;
               },
             },
             emphasis: {

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

@@ -124,21 +124,22 @@ export default {
       this.isMouseOver = false;
     },
     async getData() {
-      let r = await this.api({ orgId: this.orgId, period: this.activeName });
+      let r = (await this.api({ orgId: this.orgId, period: this.activeName }))
+        .data;
       let data = {
         all: [],
         completed: [],
-        rate:[],
+        rate: [],
         name: [],
       };
 
-      for(let item of data){
+      for (let item of r) {
         data.all.push(item.taskTotal);
         data.completed.push(item.completedCount);
-        data.rate.push((item.completedRate*100).toFixed(0))
-        data.name.push(item.orgName)
+        data.rate.push((item.completedRate * 100).toFixed(0));
+        data.name.push(item.orgName);
       }
-      this.data=data;
+      this.data = data;
       // let bs = parseInt(this.activeName) + 1;
       // this.data = {
       //   all: [
@@ -214,7 +215,7 @@ export default {
           axisPointer: {
             type: "shadow",
           },
-          formatter: "{c}%",
+          formatter: "完成率：{c}%",
         },
         legend: {
           show: false,
@@ -293,7 +294,7 @@ export default {
                     // } else {
                     //   return "";
                     // }
-                    return param.value.toFixed(0) + "%";
+                    return parseFloat(param.value).toFixed(0) + "%";
                   },
                   show: true,
                   position: "top",