src/views/pageCode/statistic/progress/config.js

@@ -32,10 +32,10 @@ export const zllist = {
     { name: "已判定\n图斑\n(拆分后)", prop: "PDCFH", sel: 'v4' },
   ],
   result: [
-    { name: "已判定\n图斑", prop: "PDAll", api: "pdjg", sel: 'v1' },
-    { name: "判定为\n合法用地", prop: "PDHF", prop3: "占比", api: "pdjg", sel: 'v2' },
-    { name: "判定为\n违法用地", prop: "PDWF", prop3: "占比", api: "pdjg", sel: 'v3' },
-    { name: "判定为\n其它用地", prop: "PDQT", prop3: "占比", api: "pdjg", sel: 'v4' },
+    { name: "已判定\n图斑", prop: "PDAll",  sel: 'v1' },
+    { name: "判定为\n合法用地", prop: "PDHF", prop3: "占比",  sel: 'v2' },
+    { name: "判定为\n违法用地", prop: "PDWF", prop3: "占比",  sel: 'v3' },
+    { name: "判定为\n其它用地", prop: "PDQT", prop3: "占比",  sel: 'v4' },
   ],
 }
 export const titles = {

src/views/pageCode/statistic/progress/index.vue

@@ -261,12 +261,15 @@ let countparm = {
   },
   result: {
     PDAll: [
+      { auditflowStep: "XJTJ" },
       { auditflowStep: "SJSH" },
-      { auditflowStep: "XJTJ", successType: "0" },
+      { auditflowStep: "SJTJ" },
+      { auditflowStep: "SJJSH" },
+      { auditflowStep: "SJJTJ" },
     ],
-    PDHF: [{ auditflowStep: "SJSH" }],
-    PDWF: [{ auditflowStep: "SJTJ" }],
-    PDQT: [{ auditflowStep: "SJJTJ", successType: "1" }],
+    PDHF: 0,
+    PDWF: 1,
+    PDQT: 2,
   },
 };
 onMounted(() => {});
@@ -295,6 +298,8 @@ function getData() {
       key == "PDWF" ||
       key == "PDQT"
     ) {
+      pram.auditflowList = prams["PDAll"];
+      pram.decide = key == "PDAll" ? undefined : prams[key];
       getjgCout(pram).then((res) => {
         setCount(key, res.data);
       });
@@ -392,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);
 }
@@ -407,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}`]);
+        }
       }
     }
   });