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

src/views/siteselection/components/fzxz.vue

@@ -1,22 +1,12 @@
 <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
@@ -26,11 +16,7 @@
         ></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
@@ -50,24 +36,16 @@
         </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>
@@ -75,29 +53,18 @@
           <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>
@@ -347,6 +314,10 @@ export default {
             Message.warning("请绘制或导入选址范围!");
             return;
           }
+
+          this.tableData.forEach((res) => {
+            res.conditionInfo.defaultValue += ''
+          })
           let obj = {
             xzmj: Number(this.ruleForm.xzmj),
             xmmc: this.ruleForm.xmmc,
@@ -363,6 +334,8 @@ export default {
             useLandType: this.ruleForm.useLandType, //是否与控规用地性质一致
             multipleDistance: this.ruleForm.multipleDistance, //多地块最大距离
           };
+
+
           const loading = this.$loading({
             lock: true,
             text: "分析中",
@@ -441,12 +414,14 @@ export default {
 .hgxsc {
   height: 100%;
   line-height: 40px;
+
   .rangDiv {
     width: 100%;
     // height: 100px;
     display: flex;
     justify-content: space-between;
   }
+
   .range {
     // flex: 1;
     // width: calc(100% - 100px);
@@ -464,24 +439,30 @@ export default {
     overflow-y: auto;
   }
 }
+
 /deep/ .el-input .el-input--mini .el-input--suffix {
   width: 100%;
 }
+
 /deep/ .el-select {
   width: 100%;
 }
+
 /deep/ .el-form-item__error {
   top: 32px !important;
 }
+
 /deep/ .el-checkbox {
   color: #fff;
 }
+
 .xzys {
   height: 95px;
   // background: pink;
   display: flex;
   flex-direction: column;
 }
+
 label {
   margin-bottom: 0px !important;
 }