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

src/api/ghss/ghxz.js

@@ -63,3 +63,13 @@ export function DelXzRes(params) {
         params
     })
 }
+
+
+// 获取模版因子列表
+export function GetTemplateFactorList(params) {
+    return request({
+        url: '/apply/fzxz/GetTemplateFactorList',
+        method: 'get',
+        params
+    })
+}

src/views/siteselection/components/fzxz.vue

@@ -137,7 +137,12 @@
 <script>
 import yxyzPop from "./yxyzPop.vue"; ///mapview/range
 import range from "@/components/mapview/range.vue"; ///mapview/range
-import { GetDldmTree, GetSjyList, AddFzxz } from "../../../api/ghss/ghxz.js";
+import {
+  GetDldmTree,
+  GetSjyList,
+  AddFzxz,
+  GetTemplateFactorList,
+} from "../../../api/ghss/ghxz.js";
 import hgxfx from "../../../../static/data/ghss/data.js";
 export default {
   components: {
@@ -162,7 +167,7 @@ export default {
         xmmc: "规划选址项目_" + this.getCurrentDateTime(),
         jsdw: "建设单位",
         // xmlx: "",
-        ydlx: ["07", "0701"],//默认为城镇住宅用地
+        ydlx: ["07", "0701"], //默认为城镇住宅用地
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
         sjy: "", //数据源
@@ -206,6 +211,7 @@ export default {
           value: 1,
         },
       ], //选址约束
+      templateYZ: [], //用地性质模版因子
     };
   },
   computed: {},
@@ -238,8 +244,26 @@ export default {
       this.ruleForm.sjy = res.data[0].sjymc;
       this.sjyBSM = res.data[0].value;
     });
+    this.GetTemplateFactorList(this.ydlxBSM);
   },
   methods: {
+    //获取模版因子列表(landTypeCode:用地性质编码)
+    GetTemplateFactorList(landTypeCode) {
+      GetTemplateFactorList({ landTypeCode: landTypeCode, system: true }).then(
+        (res) => {
+          if (res.success) {
+            this.templateYZ = res.data;
+            this.templateYZ.forEach((item) => {
+              let JSONItem = JSON.parse(item.conditionInfo);
+              item.conditionInfo = JSONItem;
+              item.children = [];
+            });
+            this.tableData = this.templateYZ;
+            this.$refs.yxyzPop.yzTableData = this.templateYZ;
+          }
+        }
+      );
+    },
     getCurrentDateTime() {
       const now = new Date();
       const year = now.getFullYear();
@@ -254,7 +278,6 @@ export default {
       return num < 10 ? "0" + num : num;
     },
     changeCheckBox(val) {
-      console.log(val, "杰卡斯到货时间啊肯定会刷卡机很大");
       if (val.value == 1) {
         this.otherValShow = true;
       }
@@ -262,46 +285,41 @@ export default {
     handleChange(value) {
       const obj = this.$refs["Cascader"].getCheckedNodes();
       this.ydlxBSM = obj[0].value;
+      this.GetTemplateFactorList(this.ydlxBSM);
       // if (this.ydlxBSM == "09") {
       //   let lxData = [
       //     {
-      //       id: "66b94c0cab0c4a389197db46ddd30fd0",
-      //       bsm: "TB_YJJBNTBH",
-      //       name: "永久基本农田",
+      //       id: "47b34bf84b8c4577804fe010b6c2bdca",
+      //       bsm: "TB_HZC",
+      //       name: "火葬场",
       //       level: 1,
-      //       parent_id: "cba68762194b4d56b9845d7daf15d6f1",
+      //       parent_id: "b7f957e32cab4f1a9832a27a502983cd",
       //       conditionInfo:
-      //         '{"spatial_type":"intersect","items":[{"key":"intersect","name":"相交"},{"key":"not_intersect","name":"不相交"}],"default":"not_intersect","hasValue":false,"defaultValue":0,"unit":"米"}',
-      //       children: [],
+      //         '{"spatial_type":"distance","items":[{"key":"gt","name":"大于"},{"key":"lt","name":"小于"},{"key":"get","name":"大于等于"},{"key":"let","name":"小于等于"}],"default":"gt","hasValue":true,"defaultValue":2000,"unit":"米","clip":true}',
       //     },
+
       //     {
-      //       id: "261da715b6864cb8b85cc11331e38847",
-      //       bsm: "TB_CZKFBJ",
-      //       name: "城镇开发边界内",
+      //       id: "aac6e14452ee48f5883afc5c047ea235",
+      //       bsm: "TB_YJJBNTBH",
+      //       name: "永久基本农田",
       //       level: 1,
-      //       parent_id: "cba68762194b4d56b9845d7daf15d6f1",
+      //       parent_id: "3ad55964b3744393b14bf0e7e647c280",
       //       conditionInfo:
-      //         '{"spatial_type":"contain","items":[{"key":"contain","name":"包含"},{"key":"not_contain","name":"不包含"}],"default":"contain","hasValue":false,"defaultValue":0,"unit":"米"}',
-      //       children: [],
+      //         '{"spatial_type":"intersect","items":[{"key":"intersect","name":"相交"},{"key":"not_intersect","name":"不相交"}],"default":"not_intersect","hasValue":false,"defaultValue":0,"unit":"米","clip":true}',
       //     },
       //     {
-      //       id: "98aa5713b52f4d1a8fc1dbf480fcf530",
-      //       bsm: "TB_STBHHX",
-      //       name: "生态保护红线",
+      //       id: "a83e3af0479c49f9bb229ce044e33d4d",
+      //       bsm: "",
+      //       name: "交通",
       //       level: 1,
-      //       parent_id: "cba68762194b4d56b9845d7daf15d6f1",
-      //       conditionInfo:
-      //         '{"spatial_type":"intersect","items":[{"key":"intersect","name":"相交"},{"key":"not_intersect","name":"不相交"}],"default":"not_intersect","hasValue":false,"defaultValue":0,"unit":"米"}',
-      //       children: [],
+      //       parent_id: "a1bc3b20cf624bcea8f1a8f172b00cd3",
+      //       conditionInfo: '""',
       //     },
       //   ];
       //   lxData.forEach((item) => {
       //     let JSONItem = JSON.parse(item.conditionInfo);
-      //     item.hasValue = JSONItem.hasValue; //是否可以填写约束值
-      //     item.defaultValue = Number(JSONItem.defaultValue); //约束值默认值
-      //     item.default = JSONItem.default; //默认选中条件
-      //     (item.spatial_types = JSONItem.items),
-      //       (item.spatial_type = JSONItem.spatial_type);
+      //     item.conditionInfo = JSONItem;
+      //     item.children = [];
       //   });
       //   this.tableData = lxData;
       //   console.log(lxData, "lxData");
@@ -374,7 +392,9 @@ export default {
         useLandType: false, //是否与控规用地性质一致
         multipleDistance: 0, //多地块最大距离
       }),
-        (this.sjyBSM = this.options[0].value);
+        (this.ydlxBSM = "0701");
+      this.GetTemplateFactorList(this.ydlxBSM);
+      this.sjyBSM = this.options[0].value;
       this.tableData = [];
       this.$refs.ruleForm.resetFields();
       this.$refs.range.reset();

src/views/siteselection/components/yxyzPop.vue

@@ -257,6 +257,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.selectdialogData = val;
+      console.log(val,"这是什么");
     },
     submit() {
       var sign = true;