Merge branch 'master' into zpf

src/components/BigScreen/bigScreen.scss

@@ -36,7 +36,7 @@ body {
 body {
     font-family: "Microsoft YaHei";
     font-size: 14px;
-    color: #333;
+    color: #fff;
 }
 
 h1,

src/views/complianceAnalysis/components/lsjl.vue

@@ -60,12 +60,12 @@
             <span class="button" v-if="item.fxbg" @click.stop="report(item)"
               >报告</span
             >
-            <!-- <span
+            <span
               class="button"
               @click.stop="del(item)"
               v-if="item.rwzt == 2 || item.rwzt == 3"
               >删除</span
-            > -->
+            >
           </div>
         </div>
       </div>
@@ -133,12 +133,15 @@ export default {
         }
       )
         .then(() => {
-          Delect({ bsm: item.bsm }).then((res) => {
-            if (res.success) {
-              Message.success("删除成功！");
-              this.changeForm();
-            }
-          });
+          if (this.$props.type == "hgxfx") {
+            Delect({ bsm: item.bsm }).then((res) => {
+              if (res.success) {
+                Message.success("删除成功！");
+                this.changeForm();
+              }
+            });
+          } else {
+          }
         })
         .catch(() => {});
     },

src/views/complianceAnalysis/components/scjg.vue

@@ -221,7 +221,7 @@ export default {
       display: inline-block;
     }
     .export {
-      width: 116px;
+      width:110px;
       height: 32px;
       background: #0f7ac8;
       text-align: center;

src/views/siteselection/components/fzxz.vue

@@ -165,248 +165,6 @@ export default {
       tableData: [],
       dialogVisible: false, //选址影响因子的弹窗显隐
       value: [],
-      kxyzList: [
-        {
-          bsm: "BWG",
-          yxyzmc: "博物馆",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "CZKFBJ",
-          yxyzmc: "城镇开发边界",
-          level: 1,
-          parent_bsm: "DXGK",
-          has_yxz: false,
-          spatial_type: "contain",
-        },
-        {
-          bsm: "DL",
-          yxyzmc: "电力",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "DX",
-          yxyzmc: "电信",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "DXGK",
-          yxyzmc: "底线管控",
-          level: 0,
-          parent_bsm: null,
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "GGFWSS",
-          yxyzmc: "公共服务设施",
-          level: 0,
-          parent_bsm: null,
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "GL",
-          yxyzmc: "公路",
-          level: 2,
-          parent_bsm: "JT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "GS",
-          yxyzmc: "供水",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "GX",
-          yxyzmc: "管线",
-          level: 1,
-          parent_bsm: "SZSS",
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "GY",
-          yxyzmc: "公园",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "JT",
-          yxyzmc: "交通",
-          level: 1,
-          parent_bsm: "SZSS",
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "JYZ",
-          yxyzmc: "加油站",
-          level: 2,
-          parent_bsm: "JT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "LD",
-          yxyzmc: "绿地",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "LJCLSS",
-          yxyzmc: "垃圾处理设施",
-          level: 2,
-          parent_bsm: "QT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "PS",
-          yxyzmc: "排水",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "QT",
-          yxyzmc: "其他",
-          level: 1,
-          parent_bsm: "SZSS",
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "RQ",
-          yxyzmc: "燃气",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "STBHHX",
-          yxyzmc: "生态保护红线",
-          level: 1,
-          parent_bsm: "DXGK",
-          has_yxz: false,
-          spatial_type: "contain",
-        },
-        {
-          bsm: "SY",
-          yxyzmc: "输油",
-          level: 2,
-          parent_bsm: "GX",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "SZSS",
-          yxyzmc: "市政设施",
-          level: 0,
-          parent_bsm: null,
-          has_yxz: null,
-          spatial_type: null,
-        },
-        {
-          bsm: "TCC",
-          yxyzmc: "停车场",
-          level: 2,
-          parent_bsm: "JT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "TL",
-          yxyzmc: "铁路",
-          level: 2,
-          parent_bsm: "JT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "TSG",
-          yxyzmc: "图书馆",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "TYG",
-          yxyzmc: "体育馆",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "WSCLC",
-          yxyzmc: "污水处理厂",
-          level: 2,
-          parent_bsm: "QT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "XX",
-          yxyzmc: "学校",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "YJJBNT",
-          yxyzmc: "永久基本农田",
-          level: 1,
-          parent_bsm: "DXGK",
-          has_yxz: false,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "YY",
-          yxyzmc: "医院",
-          level: 1,
-          parent_bsm: "GGFWSS",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "ZRWHBHQ",
-          yxyzmc: "自然文化保护区",
-          level: 1,
-          parent_bsm: "DXGK",
-          has_yxz: false,
-          spatial_type: "identity",
-        },
-        {
-          bsm: "ZYCRK",
-          yxyzmc: "主要出入口",
-          level: 2,
-          parent_bsm: "JT",
-          has_yxz: true,
-          spatial_type: "identity",
-        },
-      ],
       cascaderOptions: [], //用地性质数据存储数组
       sjyBSM: "",
       ydlxBSM: "",
@@ -415,7 +173,7 @@ export default {
   computed: {},
   mounted() {
     GetDldmTree({
-      fzbs: "3DDLDM",
+      fzbs: "YDYHFLDM",
     }).then((res) => {
       //顶级树只有一个
       let childArr = res.data;
@@ -444,12 +202,12 @@ export default {
   },
   methods: {
     handleChange(value) {
-      console.log(value);
+      // console.log(value);
       const obj = this.$refs["Cascader"].getCheckedNodes();
       this.ydlxBSM = obj[0].value;
     },
     handleChange2(value) {
-      console.log(value);
+      // console.log(value);
       // const obj = this.$refs['Cascader'].getCheckedNodes()
       this.sjyBSM = value;
     },
@@ -473,46 +231,29 @@ export default {
             geomId: this.$refs.range.fileDataID,
             yxyz: this.tableData,
           };
-          console.log(obj, "objobj");
+          // console.log(obj, "objobj");
           AddFzxz(obj).then((res) => {
-            console.log(res, "哈哈哈哈哈");
-            if (res.success) {
-              // this.bus.$emit("recordBsm", res.data.rwbsm);
-              const loading = this.$loading({
-                lock: true,
-                text: "分析中",
-                spinner: "el-icon-loading",
-                background: "rgba(0, 0, 0, 0.7)",
+            // console.log(res, "哈哈哈哈哈");
+            // if (res.success) {
+            // this.bus.$emit("recordBsm", res.data.rwbsm);
+            const loading = this.$loading({
+              lock: true,
+              text: "分析中",
+              spinner: "el-icon-loading",
+              background: "rgba(0, 0, 0, 0.7)",
+            });
+            setTimeout(() => {
+              loading.close();
+              this.activeTabs = "lsju";
+              this.$emit("updateParent", "activeTabs", "lsju");
+              this.$message({
+                message: res.message,
+                type: res.success ? "success" : "warning",
               });
-              setTimeout(() => {
-                loading.close();
-                this.activeTabs = "lsju";
-                this.$emit("updateParent", "activeTabs", "lsju");
-                this.$message({
-                  message: "分析成功！",
-                  type: "success",
-                });
-                this.reset();
-              }, 2000);
-            }
+              this.reset();
+            }, 2000);
+            // }
           });
-
-          // const loading = this.$loading({
-          //   lock: true,
-          //   text: "分析中",
-          //   spinner: "el-icon-loading",
-          //   background: "rgba(0, 0, 0, 0.7)",
-          // });
-          // setTimeout(() => {
-          //   loading.close();
-          //   this.activeTabs = "lsju";
-          //   this.$emit("updateParent", "activeTabs", "lsju");
-          //   this.$message({
-          //     message: "分析成功！",
-          //     type: "success",
-          //   });
-          //   this.reset();
-          // }, 2000);
         } else {
           console.log("error submit!!");
           return false;
@@ -527,10 +268,11 @@ export default {
         ydlx: "",
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
-        sjy: "国土空间总体规划", //数据源
+        sjy: this.options[0].sjymc, //数据源
         xzmj: 0,
       }),
-        (this.tableData = []);
+        (this.sjyBSM = this.options[0].value);
+      this.tableData = [];
       this.$refs.ruleForm.resetFields();
       this.$refs.range.reset();
     },

static/css/index.css

@@ -14,7 +14,7 @@ body {
   margin: 0;
   padding: 0;
   overflow: hidden;
-  color: #eee;
+  color: #fff !important;
 }
 
 #loadingbar {