feat: 参数设置和农户的修改

src/api/card/index2.js

@@ -1,3 +1,4 @@
+window.a = false;
 import request from '@/utils/request2';
 // 实时监测
 export const getDataInfo = (query) => {

src/views/infrastructure/components/setPreferenc.vue

@@ -24,8 +24,22 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="计算模式：" prop="tmnconfigMeteredmodel">
-                <el-input placeholder="请输入" v-model="baseForm.tmnconfigMeteredmodel">
-                </el-input>
+                <!-- <el-input placeholder="请输入" v-model="baseForm.tmnconfigMeteredmodel"> -->
+                <!-- </el-input> -->
+                <el-select  v-model="baseForm.tmnconfigMeteredmodel" style="width:100%">
+                  <el-option
+                    label="水电双计"
+                    value="0"
+                  ></el-option>
+                  <el-option
+                    label="水"
+                    value="1"
+                  ></el-option>
+                  <el-option
+                    label="电"
+                    value="2"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -102,6 +102,27 @@
                 </el-row>
               </el-form-item>
             </el-col>
+              <el-col :span="12">
+                <el-form-item label="土地面积" prop="farmerAreasize">
+                  <el-row>
+                    <el-col style="position:relative">
+                      <el-input
+                        v-model="baseForm.farmerAreasize"
+                        type="number"
+                        filterable
+                        style="width: 90%"
+                        placeholder="请输入土地面积"
+                      >
+                      </el-input>
+                      <span style="position:absolute;margin-left:10px">亩</span>
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="24">
+          <el-row>
             <el-col :span="12">
               <el-form-item label="水权" prop="farmerWramount">
                 <el-row>
@@ -120,27 +141,6 @@
             </el-col>
           </el-row>
         </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="土地面积" prop="farmerAreasize">
-                <el-row>
-                  <el-col style="position:relative">
-                    <el-input
-                      v-model="baseForm.farmerAreasize"
-                      type="number"
-                      filterable
-                      style="width: 90%"
-                      placeholder="请输入土地面积"
-                    >
-                    </el-input>
-                    <span style="position:absolute;margin-left:10px">亩</span>
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
       </el-row>
     </el-form>
     <div style="text-align: right">
@@ -268,7 +268,6 @@ export default {
               if (isNaN(value)) { callback(new Error('请正确输入您的水权')); return }
               if (this.isEdit) {
                 if (+value > (+this.residualWaterRight) + (+this.editFarmerData.farmerWramount)) {
-                  console.log(22222 , (+this.residualWaterRight) , (+this.editFarmerData.farmerWramount))
                   callback(new Error('输入的水权不能大于剩余水权'))
                   return
                 } else { 
@@ -300,6 +299,15 @@ export default {
         this.clearItem()
       }
     },
+    'baseForm.farmerAreasize': {
+      handler(val) {
+        if (this.yieldPer > 0) { 
+          this.baseForm.farmerWramount = Number(this.yieldPer) * val
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     editFarmerData: {
       handler(val) {
         if (this.isEdit && val?.areaId) {