整治项目、新增耕地流程和上图梳理

src/views/LandConsolidation/components/config.js

@@ -157,15 +157,15 @@ export const tbInfos = [
     { flag: 'value', value: 'tbmj', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'KCDLBM？', span: 6 },
+    { flag: 'label', value: '扣除地类编码', span: 6 },
     { flag: 'value', value: 'kcdlbm', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'KCXS？', span: 6 },
+    { flag: 'label', value: '扣除地类系数', span: 6 },
     { flag: 'value', value: 'kcxs', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'KCMJ？', span: 6 },
+    { flag: 'label', value: '扣除地类面积', span: 6 },
     { flag: 'value', value: 'kcmj', span: 14 },
   ]],
   [[
@@ -181,11 +181,11 @@ export const tbInfos = [
     { flag: 'value', value: 'gdpdjb', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'FRDBS？', span: 6 },
+    { flag: 'label', value: '飞入地标识', span: 6 },
     { flag: 'value', value: 'frdbs', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'CZCSXM？', span: 6 },
+    { flag: 'label', value: '城镇村属性码', span: 6 },
     { flag: 'value', value: 'czcsxm', span: 14 },
   ]],
   [[
@@ -229,23 +229,23 @@ export const tbInfos = [
     { flag: 'value', value: 'qsdwmc', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'ZLDWMC？', span: 6 },
+    { flag: 'label', value: '坐落单位名称', span: 6 },
     { flag: 'value', value: 'zldwmc', span: 14 },
   ]],
   [[
-    { flag: 'label', value: 'ZLDWDM？', span: 6 },
+    { flag: 'label', value: '坐落单位代码', span: 6 },
     { flag: 'value', value: 'zldwdm', span: 14 },
   ]],
   [[
-    { flag: 'label', value: '新增耕地来源地类编码？', span: 6 },
+    { flag: 'label', value: '新增耕地来源地类编码', span: 6 },//？
     { flag: 'value', value: 'xzgdlydlbm', span: 14 },
   ]],
   [[
-    { flag: 'label', value: '新增耕地来源地类名称？', span: 6 },
+    { flag: 'label', value: '新增耕地来源地类名称', span: 6 },//？
     { flag: 'value', value: 'xzgdlydlmc', span: 14 },
   ]],
   [[
-    { flag: 'label', value: '新增耕地面积？', span: 6 },
+    { flag: 'label', value: '新增耕地面积', span: 6 },//？
     { flag: 'value', value: 'xzgdmj', span: 14 },
   ]],
   [[
@@ -253,7 +253,7 @@ export const tbInfos = [
     { flag: 'value', value: 'xzgddb', span: 14 },
   ]],
   [[
-    { flag: 'label', value: '新增耕地来源项目？', span: 6 },
+    { flag: 'label', value: '新增耕地来源项目', span: 6 },//？
     { flag: 'value', value: 'xzgdlyxm', span: 14 },
   ]],
 ]
@@ -261,32 +261,32 @@ export const tbInfos = [
 
 // 新增耕地详情
 export const xzgdInfos = [
-  { name: '图斑编号', value: 'carNo' },
+  { name: '图斑编号', value: 'tbbh' },
   { name: '权属性质', value: 'qsxz' },
   { name: '图斑面积', value: 'tbmj' },
-  { name: '整治后地类名称', value: 'carNo' },
-  { name: 'KCDLBM', value: 'kcdlbm' },
-  { name: 'KCXS', value: 'kcxs' },
-  { name: 'KCMJ', value: 'kcmj' },
-  { name: '图斑地类面积', value: 'carNo' },
-  { name: '耕地类型', value: 'carNo' },
-  { name: '耕地坡度级别', value: 'carNo' },
-  { name: 'FRDBS', value: 'carNo' },
-  { name: 'CZCSXM', value: 'carNo' },
-  { name: 'XX年份', value: 'carNo' },
-  { name: '备注', value: 'carNo' },
-  { name: '标识码', value: 'carNo' },
-  { name: '要素代码', value: 'carNo' },
-  { name: '整治后地类编码', value: 'carNo' },
-  { name: '权属单位代码', value: 'carNo' },
-  { name: '权属单位名称', value: 'carNo' },
-  { name: '单位代码', value: 'carNo' },
-  { name: '单位名称', value: 'carNo' },
-  { name: '新增耕地来源地类编码', value: 'carNo' },
-  { name: '新增耕地来源地类名称', value: 'carNo' },
-  { name: '新增耕地面积', value: 'carNo' },
-  { name: '新增耕地等别', value: 'carNo' },
-  { name: '新增耕地来源项目', value: 'carNo' },
+  { name: '整治后地类名称', value: 'zzhdlmc' },
+  { name: '扣除地类编码', value: 'kcdlbm' },
+  { name: '扣除地类系数', value: 'kcxs' },
+  { name: '扣除地类面积', value: 'kcmj' },
+  { name: '图斑地类面积', value: 'tbdlmj' },
+  { name: '耕地类型', value: 'gdlx' },
+  { name: '耕地坡度级别', value: 'gdpdjb' },
+  { name: '飞入地标识', value: 'frdbs' },
+  { name: '城镇村属性码', value: 'czcsxm' },
+  { name: '年份', value: 'sjnf' },
+  { name: '备注', value: 'bz' },
+  { name: '标识码', value: 'bsm' },
+  { name: '要素代码', value: 'ysdm' },
+  { name: '整治后地类编码', value: 'zzhdlbm' },
+  { name: '权属单位代码', value: 'qsdwdm' },
+  { name: '权属单位名称', value: 'qsdwmc' },
+  { name: '单位代码', value: 'zldwdm' },
+  { name: '单位名称', value: 'zldwmc' },
+  { name: '新增耕地来源地类编码', value: 'xzgdlydlbm' },
+  { name: '新增耕地来源地类名称', value: 'xzgdlydlmc' },
+  { name: '新增耕地面积', value: 'xzgdmj' },
+  { name: '新增耕地等别', value: 'xzgddb' },
+  { name: '新增耕地来源项目', value: 'xzgdlyxm' },
 ]
 
 

src/views/LandConsolidation/components/details.vue

@@ -2,7 +2,7 @@
   <div class="conViews">
     <div class="sm-panel sm-function-module-query" v-drag v-if="isShallow">
       <div class="sm-panel-header">
-        <span> 项目详情 </span>
+        <span> {{ type == "耕地" ? "新增耕地地块详情" : "项目详情" }} </span>
         <i class="el-icon-close" @click="closeInster"></i>
       </div>
       <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
@@ -13,7 +13,8 @@
             @Rowclicked="Rowclicked"
           ></Info>
         </el-tab-pane>
-        <el-tab-pane label="进度跟踪" name="rdxx"> </el-tab-pane>
+        <el-tab-pane label="进度跟踪" name="rdxx" v-if="type != '耕地'">
+        </el-tab-pane>
       </el-tabs>
     </div>
     <el-dialog
@@ -37,7 +38,7 @@ import { GetDetail } from "@/api/Idleland.js";
 import Info from "../../Idleland/components/info.vue";
 import CustomDetails from "@/components/mapView/custom-detailsInfo.vue";
 import { getXmList, getXm } from "@/api/stxf/tdzz.js";
-import { detailInfos, tbInfos } from "./config";
+import { detailInfos, tbInfos, xzgdInfos } from "./config";
 export default {
   props: {
     interObj: {
@@ -55,6 +56,7 @@ export default {
       datainfo: tbInfos,
       tempdataLayerId: null,
       dialogVisible: false,
+      type: "",
     };
   },
   mounted() {
@@ -69,12 +71,13 @@ export default {
       this.dialogVisible = false;
     },
     handleView(val, type) {
+      this.type = type;
+      (this.activeTabs = "jbxx"), (this.jbxxData = []);
       if (type == "整治图斑") {
         this.dialogVisible = true;
         this.formData = val;
       } else if (type == "整治项目") {
         this.isShallow = true;
-        this.jbxxData = [];
         getXm(val.id).then((res) => {
           if (res.code == 200) {
             // Object.keys(res.data).forEach((key) => {
@@ -84,7 +87,7 @@ export default {
             detailInfos.forEach((key) => {
               this.jbxxData.push({
                 name: key.name,
-                value: res.data[key.value] || "-",
+                value: res.data[key.value],
               });
             });
           } else {
@@ -92,11 +95,9 @@ export default {
           }
         });
       } else {
+        this.isShallow = true;
         xzgdInfos.forEach((key) => {
-          this.jbxxData.push({
-            name: key.name,
-            value: res.data[key.value],
-          });
+          this.jbxxData.push({ name: key.name, value: val[key.value] });
         });
       }
     },

src/views/LandConsolidation/components/list.vue

@@ -108,7 +108,7 @@ export default {
     },
     getTableData() {
       this.$emit("updateParent", "loading", true);
-      this.removeGeoJSON();
+      this.removeGeoJSON("zzxm");
       getXmList(this.pageObj).then((res) => {
         this.$emit("updateParent", "loading", false);
         this.table = { total: res.total, data: res.rows };
@@ -126,7 +126,7 @@ export default {
       newVal.forEach((item, index) => {
         item.tQytdzzZzxm.forEach((res) => {
           if (res.geom)
-            loadGeoJSON(res.geom, "#55A1E3", { isfly: true }, (data) => {
+            loadGeoJSON(res.geom, "#facd91", { isfly: false }, (data) => {
               geoSources[res.pid + res.id] = data;
               data.name = "zzxm";
               res.entity = "整治图斑";
@@ -138,24 +138,30 @@ export default {
       });
     },
     flyTo(item) {
-      let xzqdm = "h_" + item.xzqdm;
-      this.tempdataLayerId = xzqdm;
-      if (geoSources[xzqdm]) return;
-      loadGeoJSON(item.geom, "#ff0000", { isfly: true }, (data) => {
-        data.name = "zzxm";
-        geoSources[xzqdm] = data;
-        data.entities.values.forEach((entity) => {
-          entity.properties = { type: "图斑上图", xzqdm: item.xzqdm };
-        });
+      // let xzqdm = "h_" + item.xzqdm;
+      // this.tempdataLayerId = xzqdm;
+      // if (geoSources[xzqdm]) return;
+      this.removeGeoJSON("zzxmhig");
+      item.tQytdzzZzxm.forEach((res) => {
+        if (res.geom)
+          loadGeoJSON(res.geom, "#ff0000", { isfly: true }, (data) => {
+            data.name = "zzxmhig";
+            geoSources[res.pid + res.id] = data;
+            res.entity = "整治图斑";
+            data.entities.values.forEach((entity) => {
+              entity.properties = { type: "图斑上图", res };
+            });
+          });
       });
     },
-    removeGeoJSON() {
+    removeGeoJSON(name) {
       if (!window.viewer) return;
-      viewer.entities.removeAll();
-      viewer.dataSources.removeAll();
-      // viewer.dataSources._dataSources.forEach((das) => {
-      //   if (das.name == "zzxm") {viewer.dataSources.remove(das);}
-      // });
+      // viewer.entities.removeAll();
+      // viewer.dataSources.removeAll();
+      for (var i = viewer.dataSources._dataSources.length - 1; i >= 0; i--) {
+        var das = viewer.dataSources._dataSources[i];
+        if (das.name == name) viewer.dataSources.remove(das);
+      }
     },
 
     reset(xzqh) {
@@ -166,9 +172,10 @@ export default {
         pageNum: 1,
         pageSize: 10,
       };
+      this.removeGeoJSON();
     },
     detail(row) {
-      // this.flyTo(row);
+      this.flyTo(row);
       this.bus.$emit("handleView", row, "整治项目");
     },
     handle(row) {

src/views/LandConsolidation/components/sdgk.vue

@@ -194,7 +194,7 @@ export default {
         if (res.geom)
           loadGeoJSON(res.geom, color, { isfly: true }, (data) => {
             geoSources[res.id] = data;
-            data.name = "LandConsolidation";
+            data.name = res.type = 0 ? "sdqy" : "zzqy";
             // data.entities.values.forEach((entity) => {
             //   entity.properties = { type: "图斑上图", id: res.id };
             // });
@@ -202,9 +202,9 @@ export default {
       });
     },
     reset() {
-      if (!window.viewer) return;
-      viewer.entities.removeAll();
-      viewer.dataSources.removeAll();
+      // if (!window.viewer) return;
+      // viewer.entities.removeAll();
+      // viewer.dataSources.removeAll();
       // viewer.dataSources._dataSources.forEach((das) => {
       //   if (das.name == "LandConsolidation") {viewer.dataSources.remove(das);}
       // });

src/views/LandConsolidation/components/xzgd.vue

@@ -165,6 +165,9 @@ export default {
         this.$refs[`echartRef${id}`].setOptions(data, links);
       });
     },
+    reset(){
+      this.$refs.xzlist.reset()
+    }
   },
   watch: {
     region(newValue) {

src/views/LandConsolidation/components/xzlist.vue

@@ -129,11 +129,12 @@ export default {
     },
     removeGeoJSON() {
       if (!window.viewer) return;
-      viewer.entities.removeAll();
-      viewer.dataSources.removeAll();
-      // viewer.dataSources._dataSources.forEach((das) => {
-      //   if (das.name == "Idleland") {viewer.dataSources.remove(das);}
-      // });
+      // viewer.entities.removeAll();
+      // viewer.dataSources.removeAll();
+      for (var i = viewer.dataSources._dataSources.length - 1; i >= 0; i--) {
+        var das = viewer.dataSources._dataSources[i];
+        if (das.name == "xzgd") viewer.dataSources.remove(das);
+      }
     },
 
     reset(xzqh) {
@@ -144,6 +145,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       };
+      this.removeGeoJSON();
     },
     detail(row) {
       this.flyTo(row);

src/views/LandConsolidation/index.vue

@@ -191,16 +191,19 @@ export default {
     onClick(val, xmdata) {
       this.activeIndex = val;
       if (val != 0) this.$refs.sdgk.reset();
+      if (val != 1) this.$refs.list.reset();
+      if (val != 2) this.$refs.xzgd.reset();
       if (val == 0) {
         this.$refs.sdgk.regionChange(this.xzqh);
         this.$refs.qhdb.regionChange(this.xzqh);
         this.$refs.organize.regionChange(this.xzqh);
       }
       if (val == 1) this.$refs.list.regionChange(this.xzqh);
+
       if (val == 2) this.$refs.xzgd.regionChange(this.xzqh, xmdata);
     },
     goxzgd(xmdata) {
-      this.onClick(2,xmdata);
+      this.onClick(2, xmdata);
     },
   },
   watch: {