Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/api/ghss/gdbh.js

@@ -6,4 +6,11 @@ export function GetMxList(params) {
         method: 'get',
         params
     })
+}
+export function GetFactorList(params) {
+    return request({
+        url: '/apply/gdbh/GetFactorList',
+        method: 'get',
+        params
+    })
 }

src/views/farmlandProtection/components/fxjg.vue

@@ -15,10 +15,26 @@
           <img :src="imgs.zd1" style="height: 2.5rem; width: 2.5rem" />
         </div>
         <div class="divText">
-          <span style="color: #fff">国有用地(亩)</span>
-          <span color="#2d8cf0">{{ 1 }}</span>
+          <span style="color: #fff">图斑数(个)</span>
+          <span color="#2d8cf0">{{ 203 }}</span>
         </div>
       </div>
+      <div class="divCol">
+        <div class="divImg">
+          <img :src="imgs.zd1" style="height: 2.5rem; width: 2.5rem" />
+        </div>
+        <div class="divText">
+          <span style="color: #fff">图斑面积(㎡)</span>
+          <span color="#2d8cf0">{{ 20314.52 }}平方米</span>
+        </div>
+      </div>
+    </div>
+    <div class="site-title">
+      <div class="siteCon">
+        <div class="site_Icon"></div>
+        <span>现状情况</span>
+      </div>
+      <el-button size="mini" @click="zdyModel">图表切换</el-button>
     </div>
   </div>
 </template>
@@ -34,27 +50,7 @@ export default {
     return {
       imgs: {
         loc: require("@/assets/images/loc.png"),
-        /**
-         * 征地版面图片
-         */
         zd1: require("@/assets/homeimg/1.png"),
-        zd2: require("@/assets/homeimg/1.png"),
-        zd3: require("@/assets/homeimg/1.png"),
-        zd4: require("@/assets/homeimg/1.png"),
-        /**
-         * 拆迁版面图片
-         */
-        cq1: require("@/assets/homeimg/1.png"),
-        cq2: require("@/assets/homeimg/1.png"),
-        cq3: require("@/assets/homeimg/1.png"),
-        cq4: require("@/assets/homeimg/1.png"),
-        /**
-         * 青苗版面图片
-         */
-        qm1: require("@/assets/homeimg/1.png"),
-        qm2: require("@/assets/homeimg/1.png"),
-        qm3: require("@/assets/homeimg/1.png"),
-        qm4: require("@/assets/homeimg/1.png"),
       },
     };
   },
@@ -94,9 +90,9 @@ export default {
     background-color: #0f7bc875;
     display: flex;
     justify-content: space-between;
-
+    margin-bottom: 8px;
     .divCol {
-      background-color: #cddeeb5a;
+      // background-color: #cddeeb5a;
       width: 49%;
       display: flex;
       align-items: center;
@@ -111,7 +107,15 @@ export default {
       }
       .divText {
         width: 75%;
-        padding-left: 0.5rem;
+        // padding-left: 0.5rem;
+        display: flex;
+        flex-direction: column;
+        span {
+          height: 20px;
+          // background: rgba(255, 0, 0, 0.258);
+          height: 20px;
+          line-height: 20px;
+        }
       }
     }
   }

src/views/farmlandProtection/components/fzjcyp.vue

@@ -27,7 +27,8 @@
       <div class="treeDiv">
         <el-table :data="anaModels" style="width: 100%" :show-header="false">
           <el-table-column type="selection" width="33"> </el-table-column>
-          <el-table-column prop="bsmmc" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="name" show-overflow-tooltip>
+          </el-table-column>
           <el-table-column width="50">
             <template slot-scope="scope">
               <!-- <span>编辑</span> -->
@@ -46,7 +47,7 @@
       <span class="clearBtn" @click="reset">取消</span>
       <span class="sureBtn" @click="submitData">确定</span>
     </div>
-    <zdyModelPop :tableData="tableData" ref="zdyPop"></zdyModelPop>
+    <zdyModelPop :tableData="anaModels" ref="zdyPop"></zdyModelPop>
   </div>
 </template>
 
@@ -97,9 +98,46 @@ export default {
           name: "矿产监测分析模型",
         },
       ],
+      templateYZ: [], //用地性质模版因子
     };
   },
   methods: {
+    testInit() {
+      this.templateYZ = [
+        {
+          id: "2fcc1664e6264bf8b3199bac7a4b22d4",
+          bsm: "TB_DLZX",
+          name: "城市道路",
+          level: 2,
+          parentId: "a83e3af0479c49f9bb229ce044e33d4d",
+          conditionInfo: null,
+        },
+        {
+          id: "aac6e14452ee48f6883afc5c047ea235",
+          bsm: "TB_QS_GYUSEQ",
+          name: "国有使用权",
+          level: 1,
+          parentId: "3ae55964b3744393b14bf0e7e647c280",
+          conditionInfo: null,
+        },
+        {
+          id: "bff0dcb5ffd04c3498067e566a5fc302",
+          bsm: "TB_YEY",
+          name: "幼儿园服务半径",
+          level: 1,
+          parentId: "12c81a1e8ba4487ea73f08b93b796b3d",
+          conditionInfo: null,
+        },
+      ];
+      this.templateYZ.forEach((item) => {
+        // let JSONItem = JSON.parse(item.conditionInfo);
+        // item.conditionInfo = JSONItem;
+        item.children = [];
+      });
+      this.anaModels = this.templateYZ;
+      this.$refs.zdyPop.yzTableData = this.templateYZ;
+    },
+
     getCurrentDateTime() {
       return moment(new Date()).format("YYYYMMDDHHmmss");
       const now = new Date();
@@ -180,17 +218,17 @@ export default {
     GetMxList() {
       GetMxList()
         .then((res) => {
-          console.log(res, ":res");
-          this.anaModels = res.data
+          this.anaModels = res.data;
         })
         .catch((erro) => {
           console.log(erro);
         });
     },
   },
-  mounted(){
-    this.GetMxList()
-  }
+  mounted() {
+    // this.GetMxList();
+    this.testInit()
+  },
 };
 </script>
 

src/views/farmlandProtection/components/zdyModelPop.vue

@@ -63,11 +63,12 @@
 </template>
 
 <script>
-import {
-  GetFactorList,
-  AddTemplate,
-  DelTemplate,
-} from "../../../api/ghss/ghxz.js";
+// import {
+//   GetFactorList,
+//   AddTemplate,
+//   DelTemplate,
+// } from "../../../api/ghss/ghxz.js";
+import { GetFactorList } from "../../../api/ghss/gdbh.js";
 export default {
   components: {},
   props: {
@@ -149,11 +150,11 @@ export default {
           map[node.id] = { ...node, children: [] };
         }
         for (const node of Object.values(map)) {
-          if (node.parent_id == "") {
+          if (node.parentId == "") {
             tree.push(node);
           } else {
-            map[node.parent_id].children.push(node);
-            map[node.parent_id].parentNode = true;
+            map[node.parentId].children.push(node);
+            map[node.parentId].parentNode = true;
           }
         }
         return tree;
@@ -242,8 +243,26 @@ export default {
       this.selectdialogData = val;
     },
     submit(issave) {
-      this.$parent.tableData = this.dialogData;
-      this.dialogVisible = false;
+      var sign = true;
+      let saveData = [];
+      this.dialogData.forEach((item) => {
+        item.type && item.value == "" && (sign = false);
+        issave &&
+          saveData.push({
+            ...item,
+            conditionInfo: JSON.stringify(item.conditionInfo),
+          });
+      });
+      if (sign) {
+        if (issave) {
+          this.save(saveData);
+        } else {
+          this.$parent.tableData = this.dialogData;
+          this.dialogVisible = false;
+        }
+      } else {
+        this.$message.warning("请将信息补充完整！");
+      }
     },
     setData(data) {
       data.filter((item) => {
@@ -265,7 +284,23 @@ export default {
         : (this.options[1].disabled = false);
     },
     resetDialogData() {
-      this.reset()
+      if (this.tableData.length == []) {
+        // 重置时，树的数据恢复
+        this.dialogData = [];
+        this.options = JSON.parse(JSON.stringify(this.optionsTemp));
+        this.selectdialogData = [];
+      } else {
+        // 选择模板时，生成新的树
+        this.dialogData = JSON.parse(JSON.stringify(this.tableData));
+        this.options = JSON.parse(JSON.stringify(this.optionsTemp));
+        // this.setData(this.dialogData);
+      }
+      // if (this.defaultArr.length) {
+      this.dialogData.forEach((item) => {
+        this.resetTree(this.options, item);
+      });
+      this.removeChildrenZero(this.options);
+      return this.dialogData;
     },
   },
   watch: {