Merge branch 'maxx'

src/api/ghss/ghxz.js

@@ -41,3 +41,11 @@ export function GetXzjg(params) {
         params
     })
 }
+// 选址结果信息
+export function GetXzResList(params) {
+    return request({
+        url: '/analyse/fzss/GetXzResList',
+        method: 'get',
+        params
+    })
+}

src/components/mapView/range.vue

@@ -115,6 +115,7 @@ export default {
           this.model.xzmj = (res.data.area / 1000000).toFixed(2);
           viewer.entities.removeAll();
           this.fileDataID = res.data.id;
+          this.model.xzfw = res.data.id;
           let geoms = res.data.geom
             .substring(
               res.data.geom.indexOf("(((") + 3,
@@ -273,6 +274,7 @@ export default {
             if (res.success) {
               this.fileDataID = res.data.id;
               this.model.xzmj = (res.data.area / 1000000).toFixed(2);
+              this.model.xzfw = res.data.id;
               this.$message({
                 message: "绘制成功!",
                 type: "success",

src/components/sceneAtttribute/splitScreen/rollerScreen.vue

@@ -48,10 +48,11 @@ export default {
     },
   },
   watch: {
-    type() {
-      this.layers = Array(2);
-      this.checkedKeys = Array(2);
-      this.toolTitle = Array(2);
+    type(val) {
+      let length = val == 0 ? 0 : 2;
+      this.layers = Array(length);
+      this.checkedKeys = Array(length);
+      this.toolTitle = Array(length);
       this.setCheckeds();
     },
   },

src/components/sceneAtttribute/splitScreen/splitScreen.vue

@@ -58,15 +58,17 @@ export default {
         case "QUAD":
           return 4;
         default:
-          break;
+          return 0;
       }
     },
   },
   watch: {
     value(val) {
       this.layers = Array(val);
+
       this.checkedKeys = Array(val);
       this.toolTitle = Array(val);
+      console.log(this.toolTitle, val, "----");
       this.setCheckeds();
     },
   },

src/views/cockpitNew1/datePicker.scss

@@ -1,6 +1,6 @@
-.el-date-editor .el-range__close-icon {
-    display: none;
-  }
+// .el-date-editor .el-range__close-icon {
+//     display: none;
+//   }
   
   .el-picker-panel__sidebar {
     background: #002446;

src/views/complianceAnalysis/components/hgxsc.vue

@@ -51,7 +51,7 @@
         :data="treedata"
         ref="tree"
         show-checkbox
-        node-key="id"
+        node-key="bsm"
         :props="defaultProps"
         :default-expanded-keys="xz"
       >
@@ -68,7 +68,6 @@
 import { Add, GetScx, UpdateScx } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import range from "@/components/mapview/range.vue"; ///mapview/range
-import hgxfx from "../../../../static/data/ghss/data.js";
 export default {
   components: {
     range,
@@ -78,27 +77,16 @@ export default {
   data() {
     return {
       xz: [],
-      treedata: [
-        {
-          id: 1,
-          label: "一级控制线",
-          children: [],
-        },
-        {
-          id: 2,
-          label: "二级控制线",
-          children: [],
-        },
-      ],
+      treedata: [],
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "bsmmc",
       },
       ruleForm: {
         xmmc: "",
         jsdw: "",
         xmlx: "",
-        xzdw: "",
+        // xzdw: "",
         ydxz_bsm: "",
         yjydlx: "",
 
@@ -110,7 +98,12 @@ export default {
         xzmj: [{ required: true, message: "请填写范围的数据" }],
         xmmc: [
           { required: true, message: "请输入项目名称", trigger: "blur" },
-          { min: 3, max: 50, message: "长度在 3 到 50 个字符", trigger: "blur" },
+          {
+            min: 3,
+            max: 50,
+            message: "长度在 3 到 50 个字符",
+            trigger: "blur",
+          },
         ],
         jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
         xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
@@ -120,63 +113,36 @@ export default {
     };
   },
   mounted() {
-    this.getTreeData(); //getKzx();
+    this.getKzx();
   },
   methods: {
     //获取检查要素
     getKzx() {
       GetScx().then((res) => {
-        if (res) {
-          let GetAll = res.data;
-          for (var t in GetAll) {
-            const getall = GetAll[t];
-            if (getall.kzxjb == 1) {
-              this.treedata[0].children.push({
-                id: getall.bsm,
-                label: getall.ysmc,
-              });
-              this.xz.push(getall.bsm);
-            } else if (getall.kzxjb == 2) {
-              this.treedata[1].children.push({
-                id: getall.bsm,
-                label: getall.ysmc,
-              });
-              this.xz.push(getall.bsm);
-            } else {
-              let bool = false;
-              for (let i = 0; i < this.treedata.length; i++) {
-                if (this.treedata[i].id == getall.kzxjb) {
-                  bool = true;
-                  this.treedata[i].children.push({
-                    id: getall.bsm,
-                    label: getall.ysmc,
-                  });
-                  break;
-                }
-              }
-              if (!bool) {
-                this.treedata.push({
-                  id: getall.kzxjb,
-                  label: getall.tjzd,
-                  children: [
-                    {
-                      id: getall.bsm,
-                      label: getall.ysmc,
-                    },
-                  ],
-                });
-              }
-            }
-          }
+        if (res.data) {
+          this.treedata = this.tranListToTreeData(res.data, "0");
+          res.data.forEach((item) => {
+            if (item.kzxjb == 1) this.xz.push(item.bsm);
+          });
           setTimeout(() => {
             this.$refs.tree.setCheckedKeys(this.xz);
           }, 1);
         }
       });
     },
-    //获取检查要素
-    getTreeData() {
-      this.treedata = hgxfx.treeData;
+    tranListToTreeData(list, pbsm) {
+      var map = {};
+      list.forEach((item) => {
+        if (map[item.pbsm]) map[item.pbsm].push(item);
+        else map[item.pbsm] = [item];
+      });
+      list.forEach((item) => {
+        if (map[item.pbsm]) item.children = map[item.bsm];
+      });
+      map = list.filter((item) => {
+        return item.pbsm == pbsm;
+      });
+      return map;
     },
     updateScx() {
       UpdateScx().then((res) => {
@@ -198,26 +164,29 @@ export default {
         xmmc: "",
         jsdw: "",
         xmlx: "",
-        xzdw: "",
+        // xzdw: "",
         ydxz_bsm: "",
         yjydlx: "",
-        scxs: [],
+        scxList: [],
 
         fwlx: 1,
         xzfw: "",
         xzmj: 0,
       };
       this.$refs.range.reset();
+      setTimeout(() => {
+        this.$refs.tree.setCheckedKeys(this.xz);
+      }, 1);
     },
     submitData() {
       //更新范围
       var _temp = this.$refs.range.getRange();
       this.ruleForm.xzfw = _temp.xzfw;
-      this.ruleForm.xzmj = _temp.xzmj || hgxfx.xzmj;
+      this.ruleForm.xzmj = _temp.xzmj;
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.getCheckedNodes();
-          if (this.ruleForm.scxs.length == 0) {
+          if (this.ruleForm.scxList.length == 0) {
             Message.warning("至少选择一个项目信息");
           }
           MessageBox.confirm("是否开始进行合规性检查?", "合规性检查", {
@@ -226,31 +195,24 @@ export default {
             type: "warning",
           }).then(() => {
             this.$emit("updateParent", "loading", true);
-            setTimeout(() => {
-              let bsm = "767d0754a41f43fb86982678134ff768";
-              hgxfx.addList({ ...this.ruleForm, bsm });
-              this.$emit("updateParent", "nowObj", this.ruleForm);
-              this.$emit("updateParent", "rzBsm", bsm);
+            Add({ ...this.ruleForm }).then((res) => {
+              if (res.success) {
+                this.$emit("updateParent", "nowObj", this.ruleForm);
+                this.$emit("updateParent", "rzBsm", res.message);
+                this.reset();
+              } else {
+                Message.warning(res.message);
+              }
               this.$emit("updateParent", "loading", false);
-              this.reset();
-            }, 500);
-            // Add({ ...this.ruleForm }).then((res) => {
-            //   if (res.success) {
-            //     this.$emit("updateParent", "rzMc", this.ruleForm.xmmc);
-            //     this.$emit("updateParent", "rzBsm", res.data);
-            //     // this.$emit("updateParent", "rwBsm", res.data);
-            //   }
-            //   this.$emit("updateParent", "loading", false);
-            // });
+            });
           });
-        } else {
-          Message.warning(res);
         }
       });
     },
     getCheckedNodes() {
-      this.ruleForm.scxs = this.$refs.tree.getCheckedNodes(true).map((item) => {
-        return item.id;
+      // .getCheckedNodes(true) 是否只是叶子节点
+      this.ruleForm.scxList = this.$refs.tree.getCheckedNodes().map((item) => {
+        return { scxbsm: item.bsm };
       });
     },
   },

src/views/complianceAnalysis/components/lsjl.vue

@@ -2,10 +2,11 @@
   <div class="tpwjxm">
     <el-row>
       <el-col :span="13">
-        <!-- daterange value-format="yyyy-MM-dd" :clearable="false"align="left" -->
+        <!-- datetimerange value-format="yyyy-MM-dd" :clearable="false"align="left" -->
         <el-date-picker
           v-model="pageObj.sj"
-          type="datetimerange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
           range-separator="~"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -32,7 +33,11 @@
         </el-input>
       </el-col>
     </el-row>
-    <div class="listDiv">
+    <div
+      class="listDiv"
+      v-infinite-scroll="infiniteScroll"
+      :infinite-scroll-disabled="listdisabled"
+    >
       <div
         class="dataItem"
         v-for="(item, dindex) in datalist"
@@ -55,13 +60,12 @@
             <span class="button" v-if="item.fxbg" @click.stop="report(item)"
               >报告</span
             >
-            <!-- <span
-             
-              style="margin-left: 5px"
+            <span
+              class="button"
               @click.stop="del(item)"
               v-if="item.rwzt == 2 || item.rwzt == 3"
               >删除</span
-            > -->
+            >
           </div>
         </div>
       </div>
@@ -70,10 +74,10 @@
 </template>
 
 <script>
-import { GetPage, GetFxjg, Delect } from "@/api/ghss/hgxfx.js";
-import hgxfx from "../../../../static/data/ghss/data.js";
+import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { rest } from "lodash";
+import { GetXzResList } from "../../../api/ghss/ghxz.js";
 let dataSources;
 export default {
   props: {
@@ -94,28 +98,24 @@ export default {
         sj: [],
         jssj: "",
         xmmc: "",
+        page: 1,
       },
       defaultTime1: [
         new Date(2023, 1, 1, 0, 0, 0),
         new Date(2023, 2, 1, 23, 59, 59),
       ], // '00:00:00', '23:59:59'
       datalist: [],
+      listdisabled: false,
       now: "",
       // recordBsm: "", //辅助选址成功后的标识码
     };
   },
   mounted() {
     // this.getData();
-    if (this.historyList) {
-      this.datalist = this.historyList;
-    } else {
-      this.datalist = hgxfx.datalist;
-    }
     // this.bus.$on("recordBsm", (val) => {
     //   console.log(val, "recordBsm");
     //   this.recordBsm = val
     // });
-
   },
   methods: {
     report(item) {
@@ -142,48 +142,68 @@ export default {
         .catch(() => {});
     },
     checkDetails(item) {
-      // this.$emit("updateParent", "rwBsm", item.bsm);
-      // GetFxjg({ bsm: item.bsm }).then((res) => {
-      //   if (res.success) {
-      // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
-      // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
       this.$emit("updateParent", "nowObj", item);
       let next = this.$props.type == "hgxfx" ? "scjg" : "xzjg";
       this.$emit("updateParent", "activeTabs", next);
-      //   }
-      // });
+      if (this.$props.type != "hgxfx") {
+        this.$emit("updateParent", "rwBsm", item.bsm);
+      }
     },
     checkRz(item) {
       this.$emit("updateParent", "nowObj", item);
       this.$emit("updateParent", "rzBsm", item.bsm);
     },
-
+    infiniteScroll() {
+      this.pageObj.page += 1;
+      this.listdisabled = true;
+      this.$emit("updateParent", "loading", true);
+      setTimeout(() => {
+        this.getData();
+      }, 500);
+    },
     changeForm() {
       this.pageObj.page = 1;
+      this.datalist = [];
       this.getData();
     },
     changedate(val) {
       if (val) {
-        this.pageObj.kssj = proxy.$comfun.setDate(val)[0];
-        this.pageObj.jssj = proxy.$comfun.setDate(val)[1];
+        this.pageObj.kssj = this.pageObj.sj[0];
+        this.pageObj.jssj = this.pageObj.sj[1];
       } else {
         this.pageObj.kssj = "";
         this.pageObj.jssj = "";
       }
-      this.getData();
+      this.changeForm();
     },
 
     getData() {
-      // this.$emit("updateParent", "loading", true);
-      // GetPage({ ...this.pageObj }).then((res) => {
-      //   setTimeout(() => {
-      //     this.$emit("updateParent", "loading", false);
-      //   }, 100);
-      //   this.pageObj.total = res.recordstotal;
-      //   this.pageObj.page = res.page;
-      //   this.pageObj.allpage = res.totalpages;
-      //   this.datalist = res.data;
-      // });
+      this.$emit("updateParent", "loading", true);
+      if (this.$props.type == "hgxfx") {
+        GetPage({ ...this.pageObj }).then((res) => {
+          setTimeout(() => {
+            this.$emit("updateParent", "loading", false);
+          }, 100);
+          this.listdisabled = res.data.length < 10;
+          this.datalist = [...this.datalist, ...res.data];
+        });
+      } else {
+        let tempObj = { ...this.pageObj };
+        let obj = {
+          startTime: tempObj.kssj,
+          endTime: tempObj.jssj,
+          name: tempObj.xmmc,
+          pageNum: 1,
+          pageSize: 10,
+        };
+        GetXzResList(obj).then((res) => {
+          setTimeout(() => {
+            this.$emit("updateParent", "loading", false);
+          }, 100);
+          this.listdisabled = res.data.items.length < 10;
+          this.datalist = [...this.datalist, ...res.data.items];
+        });
+      }
     },
     zoomItem(item) {
       this.now = item.bsm;
@@ -210,6 +230,15 @@ export default {
     },
   },
   watch: {},
+  beforeDestroy() {
+    this.pageObj = {
+      kssj: "",
+      sj: [],
+      jssj: "",
+      xmmc: "",
+      page: 1,
+    };
+  },
 };
 </script>
 
@@ -295,6 +324,28 @@ export default {
           rgba(155, 255, 139, 0.7) 100%
         );
       }
+      .el-tag--warning {
+        background: linear-gradient(
+          170deg,
+          rgba(249, 180, 71, 0.6) 0%,
+          rgba(249, 180, 71, 0.6) 100%
+        );
+      }
+      .el-tag--light {
+        background: linear-gradient(
+          170deg,
+          rgba(255, 126, 33, 0.6) 0%,
+          rgba(255, 166, 33, 0.7) 100%
+        );
+      }
+
+      .el-tag--danger {
+        background: linear-gradient(
+          170deg,
+          rgba(200, 0, 0, 0.6) 0%,
+          rgba(255, 105, 105, 0.6) 100%
+        );
+      }
       .button {
         width: 48px;
         height: 20px;

src/views/complianceAnalysis/components/rzDtails.vue

@@ -39,7 +39,6 @@
 
 <script>
 import { GetLog } from "@/api/ghss/hgxfx.js";
-import hgxfx from "../../../../static/data/ghss/data.js";
 export default {
   props: {
     rzBsm: {
@@ -59,7 +58,6 @@ export default {
   },
   mounted() {
     clearTimeout(this.timer);
-    this.logsdata = hgxfx.rzfxlist;
   },
   methods: {
     handleClose() {

src/views/complianceAnalysis/components/scjg.vue

@@ -10,7 +10,7 @@
       </div>
       <div>
         分析面积：
-        <span class="text">{{ scjgObj.xzmj }}平方千米</span>
+        <span class="text">{{ compute(scjgObj.fxmj) }}亩</span>
       </div>
     </div>
 
@@ -32,6 +32,7 @@
         v-show="eitem.isshow"
         class="echart"
         :class="`echart${i}`"
+        unit="亩"
         @echartClick="(name, iseyes) => echartClick(name, iseyes, i)"
         :ref="`echartRef`"
       ></pie>
@@ -45,6 +46,8 @@
 
 <script>
 import pie from "@/components/echartsTemplate/pie.vue";
+import { GetFxjg } from "@/api/ghss/hgxfx.js";
+import parse from "wellknown";
 import hgxfx from "../../../../static/data/ghss/data.js";
 let colors = [
   "#62ADED",
@@ -79,20 +82,35 @@ export default {
   },
   mounted() {},
   methods: {
+    compute(mj) {
+      return mj ? (mj * 0.0015).toFixed(2) : 0;
+    },
     initData() {
-      this.fileid =
-        this.$props.scjgObj.xmmc.indexOf("东岸卓越城项目") >= 0
-          ? "hgxfx1"
-          : "hgxfx2";
       this.echarts = [];
-      hgxfx.jgtreeData.forEach((e) => {
-        // if (e.label == "控制性详细规划") e.label = "详细规划分析";
-        this.echarts.push({ ...e, iseyes: false, isshow: false });
+      this.$emit("updateParent", "loading", true);
+      GetFxjg({ bsm: this.$props.scjgObj.bsm }).then((res) => {
+        if (res.success) {
+          res.data.forEach((e, ei) => {
+            let c = e.dataList || e.child;
+            c.map((ci) => {
+              ci.name = ci.yslx_name || ci.scxname;
+              ci.value = this.compute(ci.mj);
+              ci.id = ci.yslx || ci.scxbsm;
+              ci.geom = ci.geom || (ci.data ? ci.data.geom : "");
+              // ci.label = ci.mc_name;
+            });
+            this.echarts.push({
+              id: e.scxbsm,
+              label: e.scxname,
+              children: c,
+              iseyes: false,
+              isshow: false,
+            });
+            this.setEchart(c, ei);
+          });
+          this.$emit("updateParent", "loading", false);
+        }
       });
-      this.setEchart1();
-      this.setEchart2();
-      // this.setEchart3();
-      this.setEchart4();
     },
     eyesChaneg(i) {
       this.echarts[i].iseyes = !this.echarts[i].iseyes;
@@ -106,55 +124,33 @@ export default {
       // }
       // emit("eyesChaneg");
     },
-    changeDataSources({ label, id, iseyes }, color) {
+    changeDataSources({ geom, id, iseyes }, color) {
       if (this.dataSources[id]) {
         this.dataSources[id].show = iseyes;
-      } else this.addPolygon(label, id, color);
+      } else if (geom) {
+        this.addPolygon(geom, id, color);
+      }
     },
     echartClick(name, iseyes, index) {
       if (this.echarts[index].iseyes) {
-        let click = this.echarts[index].children.filter((c) => c.label == name);
+        let click = this.echarts[index].children.filter((c) => c.name == name);
         if (click.length > 0)
           this.changeDataSources({
-            label: click[0].label,
+            geom: click[0].geom,
             id: click[0].id,
             iseyes,
           });
       }
     },
-    setEchart1() {
-      this.$nextTick(() => {
-        this.$refs.echartRef[0].setOptions({
-          type: "vertical",
-          data: hgxfx.xzfxlist,
-        });
-      });
-    },
-    setEchart2() {
-      this.$nextTick(() => {
-        let setoptions = {
-          data: hgxfx.sxfxlist,
-          type: "horizontal", //横向
-          isclick: true,
-        };
-        this.$refs.echartRef[1].setOptions(setoptions);
-      });
-    },
-    setEchart3() {
-      this.$nextTick(() => {
-        this.$refs.echartRef[2].setOptions({ data: tdlylist });
-      });
-    },
-    setEchart4() {
+    setEchart(data, i) {
       this.$nextTick(() => {
-        this.$refs.echartRef[2].setOptions({
-          data: hgxfx.xxghlist,
-          type: "vertical",
-        });
+        let type = i == 1 ? "horizontal" : "vertical";
+        this.$refs.echartRef[i].setOptions({ data, type });
       });
     },
     // 加载GeoJSON数据
-    addPolygon(label, id, colors) {
+    addPolygon(geom, id, colors) {
+      let geojson = parse(geom);
       let _this = this;
       // viewer.entities.removeAll();
       let scolor = colors
@@ -164,15 +160,12 @@ export default {
         ? Cesium.Color.fromCssColorString(colors)
         : Cesium.Color.WHITE;
 
-      let polygon = Cesium.GeoJsonDataSource.load(
-        `/static/data/ghss/${this.fileid}/${id + label}.geojson`,
-        {
-          clampToGround: true,
-          stroke: scolor,
-          fill: fcolor.withAlpha(0.3), //注意：颜色必须大写，即不能为blue
-          strokeWidth: 3,
-        }
-      );
+      let polygon = Cesium.GeoJsonDataSource.load(geojson, {
+        clampToGround: true,
+        stroke: scolor,
+        fill: fcolor.withAlpha(0.3), //注意：颜色必须大写，即不能为blue
+        strokeWidth: 3,
+      });
       polygon.then(function (dataSource) {
         // dataSource.id = id;
         // 将数据源添加到Cesium Viewer
@@ -209,9 +202,9 @@ export default {
   //     }
   //   );
   watch: {
-    scjgObj(newValue) {
-      this.initData();
-    },
+    // scjgObj(newValue) {
+    //   this.initData();
+    // },
   },
 };
 </script>
@@ -283,7 +276,7 @@ export default {
     .echart0,
     .echart2 {
       width: 380px;
-      height: 370px;
+      height: 300px;
     }
   }
 }

src/views/complianceAnalysis/index.vue

@@ -80,6 +80,11 @@ export default {
         this.$refs.lsju.reset();
         this.$refs.lsju.changeForm();
       }
+      if (newValue == "scjg") {
+        this.$nextTick(() => {
+          this.$refs.scjg.initData();
+        });
+      }
     },
   },
 };

src/views/siteselection/components/xzjg.vue

@@ -125,6 +125,9 @@ export default {
     scjgObj: {
       type: Object,
     },
+    rwBsm: {
+      type: String,
+    },
   },
 
   data() {
@@ -156,20 +159,28 @@ export default {
       arrww: [],
       dataSources: {},
       tempdataSourcesId: null,
+      xzjgBSM: "",
     };
   },
   mounted() {
-    GetXzjg({ bsm: "dbc5fcf178fc4592b4940627e758b90d" }).then((res) => {
-      this.xzjgObj = JSON.parse(JSON.stringify(res.data));
-      this.copyData = JSON.parse(JSON.stringify(res.data));
-      this.tempObj = JSON.parse(JSON.stringify(res.data));
-      this.xzjgObj.dks.forEach((item) => {
-        this.drawWktPloygon(item.geom, "#0000ff"); //item.dkbm
-      });
-      this.drawWktPloygon(res.data.geom, "#ff0000"); //res.data.bsm
-    });
+    this.GetXzjg()
   },
   methods: {
+    GetXzjg() {
+      GetXzjg({ bsm: this.$props.rwBsm }).then((res) => {
+        if (res.success) {
+          this.xzjgObj = JSON.parse(JSON.stringify(res.data));
+          this.copyData = JSON.parse(JSON.stringify(res.data));
+          this.tempObj = JSON.parse(JSON.stringify(res.data));
+          this.xzjgObj.dks.forEach((item) => {
+            this.drawWktPloygon(item.geom, "#0000ff"); //item.dkbm
+          });
+          this.drawWktPloygon(res.data.geom, "#ff0000"); //res.data.bsm
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
     download() {
       window.open(this.$props.scjgObj.task.fxbg);
     },
@@ -326,6 +337,9 @@ export default {
       });
     },
   },
+  beforeResolve(to, from, next) {
+    console.log(to, from, next, "to, from, next");
+  },
 
   watch: {
     activeTabs(newValue, oldValue) {

src/views/siteselection/index.vue

@@ -21,6 +21,7 @@
             :activeTabs="activeTabs"
             :historyList="historyList"
             @updateParent="changeData"
+            type="ghxz"
             ref="lsju"
           ></Lsjl>
         </el-tab-pane>
@@ -29,11 +30,13 @@
           label="选址结果"
           :disabled="activeTabs != 'scjg'"
           name="xzjg"
+
         >
           <XZJG
             :activeTabs="activeTabs"
             :loading="loading"
             :scjgObj="scjgObj"
+            :rwBsm="rwBsm"
             v-if="activeTabs == 'xzjg'"
           ></XZJG>
         </el-tab-pane>