Selaa lähdekoodia

绘制或导入选址范围提示

maxiaoxiao 10 kuukautta sitten
vanhempi
commit
bfa99f890f

+ 8 - 1
src/views/complianceAnalysis/components/hgxsc.vue

@@ -193,12 +193,19 @@ export default {
       var _temp = this.$refs.range.getRange();
       this.ruleForm.xzfw = _temp.xzfw;
       this.ruleForm.xzmj = _temp.xzmj;
+      console.log(this.ruleForm);
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.getCheckedNodes();
+          if (!this.ruleForm.xzfw) {
+            Message.warning("请绘制或导入选址范围!");
+            return;
+          }
           if (this.ruleForm.scxList.length == 0) {
-            Message.warning("至少选择一个项目信息");
+            Message.warning("至少选择一个项目信息!");
+            return;
           }
+
           MessageBox.confirm("是否开始进行合规性检查?", "合规性检查", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 7 - 0
src/views/siteselection/components/fzxz.vue

@@ -137,6 +137,7 @@
 <script>
 import yxyzPop from "./yxyzPop.vue"; ///mapview/range
 import range from "@/components/mapview/range.vue"; ///mapview/range
+import { Message } from "element-ui";
 import {
   GetDldmTree,
   GetSjyList,
@@ -340,8 +341,13 @@ export default {
       var _temp = this.$refs.range.getRange();
       // this.ruleForm.xzfw = _temp.xzfw;
       this.ruleForm.xzmj = _temp.xzmj;
+      console.log(this.ruleForm, "0---");
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          if (!this.$refs.range.fileDataID) {
+            Message.warning("请绘制或导入选址范围!");
+            return;
+          }
           let obj = {
             xzmj: Number(this.ruleForm.xzmj),
             xmmc: this.ruleForm.xmmc,
@@ -379,6 +385,7 @@ export default {
           });
         } else {
           console.log("error submit!!");
+          loading.close();
           return false;
         }
       });