Browse Source

判定结果情况柱状图统计

maxiaoxiao 13 hours ago
parent
commit
bbe471358d
1 changed files with 13 additions and 10 deletions
  1. 13 10
      src/views/pageCode/statistic/progress/index.vue

+ 13 - 10
src/views/pageCode/statistic/progress/index.vue

@@ -397,7 +397,7 @@ function changeNtype() {
   } else if (route.query.type == "judge") {
     mname = judgetype.value + (ntype.value == "0" ? "_number" : "_sum");
   } else {
-    mname = judgetype.value + (ntype.value == "0" ? "_number" : "_sum");
+    mname = resulttype.value + (ntype.value == "0" ? "_number" : "_sum");
   }
   echartsMap.value.init(mapVals.value, mname);
 }
@@ -412,15 +412,18 @@ function setLnbh(data) {
     eData.value.legend = ["合法用地", "违法用地", "其它用地"];
   else eData.value.legend = [];
   data.forEach((res, i) => {
-    eData.value.xData.push(res.xzqmc);
-    if (route.query.type == "all") {
-      eData.value.yData[0].push(
-        res[ntype.value == "0" ? "countNumber" : "countSum"]
-      );
-    } else if (route.query.type == "judge") {
-      let name = bartype.value == "0" ? "_number" : "_sum";
-      for (let bi = 0; bi < 3; bi++) {
-        eData.value.yData[bi].push(res[`v${bi + 2}${name}`]);
+    if (i) {//去掉合计
+      eData.value.xData.push(res.xzqmc);
+      if (route.query.type == "all") {
+        eData.value.yData[0].push(
+          res[ntype.value == "0" ? "countNumber" : "countSum"]
+        );
+      } else {
+        //if (route.query.type == "judge")
+        let name = bartype.value == "0" ? "_number" : "_sum";
+        for (let bi = 0; bi < 3; bi++) {
+          eData.value.yData[bi].push(res[`v${bi + 2}${name}`]);
+        }
       }
     }
   });