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

src/views/cockpit/gdbh.vue

@@ -20,7 +20,7 @@
             </div>
             <div class="text_back">
               <p>建设用地占用耕地</p>
-              <span>{{ zbpg_hz.zygd.mj }}</span>km²
+              <span>{{ balanceData.zy_gdmj }}</span>km²
 
             </div>
           </div>
@@ -32,7 +32,7 @@
             </div>
             <div class="text_back">
               <p>补充耕地</p>
-              <span>{{ zbpg_hz.bcgd.mj }}</span>km²
+              <span>{{ balanceData.cb_gdmj }}</span>km²
 
             </div>
           </div>
@@ -48,7 +48,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">{{ zbpg_hz.zygd.qzst }}</span>
+                  <span class="zbph_value">{{ balanceData.zy_st }}</span>
                   <span class="zbph_unit">km²</span>
                 </span>
               </li>
@@ -60,7 +60,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">{{ zbpg_hz.zygd.sslscn }}</span>
+                  <span class="zbph_value">{{ balanceData.zy_cn }}</span>
                   <span class="zbph_unit">吨</span>
                 </span>
               </li>
@@ -76,7 +76,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">{{ zbpg_hz.bcgd.qzst }}</span>
+                  <span class="zbph_value">{{ balanceData.cb_st }}</span>
                   <span class="zbph_unit">km²</span>
                 </span>
               </li>
@@ -88,7 +88,7 @@
                 <br>
 
                 <span class="zbph_value_unit">
-                  <span class="zbph_value">{{ zbpg_hz.bcgd.tslscn }}</span>
+                  <span class="zbph_value">{{ balanceData.cb_cn }}</span>
                   <span class="zbph_unit">吨</span>
                 </span>
               </li>
@@ -220,7 +220,17 @@ export default {
           mj: 0,
         }
 
-      }
+      },
+      balanceData:{
+        cb_cn:0,
+        cb_gdm: 0,
+        cb_st: 0,
+        create_time: "20240101",
+        id: "4602",
+        zy_cn:0,
+        zy_gdmj: 0,
+        zy_st:0
+      },//占补平衡数据存储
     };
   },
   //监听属性 类似于data概念
@@ -233,8 +243,10 @@ export default {
     async init_info(params) {
       const that = this;
       let obj = {
-        jscType: 'sc_gdbh_xz_dlbm',
-        id: params ? params.id : '4602'
+        jscType: 'jsc_gdbh_zbph_hz',
+        id: params ? params.id : '4602',
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
       };
       let data = await QueryOne(obj);
       store.state.cockpit_gdbh.gdxz.title = data.data
@@ -332,18 +344,19 @@ export default {
       let obj = {
         jscType: 'jsc_gdbh_zbph_hz',
         id: params ? params.id : '4602',
-        beginTime: store.state.cockpit_date[0],
-        endTime: store.state.cockpit_date[1],
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
       };
       let data = await QueryOne(obj);
-      this.zbpg_hz.zygd.qzst = data.data.zy_st
-      this.zbpg_hz.zygd.mj = data.data.zy_gdmj
-      this.zbpg_hz.zygd.sslscn = data.data.zy_cn
+      this.balanceData = data.data
+      // this.zbpg_hz.zygd.qzst = data.data.zy_st
+      // this.zbpg_hz.zygd.mj = data.data.zy_gdmj
+      // this.zbpg_hz.zygd.sslscn = data.data.zy_cn
 
-      this.zbpg_hz.bcgd.qzst = data.data.cb_st
-      this.zbpg_hz.bcgd.mj = data.data.cb_gdmj
-      this.zbpg_hz.bcgd.tslscn = data.data.cb_cn
-      console.log('this.zbpg_hz: ', this.zbpg_hz);
+      // this.zbpg_hz.bcgd.qzst = data.data.cb_st
+      // this.zbpg_hz.bcgd.mj = data.data.cb_gdmj
+      // this.zbpg_hz.bcgd.tslscn = data.data.cb_cn
+      // console.log('this.zbpg_hz: ', this.zbpg_hz);
 
       // store.state.cockpit_gdbh.zbph.bcgd = data.data
     },
@@ -633,6 +646,7 @@ export default {
       this.init_zbph();
       this.init_jcpg();
       this.init_zbph_hz();
+      
     })
   },
 };

src/views/siteselection/components/fzxz.vue

@@ -86,9 +86,9 @@
           <el-checkbox v-model="ruleForm.useLandType">
             是否与控规用地性质一致</el-checkbox
           >
-          <el-checkbox v-model="ruleForm.useMultiple"
+          <!-- <el-checkbox v-model="ruleForm.useMultiple"
             >是否允许选出多个分散地块。</el-checkbox
-          >
+          > -->
           <div v-if="ruleForm.useMultiple">
             请输入地块间最大距离
             <el-input
@@ -119,12 +119,9 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="约束值(m/°)"
-          show-overflow-tooltip
-        >
-        <template slot-scope="scope">
-            <span>{{scope.row.conditionInfo.defaultValue }}</span>
+        <el-table-column label="约束值(m/°)" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.conditionInfo.defaultValue }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -162,10 +159,10 @@ export default {
       checkbox_data: 0,
       ruleForm: {
         xzmj: 0,
-        xmmc: "",
-        jsdw: "",
+        xmmc: "规划选址项目_" + this.getCurrentDateTime(),
+        jsdw: "建设单位",
         // xmlx: "",
-        ydlx: "",
+        ydlx: ["07", "0701"],//默认为城镇住宅用地
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
         sjy: "", //数据源
@@ -180,7 +177,7 @@ export default {
           { required: true, message: "请输入项目名称", trigger: "blur" },
           { min: 3, max: 10, message: "长度在 3 到 5 个字符", trigger: "blur" },
         ],
-        jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
+        // jsdw: [{ required: true, message: "请输入建设单位", trigger: "blur" }],
         // xmlx: [{ required: true, message: "请输入项目类型", trigger: "blur" }],
         ydlx: [{ required: true, message: "请输入用地类型", trigger: "blur" }],
         ydmjbegin: [
@@ -198,7 +195,7 @@ export default {
       value: [],
       cascaderOptions: [], //用地性质数据存储数组
       sjyBSM: "",
-      ydlxBSM: "",
+      ydlxBSM: "0701",
       checkList: [
         {
           key: "是否与控规用地性质一致",
@@ -243,6 +240,19 @@ export default {
     });
   },
   methods: {
+    getCurrentDateTime() {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = this.padNumber(now.getMonth() + 1); // 月份是从0开始的
+      const day = this.padNumber(now.getDate());
+      const hours = this.padNumber(now.getHours());
+      const minutes = this.padNumber(now.getMinutes());
+      const seconds = this.padNumber(now.getSeconds());
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    padNumber(num) {
+      return num < 10 ? "0" + num : num;
+    },
     changeCheckBox(val) {
       console.log(val, "杰卡斯到货时间啊肯定会刷卡机很大");
       if (val.value == 1) {
@@ -299,12 +309,10 @@ export default {
       // }
     },
     handleChange2(value) {
-      // console.log(value);
       // const obj = this.$refs['Cascader'].getCheckedNodes()
       this.sjyBSM = value;
     },
     submitData() {
-      console.log(this.ruleForm, "this.ruleForm");
       //更新范围
       var _temp = this.$refs.range.getRange();
       // this.ruleForm.xzfw = _temp.xzfw;
@@ -327,7 +335,6 @@ export default {
             useLandType: this.ruleForm.useLandType, //是否与控规用地性质一致
             multipleDistance: this.ruleForm.multipleDistance, //多地块最大距离
           };
-          // console.log(obj, "objobj");
           AddFzxz(obj).then((res) => {
             const loading = this.$loading({
               lock: true,
@@ -355,10 +362,10 @@ export default {
     },
     reset() {
       (this.ruleForm = {
-        xmmc: "",
-        jsdw: "",
+        xmmc: "规划选址项目_" + this.getCurrentDateTime(),
+        jsdw: "建设单位",
         // xmlx: "",
-        ydlx: "",
+        ydlx: ["07", "0701"],
         ydmjbegin: "", //用地面积开始
         ydmjend: "", //用地面积结束
         sjy: this.options[0].sjymc, //数据源