fix: 功能修改

src/views/dataReport/saveWaterAnalysis.vue

@@ -98,7 +98,7 @@ export default {
           customRender: '',
           align: 'center'
         }, {
-          label: '剩余水权（立方）',
+          label: '剩余水权（m³）',
           prop: 'farmerWrbalance',
           customRender: '',
           align: 'center'

src/views/dataReport/waterConsumption.vue

@@ -84,7 +84,7 @@ export default {
           align: 'center'
         },
         {
-          label: '累计用电量（°）',
+          label: '累计用电量（度）',
           prop: 'elecNumTotal',
           customRender: '',
           align: 'center'

src/views/home/index.vue

@@ -129,24 +129,7 @@ export default {
   data() {
     return {
       loading: true,
-      options: [
-        {
-          value: '2023',
-          label: '2023'
-        }, {
-          value: '2022',
-          label: '2022'
-        }, {
-          value: '2021',
-          label: '2021'
-        }, {
-          value: '2020',
-          label: '2020'
-        }, {
-          value: '2019',
-          label: '2019'
-        }
-      ],
+      options: [],
       byMonthList: [],
       treeData:[],
       cusareaName:'',
@@ -167,7 +150,7 @@ export default {
       waterNumTotal: 0,
       waterSave: 0,
       waterSaveProportion: 0,
-      waterrightYear: '2023',
+      waterrightYear: new Date().getFullYear(),
       list: [[{
         imageSrc: electricity,
         title: '水井数目(口)',
@@ -212,6 +195,18 @@ export default {
     }
   },
   methods: {
+    setYear() {
+      this.options = []
+      let date = new Date
+      let currentYear = date.getFullYear()
+      this.currentYear = currentYear
+      for (let i = 0; i < 5; i++) {
+        this.options.push({
+          label: currentYear - i,
+          value: currentYear - i
+        })
+      }
+    },
     handlerClick(value) {
       this.areaId = value?.cusareaId
     },
@@ -219,6 +214,7 @@ export default {
       this.getHomeListHandler()
      },
     async getArea() {
+      this.setYear()
       const treeList = this.$store.state.tree.treeList
       let res = []
       if (treeList.code === '000000') {

src/views/infrastructure/components/recompose.vue

@@ -36,7 +36,7 @@
           </el-input>
         </el-form-item>
       </el-row>
-      <el-row>
+      <el-row v-if="cusareaParentid != 0">
         <el-form-item label="">
           <span>（上级组织：{{ infoData.cusareaName }} 总面积：{{ infoData.areasizeResidue || 0 }} 亩 额定水权：{{ infoData.waterrightAmount || 0 }} m³ 剩余水权：{{ infoData.amountResidue || 0 }}）</span>
         </el-form-item>
@@ -133,6 +133,7 @@ export default {
       },
       averageWater: 0,
       infoData: {},
+      cusareaParentid: 0,
       hasFetched: false,
       rules: {
         area: [
@@ -140,7 +141,7 @@ export default {
             required: true, validator: (rule, value, callback) => {
               if (!+value) { callback(new Error('请输入面积')); return }
               if (isNaN(value)) callback(new Error('请正确输入您的面积'))
-              else if (value > this.infoData.areasizeResidue) {
+              else if (value > this.infoData.areasizeResidue && this.cusareaParentid != 0) {
                 callback(new Error('输入的面积不能大于总面积'))
               } else {
                 callback()
@@ -151,7 +152,7 @@ export default {
           { required: true, validator: (rule, value, callback) => {
             if (!+value) {  callback(new Error('请输入额定水权'));  return}
             if(isNaN(value)) callback(new Error('请正确输入您的额定水权'))
-            else if (value > this.infoData.waterrightAmount) {
+            else if (value > this.infoData.waterrightAmount && this.cusareaParentid != 0) {
               callback(new Error('输入的额定水权不能大于总额定水权'))
             } else { 
               callback()
@@ -175,6 +176,9 @@ export default {
     },
     editRow:{
       handler(val) {
+        console.log(val, 'valvalvalvlavlas')
+        const { cusareaParentid } = val
+        this.cusareaParentid = cusareaParentid
         this.visible && this.getWaterrightUpareaList(val)
       },
       deep: true

src/views/infrastructure/components/waterPriceSetting.vue

@@ -90,24 +90,7 @@ export default {
         dateTime: ''
       },
       hasFetched: false,
-      options:[
-        {
-          label: '2023',
-          value: '2023'
-        },{
-          label: '2024',
-          value: '2024'
-        },{
-          label: '2025',
-          value: '2025'
-        },{
-          label: '2026',
-          value: '2026'
-        },{
-          label: '2027',
-          value: '2027'
-        }
-      ],
+      options:[],
       checked: false,
       rules: {
         dateTime: [
@@ -120,16 +103,25 @@ export default {
     visible(val) {
       if (val !== this.dialogVisible) {
         this.dialogVisible = val;
-        if (val) {
-          assign(this.baseForm, this.data);
-          if (!this.hasFetched) {
-            this.hasFetched = true;
-          }
-        }
       }
     },
   },
+  mounted() {
+    this.setYear()
+  },
   methods: {
+    setYear() {
+      this.options = []
+      let date = new Date
+      let currentYear = date.getFullYear()
+      this.currentYear = currentYear
+      for (let i = 0; i < 5; i++) {
+        this.options.push({
+          label: currentYear - i,
+          value: currentYear - i
+        })
+      }
+    },
     async addWaterrightHandler() {
       const useOldStatus = this.checked ? 1 : 0
       const waterrightYear = this.baseForm.dateTime

src/views/infrastructure/waterEstablishment.vue

@@ -62,37 +62,6 @@
               >
             </template>
           </b-table>
-        <!-- <el-table
-          ref="tableRef"
-          :args="{ 'highlight-current-row': true }"
-          :data="tableData"
-          row-key="id"
-          :columns="columns"
-          isShowIndex
-          :tree-props="{children: 'children',hasChildren: 'hasChildren'}"
-          :header-row-style="{ background: '#E5EEED' }"
-          :header-cell-style="{ background: '#E5EEED' }"
-        >
-          <el-table-column
-            v-for="item in columns"
-            :key="item.id"
-            :prop="item.prop"
-            :label="item.label"
-          >
-          </el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <el-link
-                size="small"
-                :underline="false"
-                type="primary"
-                style="margin-right: 10px"
-                @click="handlerRecompose(scope.row)"
-                >修改</el-link
-              >
-            </template>
-        </el-table-column>
-        </el-table> -->
         </el-col>
       </el-card>
     </el-col>
@@ -124,30 +93,13 @@ export default {
       form: {
         productName: ''
       },
-      options:[
-        {
-          value: '2023',
-          label: '2023'
-        }, {
-          value: '2022',
-          label: '2022'
-        }, {
-          value: '2021',
-          label: '2021'
-        }, {
-          value: '2020',
-          label: '2020'
-        }, {
-          value: '2019',
-          label: '2019'
-        }
-      ],
+      options:[],
       treeData: [],
       loading: false,
       recomposeShow: false,
       waterprice: false,
       cusareaName:'',
-      waterrightYear: '2023',
+      waterrightYear: new Date().getFullYear(),
       areaId:'',
       editRow: {},
       columns: [
@@ -169,7 +121,7 @@ export default {
           customRender: '',
           align: 'left'
         },{
-          label: '亩均水权（亩/立方）',
+          label: '亩均水权（亩/m³）',
           prop: 'phone',
           customRender: 'Permuarea',
           align: 'left'
@@ -184,10 +136,23 @@ export default {
     };
   },
   methods: {
+    setYear() {
+      this.options = []
+      let date = new Date
+      let currentYear = date.getFullYear()
+      this.currentYear = currentYear
+      for (let i = 0; i < 5; i++) {
+        this.options.push({
+          label: currentYear - i,
+          value: currentYear - i
+        })
+      }
+    },
     resetEdit() {
       this.editRow = {}
     },
     async loadData(parameter) {
+      this.setYear()
       if(!this.areaId) {
         const treeList = this.$store.state.tree.treeList
         let res = []

src/views/peasantHouseholdManage/components/IrrigationRecord.vue

@@ -79,8 +79,8 @@ export default {
           align: 'center'
         },
         {
-          label: '本次用水量（m³）',
-          prop: 'cardusercdWaternum',
+          label: '本次用电量（度）',
+          prop: 'cardusercdElectricnum',
           customRender: '',
           align: 'center'
         },

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -293,9 +293,9 @@ export default {
   methods: {
     setItem(val) { 
       const value = this.findItemByAreaId(this.currentClickId, val)
-      this.areaAll = value?.waterrightAreasize
-      this.waterRightAll = value?.waterrightAmount
-      this.yieldPer = value?.waterrightAmount == 0 ? 0 : (value?.waterrightAreasize) / (value?.waterrightAmount)
+      this.areaAll = value?.waterrightAreasize || '-'
+      this.waterRightAll = value?.waterrightAmount || '0'
+      this.yieldPer = value ? value?.waterrightAmount == 0 ? 0 : (value?.waterrightAreasize) / (value?.waterrightAmount) : 0
       this.residualWaterRight = value?.amountResidue ?? 0
     },
     findItemByAreaId(areaId,list) {

src/views/peasantHouseholdManage/index.vue

@@ -197,12 +197,12 @@ export default {
           customRender: '',
           align: 'center'
         },{
-          label: '水权数量（立方）',
+          label: '水权数量（m³）',
           prop: 'farmerWramount',
           customRender: '',
           align: 'center'
         },{
-          label: '剩余水权（立方）',
+          label: '剩余水权（m³）',
           prop: 'farmerWrbalance',
           customRender: '',
           align: 'center'

src/views/waterCardManage/dataDetail.vue

@@ -27,7 +27,7 @@
           <span class="label"><span>总用水量：</span>{{baseForm.waterNumTotal || 0}} m³</span>
         </el-col>
         <el-col :span="5">
-          <span class="label"><span>总用电量：</span>{{baseForm.electricNumTotal || 0}} m³</span></el-col>
+          <span class="label"><span>总用电量：</span>{{baseForm.electricNumTotal || 0}} 度</span></el-col>
       </el-row>
       <div class="dateType">
         <el-date-picker
@@ -132,8 +132,8 @@ export default {
           align: 'center'
         },
         {
-          label: '本次用水量（m³）',
-          prop: 'cardusercdWaternum',
+          label: '本次用电量（度）',
+          prop: 'cardusercdElectricnum',
           customRender: '',
           align: 'center'
         },

src/views/waterManage/component/associationManage.vue

@@ -230,10 +230,10 @@ export default {
     baseForm: {
       handler(val) {
         const { areaIds } = val
-        if (areaIds != '') {
+        if (areaIds) {
           this.$refs?.baseForm?.clearValidate(['areaIds'])
         } else { 
-          this.$refs.baseForm.validateField('areaIds')
+          this.$refs?.baseForm?.validateField('areaIds')
         }
         
       },

vue.config.js

@@ -46,9 +46,9 @@ module.exports = {
         }
       },
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.1.57:8021`,
-        // target: `http://192.168.95:8021`,
         target: `http://192.168.1.57:8027`,
+        // target: `http://192.168.95:8021`,
+        // target: `http://114.55.0.7:7000/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''