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

src/views/siteselection/components/fzxz.vue

@@ -1,12 +1,22 @@
 <template>
   <div class="hgxsc ghzc">
-    <el-form :model="ruleForm" ref="ruleForm" label-width="107px" :rules="rules" label-position="left">
+    <el-form
+      :model="ruleForm"
+      ref="ruleForm"
+      label-width="107px"
+      :rules="rules"
+      label-position="left"
+    >
       <!-- <div class="block-title">基本信息</div> -->
       <el-form-item label="选址范围:" prop="xzmj">
         <range type="hgxfx" :keys="['hx', 'sc']" class="range" ref="range" />
       </el-form-item>
       <el-form-item label="项目名称:" prop="xmmc">
-        <el-input v-model="ruleForm.xmmc" size="mini" placeholder="请输入项目名称"></el-input>
+        <el-input
+          v-model="ruleForm.xmmc"
+          size="mini"
+          placeholder="请输入项目名称"
+        ></el-input>
       </el-form-item>
       <!-- <el-form-item label="项目类型:" prop="xmlx">
         <el-input
@@ -16,7 +26,11 @@
         ></el-input>
       </el-form-item> -->
       <el-form-item label="建设单位:" prop="jsdw">
-        <el-input v-model="ruleForm.jsdw" size="mini" placeholder="请输入建设单位"></el-input>
+        <el-input
+          v-model="ruleForm.jsdw"
+          size="mini"
+          placeholder="请输入建设单位"
+        ></el-input>
       </el-form-item>
       <!-- <el-form-item label="数据源:" prop="sjy">
         <el-select
@@ -36,16 +50,24 @@
         </el-select>
       </el-form-item> -->
       <el-form-item label="用地类型:" prop="ydlx">
-        <el-cascader ref="Cascader" v-model="ruleForm.ydlx" :options="cascaderOptions"
-          :props="{ expandTrigger: 'hover', checkStrictly: true }" @change="handleChange" :show-all-levels="false"
-          size="mini"></el-cascader>
+        <el-cascader
+          ref="Cascader"
+          v-model="ruleForm.ydlx"
+          :options="cascaderOptions"
+          :props="{ expandTrigger: 'hover', checkStrictly: true }"
+          @change="handleChange"
+          :show-all-levels="false"
+          size="mini"
+        ></el-cascader>
       </el-form-item>
       <el-form-item label="用地面积(亩):" required>
         <el-col :span="11">
           <el-form-item prop="ydmjbegin">
             <el-input
               Onkeyup="this.value=this.value.replace(/[^\d^\.]+/g,'').replace(/^0+(\d)/,'$1').replace(/^\./,'0.').match(/\d+.?\d{0,2}/);this.dispatchEvent(new Event('input'))"
-              v-model="ruleForm.ydmjbegin" size="mini"></el-input>
+              v-model="ruleForm.ydmjbegin"
+              size="mini"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col class="line" :span="2">-</el-col>
@@ -53,18 +75,29 @@
           <el-form-item prop="ydmjend">
             <el-input
               Onkeyup="this.value=this.value.replace(/[^\d^\.]+/g,'').replace(/^0+(\d)/,'$1').replace(/^\./,'0.').match(/\d+.?\d{0,2}/);this.dispatchEvent(new Event('input'))"
-              v-model="ruleForm.ydmjend" size="mini"></el-input>
+              v-model="ruleForm.ydmjend"
+              size="mini"
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-form-item>
       <el-form-item label="选址约束:">
         <div class="xzys">
           <el-checkbox v-model="ruleForm.useLandType">
-            是否与控规用地性质一致</el-checkbox>
-          <el-checkbox v-model="ruleForm.useMultiple">是否允许选出多个分散地块</el-checkbox>
+            是否与控规用地性质一致</el-checkbox
+          >
+          <el-checkbox v-model="ruleForm.useMultiple"
+            >是否允许选出多个分散地块</el-checkbox
+          >
           <div v-if="ruleForm.useMultiple">
             请输入地块间最大距离
-            <el-input v-model.number="ruleForm.multipleDistance" size="mini" type="number" style="width: 30%"></el-input>米
+            <el-input
+              v-model.number="ruleForm.multipleDistance"
+              size="mini"
+              type="number"
+              style="width: 30%"
+            ></el-input
+            >米
           </div>
         </div>
       </el-form-item>
@@ -112,6 +145,7 @@ import {
   GetTemplateFactorList,
 } from "../../../api/ghss/ghxz.js";
 import moment from "moment";
+import { error } from "shelljs";
 export default {
   components: {
     yxyzPop,
@@ -316,8 +350,8 @@ export default {
           }
 
           this.tableData.forEach((res) => {
-            res.conditionInfo.defaultValue += ''
-          })
+            res.conditionInfo.defaultValue += "";
+          });
           let obj = {
             xzmj: Number(this.ruleForm.xzmj),
             xmmc: this.ruleForm.xmmc,
@@ -335,29 +369,32 @@ export default {
             multipleDistance: this.ruleForm.multipleDistance, //多地块最大距离
           };
 
-
           const loading = this.$loading({
             lock: true,
             text: "分析中",
             spinner: "el-icon-loading",
             background: "rgba(0, 0, 0, 0.7)",
           });
-          AddFzxz(obj).then((res) => {
-            // setTimeout(() => {
-            loading.close();
-            this.activeTabs = "lsju";
-            this.$emit("updateParent", "activeTabs", "lsju");
-            this.$message({
-              message: res.message,
-              type: res.success ? "success" : "warning",
+          AddFzxz(obj)
+            .then((res) => {
+              // setTimeout(() => {
+              loading.close();
+              this.activeTabs = "lsju";
+              this.$emit("updateParent", "activeTabs", "lsju");
+              this.$message({
+                message: res.message,
+                type: res.success ? "success" : "warning",
+              });
+              this.reset();
+              // }, 2000);
+              // }
+            }).catch((error) => {
+              loading.close();
+              Message.error(error)
             });
-            this.reset();
-            // }, 2000);
-            // }
-          });
         } else {
-          console.log("error submit!!");
           loading.close();
+          console.log("error submit!!");
           return false;
         }
       });