整治项目

src/views/LandConsolidation/components/config.js

@@ -66,4 +66,198 @@ export const xzTableHeader = [
 ]
 
 
+export const detailInfosold = [
+  [[
+    { flag: 'label', value: '项目名称', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '主管部门', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '申请立项部门', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '批复部门', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '项目位置', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '建设规模', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '总资金', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '财政资金', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '社会资本', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '计划开工年度', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '计划验收年度', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '主要内容', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+]
+export const detailInfos = [
+  { 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' },
+]
+
+export const tbInfos = [
+  [[
+    { flag: 'label', value: '图斑编号', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '地类编码', span: 4 },
+    { flag: 'value', value: 'carTypeName', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '地类名称', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '权属性质', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '图斑面积', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'KCDLBM？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'KCXS？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'KCMJ？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '图斑地类面积', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '耕地类型', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '耕地坡度级别', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'FRDBS？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'CZCSXM？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'XX年份', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '备注', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '标识码', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '要素代码', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '项目类型', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '项目名称', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '整治后地类名称', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '整治后地类编码', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '权属单位代码', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '权属单位名称', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'ZLDWMC？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: 'ZLDWDM？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地来源地类编码？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地来源地类名称？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地面积？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地等别', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+  [[
+    { flag: 'label', value: '新增耕地来源项目？', span: 4 },
+    { flag: 'value', value: 'carNo', span: 20 }
+  ]],
+]
+
+
 

src/views/LandConsolidation/components/details.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="conViews" v-if="isShallow">
-    <div class="sm-panel sm-function-module-query" v-drag>
+  <div class="conViews">
+    <div class="sm-panel sm-function-module-query" v-drag v-if="isShallow">
       <div class="sm-panel-header">
         <span> 项目详情 </span>
         <i class="el-icon-close" @click="closeInster"></i>
@@ -12,18 +12,36 @@
         <el-tab-pane label="进度跟踪" name="rdxx"> </el-tab-pane>
       </el-tabs>
     </div>
+    <el-dialog
+      :title="1"
+      width="40%"
+      :visible.sync="dialogVisible"
+      :before-close="close"
+      :modal-append-to-body="false"
+      :close-on-click-modal="false"
+    >
+      <CustomDetails :model="formData" :config="detailInfos">
+        <template #attachment>
+          <span>{{ formData.attachment }}</span>
+          <i class="usable el-icon-tickets" @click="download"></i>
+        </template>
+      </CustomDetails>
+    </el-dialog>
   </div>
 </template>
   <script>
 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";
 export default {
   props: {
     interObj: {
       type: Object,
     },
   },
-  components: { Info },
+  components: { Info, CustomDetails },
   data() {
     return {
       activeTabs: "jbxx",
@@ -31,6 +49,7 @@ export default {
       jbxxData: [],
       rdData: [],
       tempdataLayerId: null,
+      dialogVisible: false,
     };
   },
   mounted() {
@@ -43,17 +62,15 @@ export default {
     },
 
     handleView(val, type) {
-      console.log("---",val, type)
       this.isShallow = true;
       this.jbxxData = [];
-      GetDetail(val.id).then((res) => {
-        if (res.statuscode == 200) {
-          // this.jbxxData = res.data;
-          Object.keys(res.data).forEach((key) => {
-            this.jbxxData.push({
-              name: key,
-              value: res.data[key],
-            });
+      getXm(val.id).then((res) => {
+        if (res.code == 200) {
+          // Object.keys(res.data).forEach((key) => {
+          //   this.jbxxData.push({ name: key, value: res.data[key] });
+          // });
+          detailInfos.forEach((key) => {
+            this.jbxxData.push({ name: key.name, value: res.data[key.value] });
           });
         } else {
           this.$message.error(res.message);
@@ -67,20 +84,20 @@ export default {
 </script>
   
   <style lang="scss" scoped>
-/deep/ .el-icon-close:before {
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  font-size: larger;
-  font-weight: bold;
-
-  &:hover {
-    color: aqua;
-  }
-}
 .sm-panel {
   width: 400px;
   max-width: 400px;
+  /deep/ .el-icon-close:before {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    font-size: larger;
+    font-weight: bold;
+
+    &:hover {
+      color: aqua;
+    }
+  }
 }
 
 .sm-function-module-query {

src/views/LandConsolidation/components/list.vue

@@ -50,9 +50,8 @@
 <script>
 import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
-import { QueryOne, QueryList } from "@/api/cockpitNew";
-import { getXmList, getXm } from "@/api/stxf/tdzz.js";
-import { GetList } from "@/api/Idleland.js";
+// import { QueryOne, QueryList } from "@/api/cockpitNew";
+import { getXmList } from "@/api/stxf/tdzz.js";
 import { zzForm, TableHeader, reasonList } from "./config";
 import { loadGeoJSON } from "@/utils/MapHelper/help.js";
 let geoSources = {};
@@ -110,21 +109,13 @@ export default {
     getTableData() {
       this.$emit("updateParent", "loading", true);
       this.removeGeoJSON();
-      getXmList({ jscType: "qytuzz_zzxm_xmlb", ...this.pageObj }).then(
-        (res) => {
-          this.$emit("updateParent", "loading", false);
-          this.table = { total: res.total, data: res.rows };
-          this.active_tableData(res.data);
-        }
-      );
-    },
-
-    Getjxyd(row) {
-      getXm(row.id).then((res) => {
-        this.jxyddata = res.data || {};
+      getXmList(this.pageObj).then((res) => {
         this.$emit("updateParent", "loading", false);
+        this.table = { total: res.total, data: res.rows };
+        this.active_tableData(res.rows);
       });
     },
+
     tableRowClassName({ row, rowIndex }) {
       // if (rowIndex === this.scrollTop_index) {
       //   return "warning-row";
@@ -132,15 +123,17 @@ export default {
       // return "";
     },
     active_tableData(newVal) {
-      newVal.forEach((res, index) => {
-        if (res.geom)
-          loadGeoJSON(res.geom, "#55A1E3", { isfly: false }, (data) => {
-            geoSources[res.xzqdm] = data;
-            data.name = "Idleland";
-            data.entities.values.forEach((entity) => {
-              entity.properties = { type: "图斑上图", xzqdm: res.xzqdm };
+      newVal.forEach((item, index) => {
+        item.tQytdzzZzxm.forEach((res) => {
+          if (res.geom)
+            loadGeoJSON(res.geom, "#55A1E3", { isfly: true }, (data) => {
+              geoSources[res.id] = data;
+              data.name = "zzxm";
+              data.entities.values.forEach((entity) => {
+                entity.properties = { type: "图斑上图", xzqdm: res.id };
+              });
             });
-          });
+        });
       });
     },
     flyTo(item) {
@@ -148,7 +141,7 @@ export default {
       this.tempdataLayerId = xzqdm;
       if (geoSources[xzqdm]) return;
       loadGeoJSON(item.geom, "#ff0000", { isfly: true }, (data) => {
-        data.name = "Idleland";
+        data.name = "zzxm";
         geoSources[xzqdm] = data;
         data.entities.values.forEach((entity) => {
           entity.properties = { type: "图斑上图", xzqdm: item.xzqdm };
@@ -160,7 +153,7 @@ export default {
       viewer.entities.removeAll();
       viewer.dataSources.removeAll();
       // viewer.dataSources._dataSources.forEach((das) => {
-      //   if (das.name == "Idleland") {viewer.dataSources.remove(das);}
+      //   if (das.name == "zzxm") {viewer.dataSources.remove(das);}
       // });
     },
 
@@ -174,8 +167,7 @@ export default {
       };
     },
     detail(row) {
-      this.Getjxyd(row);
-      this.flyTo(row);
+      // this.flyTo(row);
       this.bus.$emit("handleView", row, "整治项目");
     },
     handle(row) {

src/views/LandConsolidation/index.vue

@@ -93,11 +93,22 @@
     </div>
     <Details ref="detailModal"></Details>
     <Contrast ref="contrastModal" v-if="iscontrast"></Contrast>
-    <iframe
+    <!-- <iframe
       v-if="drawer"
-      src=". /data/方案文档浏览.html"
+      type="module"
+      :src="
+        process.env.NODE_ENV === 'development'
+          ? require('@/../static/data/方案文档浏览.html')
+          : '@/../static/data/方案文档浏览.html'
+      "
       style="width: 100%; height: 100%; position: absolute"
-    ></iframe>
+    ></iframe> -->
+    <!-- <iframe
+      v-if="drawer"
+      type="module"
+      :srcdoc="require('@/../static/data/aa.html')"
+      style="width: 100%; height: 100%; position: absolute"
+    ></iframe> -->
   </div>
 </template>