Browse Source

预检结果

maxiaoxiao 6 months ago
parent
commit
706835780a

+ 0 - 2
src/views/LandConsolidation/components/config.js

@@ -302,8 +302,6 @@ export const jslist = [{
   iseyes: false,
   isshow: true,
   scxstyle: 3,
-  area: 0,
-  area2: 0,
 },
 {
   id: "SQSX",

+ 16 - 13
src/views/LandConsolidation/components/fxjg.vue

@@ -33,7 +33,6 @@
           @click="eitem.isshow = !eitem.isshow"
         ></div>
       </div>
-      <div>{{ i == 1 ? eitem : "" }}</div>
 
       <scjgContent
         :ref="`contentRef${eitem.id}`"
@@ -54,7 +53,7 @@
 import scjgContent from "../../complianceAnalysis/components/scjgContent.vue";
 // import collRecursiveTree from "./collRecursiveTree.vue";
 import { getyjjg } from "@/api/stxf/tdzz.js";
-import {jslist} from "./config.js";
+import { jslist } from "./config.js";
 import parse from "wellknown";
 let dataSourceList = {};
 let colors = [
@@ -102,7 +101,7 @@ export default {
     },
     initData() {
       console.log("----", this.$props.scjgObj);
-      // this.echarts = [];
+      this.echarts = [];
       this.$emit("updateParent", "loading", true);
       this.addPolygon(this.$props.scjgObj.geom, "all", "#ff0000", true);
       getyjjg(this.$props.scjgObj.bsm).then((res) => {
@@ -124,22 +123,28 @@ export default {
             jdData.result[2].push(ci.ce_area);
             // zzh_geom
           });
-          this.setEchart(jdData, "QHBH");
-          res.data.SQSX.map((ci) => {
+          res.data.XZGD.map((ci) => {
+            ci.id = "XZGD" + i;
+          });
+          res.data.SQSX.map((ci, i) => {
             ci.name = ci.yzBsm;
             ci.value = ci.sumvalue;
+            ci.id = "SQSX" + i;
           });
           res.data.GHDK.map((ci) => {
             ci.name = ci.groupvalue;
             ci.value = ci.sumvalue;
+            ci.id = "GHDK" + i;
           });
 
-          this.echarts[0].dataList = res.data["3D"];
-          this.echarts[1].dataList = res.data.XZGD || [{}];
-          this.echarts[2].dataList = res.data.SQSX || [];
-          this.echarts[3].dataList = res.data.GHDK || [];
-          this.$set(this, "echarts", this.echarts);
+          jslist[0].dataList = res.data["3D"];
+          jslist[1].dataList = res.data.XZGD || [{}];
+          jslist[2].dataList = res.data.SQSX || [];
+          jslist[3].dataList = res.data.GHDK || [];
+          this.$set(this, "echarts", jslist);
+          this.echarts = jslist;
           // console.log(this., "this.echarts");
+          this.setEchart(jdData, "QHBH");
           this.setEchart(res.data.SQSX, "SQSX");
           this.setEchart(res.data.GHDK, "GHDK");
           this.$emit("updateParent", "loading", false);
@@ -291,9 +296,7 @@ export default {
       this.sertlist();
     },
     sertlist() {
-      this.echarts = [
-       
-      ];
+      this.echarts = jslist;
     },
   },
 

+ 4 - 4
src/views/complianceAnalysis/components/scjgContent.vue

@@ -35,14 +35,14 @@
     <div v-else-if="litem.scxstyle == 3" class="xzgdcontent">
       <div class="item">
         <p>新增耕地地块</p>
-        <span class="cvalue"
-          >{{ (litem.dataList[0].countvalue || 0).toFixed(2) }}
+        <span class="cvalue">
+          {{ litem.dataList.length ? litem.dataList[0].countvalue : 0 }}
         </span>
       </div>
       <div class="item">
         <p>新增耕地面积(平方米)</p>
-        <span class="cvalue"
-          >{{ (litem.dataList[0].sumvalue || 0).toFixed(2) }}
+        <span class="cvalue">
+          {{ litem.dataList.length ? litem.dataList[0].sumvalue : 0 }}
         </span>
       </div>
     </div>