判定结果情况

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

@@ -60,22 +60,47 @@ export const judgeTable = [
   // { label: "图斑数", prop: "countNumber", width: '70px' },
   // { label: "图斑面积", prop: "countSum", width: '100px', align: 'center' },
   {
-    label: "监测图斑", list: [
+    label: "监测图斑", align: 'center', list: [
       { label: "图斑数", prop: "v1_number", width: '70px' },
       { label: "图斑面积", prop: "v1_sum", width: '100px', align: 'center' },]
   },
   {
-    label: "未判定图斑", list: [
+    label: "未判定图斑", align: 'center', list: [
       { label: "图斑数", prop: "v2_number", width: '70px' },
       { label: "图斑面积", prop: "v2_sum", width: '100px', align: 'center' },]
   },
   {
-    label: "已判定图斑（拆分前）", list: [
+    label: "已判定图斑（拆分前）", align: 'center', list: [
       { label: "图斑数", prop: "v3_number", width: '70px' },
       { label: "图斑面积", prop: "v3_sum", width: '100px', align: 'center' },]
   },
   {
-    label: "已判定图斑（拆分后）", list: [
+    label: "已判定图斑（拆分后）", align: 'center', list: [
+      { label: "图斑数", prop: "v4_number", width: '70px' },
+      { label: "图斑面积", prop: "v4_sum", width: '100px', align: 'center' },]
+  },
+]
+export const resultTable = [
+  { label: "行政区", prop: "xzqmc", width: '80px', align: 'center' },
+  // { label: "图斑数", prop: "countNumber", width: '70px' },
+  // { label: "图斑面积", prop: "countSum", width: '100px', align: 'center' },
+  {
+    label: "已判定", align: 'center', list: [
+      { label: "图斑数", prop: "v1_number", width: '70px' },
+      { label: "图斑面积", prop: "v1_sum", width: '100px', align: 'center' },]
+  },
+  {
+    label: "合法用地", align: 'center', list: [
+      { label: "图斑数", prop: "v2_number", width: '70px' },
+      { label: "图斑面积", prop: "v2_sum", width: '100px', align: 'center' },]
+  },
+  {
+    label: "违法用地", align: 'center', list: [
+      { label: "图斑数", prop: "v3_number", width: '70px' },
+      { label: "图斑面积", prop: "v3_sum", width: '100px', align: 'center' },]
+  },
+  {
+    label: "其它用地", align: 'center', list: [
       { label: "图斑数", prop: "v4_number", width: '70px' },
       { label: "图斑面积", prop: "v4_sum", width: '100px', align: 'center' },]
   },

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

@@ -118,7 +118,9 @@
           <el-table-column
             v-for="(columni, cindex) in route.query.type == 'all'
               ? allTable
-              : judgeTable"
+              : route.query.type == 'judge'
+              ? judgeTable
+              : resultTable"
             :key="cindex"
             :prop="columni.prop"
             :label="columni.label"
@@ -151,7 +153,7 @@
             />
           </el-select>
         </div>
-        <bar class="pie_echart" ref="echartRef"></bar>
+        <bar class="bar_echart" ref="echartRef"></bar>
       </div>
     </div>
   </div>
@@ -161,8 +163,8 @@
 import customForm from "@/components/custom-form.vue";
 import EchartsMap from "@/components/echarts/EchartsMap.vue";
 import bar from "@/components/echarts/bar.vue";
-import { FormConfig, titles, units, allTable, judgeTable } from "./config";
-import { zllist } from "./config";
+import { FormConfig, allTable, judgeTable, resultTable } from "./config";
+import { zllist, titles, units } from "./config";
 import { nextTick } from "vue";
 import { userDept } from "@/api/system/dept";
 import {
@@ -202,7 +204,7 @@ const data = reactive({
   eData: {
     xData: [],
     yData: [[]],
-    legend: ["未判定", "已判定（拆分前）", "已判定（拆分后）"],
+    legend: [],
     yName: "个",
     stack: "ad",
     barWidth: "20px",
@@ -393,29 +395,27 @@ function changeNtype() {
 function setLnbh(data) {
   //eData.value.yName = `变化面积${this.unitList[this.nowunit].unit}`;
   eData.value.xData = [];
+  // eData.value.yData = [[]];
   eData.value.yData = [[], [], [], []];
-  data.forEach((res) => {
+  if (route.query.type == "judge")
+    eData.value.legend = ["未判定", "已判定（拆分前）", "已判定（拆分后）"];
+  else if (route.query.type == "judge")
+    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") {
-      eData.value.yData[0].push(
-        res[ntype.value == "0" ? "v1_number" : "v1_sum"]
-      );
-      eData.value.yData[1].push(
-        res[ntype.value == "0" ? "v2_number" : "v2_sum"]
-      );
-      eData.value.yData[2].push(
-        res[ntype.value == "0" ? "v3_number" : "v3_sum"]
-      );
-      eData.value.yData[3].push(
-        res[ntype.value == "0" ? "v4_number" : "v4_sum"]
-      );
+      let name = bartype.value == "0" ? "_number" : "_sum";
+      for (let bi = 0; bi < 4; bi++) {
+        eData.value.yData[bi].push(res[`v${bi + 1}${name}`]);
+      }
     }
   });
-  console.log(eData.value, "eData.value");
+  console.log(eData.value.yData, "eData.value");
   echartRef.value.setOptions(eData.value);
 }
 
@@ -538,7 +538,7 @@ getList();
     margin-top: 10px;
   }
 
-  .pie_echart {
+  .bar_echart {
     margin-top: 20px;
     /* margin-left: 20px; */
     width: 43vw;