判定结果情况接口联调

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

@@ -26,16 +26,16 @@ export const zllist = {
     { name: "省级\n已审核", prop: "SJJYSH", prop3: "完成进度" },
   ],
   judge: [
-    { name: "监测\n图斑", prop: "JCAll" },
-    { name: "未判定\n图斑", prop: "WPD", prop3: "占比" },
-    { name: "已判定\n图斑\n(拆分前)", prop: "PDCFQ", prop3: "占比" },
-    { name: "已判定\n图斑\n(拆分后)", prop: "PDCFH" },
+    { name: "监测\n图斑", prop: "JCAll", sel: 'v1' },
+    { name: "未判定\n图斑", prop: "WPD", prop3: "占比", sel: 'v2' },
+    { name: "已判定\n图斑\n(拆分前)", prop: "PDCFQ", prop3: "占比", sel: 'v3' },
+    { name: "已判定\n图斑\n(拆分后)", prop: "PDCFH", sel: 'v4' },
   ],
   result: [
-    { name: "已判定\n图斑", prop: "PDAll", api: "pdjg" },
-    { name: "判定为\n合法用地", prop: "PDHF", prop3: "占比", api: "pdjg" },
-    { name: "判定为\n违法用地", prop: "PDWF", prop3: "占比", api: "pdjg" },
-    { name: "判定为\n其它用地", prop: "PDQT", prop3: "占比", api: "pdjg" },
+    { 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' },
   ],
 }
 export const titles = {

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

@@ -58,9 +58,10 @@
       <div class="box-left-content">
         <div class="echartTitle">
           <div class="block-title">{{ titles[route.query.type] }}</div>
+          <!-- clearable -->
           <el-select
             v-if="route.query.type == 'judge'"
-            clearable
+            @change="changeNtype"
             v-model="judgetype"
             placeholder="请选择判定类型"
           >
@@ -68,12 +69,12 @@
               v-for="(item, index) in zllist.judge"
               :key="index"
               :label="item.name.replace(/\n/g, '')"
-              :value="index"
+              :value="item.sel"
             />
           </el-select>
           <el-select
             v-else-if="route.query.type == 'result'"
-            clearable
+            @change="changeNtype"
             v-model="resulttype"
             placeholder="请选择判定类型"
           >
@@ -81,7 +82,7 @@
               v-for="(item, index) in zllist.result"
               :key="index"
               :label="item.name.replace(/\n/g, '')"
-              :value="index"
+              :value="item.sel"
             />
           </el-select>
           <el-select v-model="ntype" @change="changeNtype">
@@ -219,8 +220,8 @@ const showdata = reactive({
   ],
   nunit: "0",
   bartype: "0",
-  judgetype: "",
-  resulttype: "",
+  judgetype: "v1",
+  resulttype: "v1",
 });
 const { queryParams, countData, eData } = toRefs(data);
 const { deptList, typeoptions, ntype, bartype, nunit, judgetype, resulttype } =
@@ -375,7 +376,7 @@ function setMap(data) {
           // center: [116.310316, 39.956074],
           // centroid: [116.23328, 40.026927],
           childrenNum: 0,
-          level: "district",
+          // level: "district",
           // acroutes: [100000, 110000],
           // parent: { adcode: 110000 },
         },
@@ -383,20 +384,28 @@ function setMap(data) {
       });
       mapVals.value.push({
         name: a.xzqmc,
-        value: { Number: a.countNumber + 100, Sum: a.countSum },
+        value: { Number: a.countNumber + 100, Sum: a.countSum, ...a.hzjg },
       });
     }
   });
   changeNtype();
 }
 function changeNtype() {
-  echartsMap.value.init(mapVals.value, ntype.value == "0" ? "Number" : "Sum");
+  let mname = "Number";
+  if (route.query.type == "all") {
+    mname = ntype.value == "0" ? "Number" : "Sum";
+  } else if (route.query.type == "judge") {
+    mname = judgetype.value + (ntype.value == "0" ? "_number" : "_sum");
+  } else {
+    mname = judgetype.value + (ntype.value == "0" ? "_number" : "_sum");
+  }
+  echartsMap.value.init(mapVals.value, mname);
 }
 function setLnbh(data) {
   //eData.value.yName = `变化面积${this.unitList[this.nowunit].unit}`;
   eData.value.xData = [];
   // eData.value.yData = [[]];
-  eData.value.yData = [[], [], [], []];
+  eData.value.yData = [[], [], []];
   if (route.query.type == "judge")
     eData.value.legend = ["未判定", "已判定（拆分前）", "已判定（拆分后）"];
   else if (route.query.type == "judge")
@@ -410,8 +419,8 @@ function setLnbh(data) {
       );
     } else if (route.query.type == "judge") {
       let name = bartype.value == "0" ? "_number" : "_sum";
-      for (let bi = 0; bi < 4; bi++) {
-        eData.value.yData[bi].push(res[`v${bi + 1}${name}`]);
+      for (let bi = 0; bi < 3; bi++) {
+        eData.value.yData[bi].push(res[`v${bi + 2}${name}`]);
       }
     }
   });