土地整治—耕地

src/views/LandConsolidation/components/config.js

@@ -49,7 +49,7 @@ export const xzForm = [
       span: 20,
       component: 'ElInput',
       componentProps: {
-        placeholder: '请输入地块编号'
+        placeholder: '请输入图斑编号'
       }
     },
     {
@@ -59,9 +59,10 @@ export const xzForm = [
   ]
 ]
 export const xzTableHeader = [
-  { label: "地块编号", prop: "xzgdlydlbm", align: 'center', align: 'center' },
-  { label: "面积（亩）", prop: "xzgdmj", slot: "mj", align: 'center' },
-  { label: "等别", prop: "xzgddb", align: 'center' },
+  { label: "图斑编号", prop: "tbbh", align: 'center' },
+  { label: "地类名称", prop: "zzhdlmc", align: 'center' },
+  { label: "面积（亩）", prop: "tbmj_m", slot: "mj", align: 'center' },
+  { label: "等别", prop: "xzgddb", width: '50px',align: 'center' },
   { label: "操作", slot: "action", width: '80px', align: 'center' },
 ]
 export const detailInfosold = [

src/views/LandConsolidation/components/contrast.vue

@@ -23,7 +23,7 @@
         class="sm-tool-btn sm-btn"
         title="目录"
         @click="$set(layers, i, !layers[i])"
-        v-show="active == 1"
+        v-show="ptaye == 'gdbh' || active == 1"
       >
         <span class="iconfont icontuceng"></span>
       </li>
@@ -32,11 +32,11 @@
         <el-checkbox-group v-model="checkdata[0]" v-if="dbdata.fp.length > 1">
           <el-checkbox
             v-for="mli in dbdata.fp"
-            :key="mli.dlbmmc"
-            :label="mli.dlbmmc"
-            @change="(c) => clickcheck(i, mli.dlbmmc, c)"
+            :key="mli[fpname]"
+            :label="mli[fpname]"
+            @change="(c) => clickcheck(i, mli[fpname], c)"
           >
-            {{ mli.dlbmmc }}
+            {{ mli[fpname] }}
             <span
               :style="`background: ${mli.dict_color}`"
               class="lcolor"
@@ -44,7 +44,9 @@
           </el-checkbox>
         </el-checkbox-group>
       </div>
-      <div class="sm-toolTitle">{{ `整治${!i ? "前" : "后"}地类图斑` }}</div>
+      <div v-if="ptaye != 'gdbh'" lass="sm-toolTitle">
+        {{ `整治${!i ? "前" : "后"}地类图斑` }}
+      </div>
     </div>
     <AsideBottom
       ref="aside"
@@ -67,9 +69,9 @@ import { QueryOne, QueryList } from "@/api/cockpitNew";
 let geoSources = {};
 export default {
   props: {
-    ptaye:{
+    ptaye: {
       type: String,
-    }
+    },
   },
   data() {
     return {
@@ -81,6 +83,7 @@ export default {
       imagelayers: {},
       nolayer: "",
       layersData: [],
+      fpname: "dlbmmc",
     };
   },
   components: { AsideBottom },
@@ -100,7 +103,13 @@ export default {
     },
     show(data) {
       console.log(data);
+      this.fpname = this.$props.ptaye == "gdbh" ? "year" : "dlbmmc";
       this.dbdata = { ...this.dbdata, ...data };
+      if (this.$props.ptaye == "gdbh") {
+        this.layersData = data.fp;
+        this.$refs.aside.setdata(this.layersData);
+      }
+      this.active = 0;
       this.onClick(0);
     },
     async GetServer() {
@@ -135,7 +144,51 @@ export default {
     },
 
     clickml() {},
-    async onClick(i) {
+    onClick(i) {
+      if (this.$props.ptaye == "gdbh") {
+        this.onGdbhClick(i);
+      } else {
+        this.onTdzzClick(i);
+      }
+    },
+
+    async onGdbhClick(i) {
+      if (i == 3) {
+        this.reset();
+        return;
+      }
+      this.active = i;
+
+      if (i == 0) {
+        // store.setaddNode([
+        //   { id: "ttzz", url: this.dbdata.zzq, label: "土地整治对比" },
+        // ]);
+        this.setImager({ url: this.dbdata.zzq, year: "qian", top: true }, true);
+        this.setImager(
+          { url: this.dbdata.zzh, year: "hou", top: true },
+          true,
+          (layer) => {
+            useRoller(true, "lrRoller", "leftRoller", "", false);
+            setImageryRoller(layer);
+          }
+        );
+      } else {
+        hideImageryRoller(this.imagelayers["hou"]);
+        useRoller(false);
+      }
+      // this.multiView();
+      // if (i == 2) {
+      //   this.$refs.aside.activeVal == 0;
+      //   this.$refs.aside.clickHandler();
+      // } else {
+      //   this.reset();
+      // }
+      // if (this.active != 0) {
+      //   this.setImager({ year: "qian" }, false);
+      //   this.setImager({ year: "hou" }, false);
+      // }
+    },
+    async onTdzzClick(i) {
       if (i == 3) {
         this.reset();
         return;

src/views/LandConsolidation/components/xzgd.vue

@@ -17,11 +17,11 @@
     >
       <el-tab-pane label="新增耕地总览情况" name="gdzl">
         <div class="content sdata">
-          <div class="item" v-for="(sd, index) in sdlist" :key="index">
+          <div class="item" v-for="(sd, si) in sdlist" :key="si">
             <div class="text">
               <p>{{ sd.name }}</p>
               <span class="cvalue"
-                >{{ (sdata[sd.prop] || 0).toFixed(2) }}
+                >{{ (sdata[sd.prop] || 0).toFixed(si == 2 ? 0 : 2) }}
               </span>
               <span class="unit">{{ sd.unit }}</span>
             </div>
@@ -74,7 +74,7 @@ export default {
       sdlist: [
         { name: "新增耕地面积", prop: "area_number_gq", unit: "公顷" },
         { name: "新增耕地面积", prop: "area_number_m", unit: "亩" },
-        { name: "新增耕地地块数", prop: "count_number", unit: "个" },
+        { name: "新增耕地地块数", prop: "count_number", unit: "个", fiex: 0 },
       ],
       // tab: 0,
       xmdata: {},
@@ -123,7 +123,7 @@ export default {
       getsjzlXzgd(this.params).then((res) => {
         res.data.map((a) => {
           a.name = a.zzhdlmc;
-          a.value = a.area_number.toFixed(2);
+          a.value = a.area_number_m.toFixed(2);
         });
         this.setEchart({ data: res.data, type: '"horizontal"' }, 0);
         this.$emit("updateParent", "loading", false);
@@ -133,7 +133,7 @@ export default {
       getXzgdly(this.params).then((res) => {
         res.data.map((a) => {
           a.name = a.dlmc;
-          a.value = a.area_number.toFixed(2);
+          a.value = a.area_number_m.toFixed(2);
         });
         this.setEchart({ data: res.data, type: '"horizontal"' }, 1);
         this.$emit("updateParent", "loading", false);