fix: 部分bug的修改

src/layout/components/Sidebar/Logo.vue

@@ -70,7 +70,7 @@ export default {
   },
   data() {
     return {
-      title: '农产品溯源管理系统',
+      title: '水价改革管理系统',
       logo: logoImg
     };
   }

src/utils/index.js

@@ -1,18 +1,25 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from './ruoyi';
 
 /**
  * 表格时间格式化
  */
 export function formatDate(cellValue) {
-  if (cellValue == null || cellValue == "") return "";
-  var date = new Date(cellValue) 
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
-  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-  return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+  if (cellValue == null || cellValue == '') return '';
+  var date = new Date(cellValue);
+  var year = date.getFullYear();
+  var month =
+    date.getMonth() + 1 < 10
+      ? '0' + (date.getMonth() + 1)
+      : date.getMonth() + 1;
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+  var minutes =
+    date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+  var seconds =
+    date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+  return (
+    year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+  );
 }
 
 /**
@@ -22,27 +29,27 @@ export function formatDate(cellValue) {
  */
 export function formatTime(time, option) {
   if (('' + time).length === 10) {
-    time = parseInt(time) * 1000
+    time = parseInt(time) * 1000;
   } else {
-    time = +time
+    time = +time;
   }
-  const d = new Date(time)
-  const now = Date.now()
+  const d = new Date(time);
+  const now = Date.now();
 
-  const diff = (now - d) / 1000
+  const diff = (now - d) / 1000;
 
   if (diff < 30) {
-    return '刚刚'
+    return '刚刚';
   } else if (diff < 3600) {
     // less 1 hour
-    return Math.ceil(diff / 60) + '分钟前'
+    return Math.ceil(diff / 60) + '分钟前';
   } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + '小时前'
+    return Math.ceil(diff / 3600) + '小时前';
   } else if (diff < 3600 * 24 * 2) {
-    return '1天前'
+    return '1天前';
   }
   if (option) {
-    return parseTime(time, option)
+    return parseTime(time, option);
   } else {
     return (
       d.getMonth() +
@@ -54,7 +61,7 @@ export function formatTime(time, option) {
       '时' +
       d.getMinutes() +
       '分'
-    )
+    );
   }
 }
 
@@ -63,18 +70,18 @@ export function formatTime(time, option) {
  * @returns {Object}
  */
 export function getQueryObject(url) {
-  url = url == null ? window.location.href : url
-  const search = url.substring(url.lastIndexOf('?') + 1)
-  const obj = {}
-  const reg = /([^?&=]+)=([^?&=]*)/g
+  url = url == null ? window.location.href : url;
+  const search = url.substring(url.lastIndexOf('?') + 1);
+  const obj = {};
+  const reg = /([^?&=]+)=([^?&=]*)/g;
   search.replace(reg, (rs, $1, $2) => {
-    const name = decodeURIComponent($1)
-    let val = decodeURIComponent($2)
-    val = String(val)
-    obj[name] = val
-    return rs
-  })
-  return obj
+    const name = decodeURIComponent($1);
+    let val = decodeURIComponent($2);
+    val = String(val);
+    obj[name] = val;
+    return rs;
+  });
+  return obj;
 }
 
 /**
@@ -83,14 +90,14 @@ export function getQueryObject(url) {
  */
 export function byteLength(str) {
   // returns the byte length of an utf8 string
-  let s = str.length
+  let s = str.length;
   for (var i = str.length - 1; i >= 0; i--) {
-    const code = str.charCodeAt(i)
-    if (code > 0x7f && code <= 0x7ff) s++
-    else if (code > 0x7ff && code <= 0xffff) s += 2
-    if (code >= 0xDC00 && code <= 0xDFFF) i--
+    const code = str.charCodeAt(i);
+    if (code > 0x7f && code <= 0x7ff) s++;
+    else if (code > 0x7ff && code <= 0xffff) s += 2;
+    if (code >= 0xdc00 && code <= 0xdfff) i--;
   }
-  return s
+  return s;
 }
 
 /**
@@ -98,13 +105,13 @@ export function byteLength(str) {
  * @returns {Array}
  */
 export function cleanArray(actual) {
-  const newArray = []
+  const newArray = [];
   for (let i = 0; i < actual.length; i++) {
     if (actual[i]) {
-      newArray.push(actual[i])
+      newArray.push(actual[i]);
     }
   }
-  return newArray
+  return newArray;
 }
 
 /**
@@ -112,13 +119,13 @@ export function cleanArray(actual) {
  * @returns {Array}
  */
 export function param(json) {
-  if (!json) return ''
+  if (!json) return '';
   return cleanArray(
-    Object.keys(json).map(key => {
-      if (json[key] === undefined) return ''
-      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+    Object.keys(json).map((key) => {
+      if (json[key] === undefined) return '';
+      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]);
     })
-  ).join('&')
+  ).join('&');
 }
 
 /**
@@ -126,21 +133,21 @@ export function param(json) {
  * @returns {Object}
  */
 export function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ');
   if (!search) {
-    return {}
+    return {};
   }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
+  const obj = {};
+  const searchArr = search.split('&');
+  searchArr.forEach((v) => {
+    const index = v.indexOf('=');
     if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
+      const name = v.substring(0, index);
+      const val = v.substring(index + 1, v.length);
+      obj[name] = val;
     }
-  })
-  return obj
+  });
+  return obj;
 }
 
 /**
@@ -148,9 +155,9 @@ export function param2Obj(url) {
  * @returns {string}
  */
 export function html2Text(val) {
-  const div = document.createElement('div')
-  div.innerHTML = val
-  return div.textContent || div.innerText
+  const div = document.createElement('div');
+  div.innerHTML = val;
+  return div.textContent || div.innerText;
 }
 
 /**
@@ -161,20 +168,20 @@ export function html2Text(val) {
  */
 export function objectMerge(target, source) {
   if (typeof target !== 'object') {
-    target = {}
+    target = {};
   }
   if (Array.isArray(source)) {
-    return source.slice()
+    return source.slice();
   }
-  Object.keys(source).forEach(property => {
-    const sourceProperty = source[property]
+  Object.keys(source).forEach((property) => {
+    const sourceProperty = source[property];
     if (typeof sourceProperty === 'object') {
-      target[property] = objectMerge(target[property], sourceProperty)
+      target[property] = objectMerge(target[property], sourceProperty);
     } else {
-      target[property] = sourceProperty
+      target[property] = sourceProperty;
     }
-  })
-  return target
+  });
+  return target;
 }
 
 /**
@@ -183,18 +190,18 @@ export function objectMerge(target, source) {
  */
 export function toggleClass(element, className) {
   if (!element || !className) {
-    return
+    return;
   }
-  let classString = element.className
-  const nameIndex = classString.indexOf(className)
+  let classString = element.className;
+  const nameIndex = classString.indexOf(className);
   if (nameIndex === -1) {
-    classString += '' + className
+    classString += '' + className;
   } else {
     classString =
       classString.substr(0, nameIndex) +
-      classString.substr(nameIndex + className.length)
+      classString.substr(nameIndex + className.length);
   }
-  element.className = classString
+  element.className = classString;
 }
 
 /**
@@ -203,9 +210,9 @@ export function toggleClass(element, className) {
  */
 export function getTime(type) {
   if (type === 'start') {
-    return new Date().getTime() - 3600 * 1000 * 24 * 90
+    return new Date().getTime() - 3600 * 1000 * 24 * 90;
   } else {
-    return new Date(new Date().toDateString())
+    return new Date(new Date().toDateString());
   }
 }
 
@@ -216,38 +223,38 @@ export function getTime(type) {
  * @return {*}
  */
 export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result
+  let timeout, args, context, timestamp, result;
 
-  const later = function() {
+  const later = function () {
     // 据上一次触发时间间隔
-    const last = +new Date() - timestamp
+    const last = +new Date() - timestamp;
 
     // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
     if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last)
+      timeout = setTimeout(later, wait - last);
     } else {
-      timeout = null
+      timeout = null;
       // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
       if (!immediate) {
-        result = func.apply(context, args)
-        if (!timeout) context = args = null
+        result = func.apply(context, args);
+        if (!timeout) context = args = null;
       }
     }
-  }
+  };
 
-  return function(...args) {
-    context = this
-    timestamp = +new Date()
-    const callNow = immediate && !timeout
+  return function (...args) {
+    context = this;
+    timestamp = +new Date();
+    const callNow = immediate && !timeout;
     // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait)
+    if (!timeout) timeout = setTimeout(later, wait);
     if (callNow) {
-      result = func.apply(context, args)
-      context = args = null
+      result = func.apply(context, args);
+      context = args = null;
     }
 
-    return result
-  }
+    return result;
+  };
 }
 
 /**
@@ -259,17 +266,17 @@ export function debounce(func, wait, immediate) {
  */
 export function deepClone(source) {
   if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
+    throw new Error('error arguments', 'deepClone');
   }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
+  const targetObj = source.constructor === Array ? [] : {};
+  Object.keys(source).forEach((keys) => {
     if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
+      targetObj[keys] = deepClone(source[keys]);
     } else {
-      targetObj[keys] = source[keys]
+      targetObj[keys] = source[keys];
     }
-  })
-  return targetObj
+  });
+  return targetObj;
 }
 
 /**
@@ -277,16 +284,16 @@ export function deepClone(source) {
  * @returns {Array}
  */
 export function uniqueArr(arr) {
-  return Array.from(new Set(arr))
+  return Array.from(new Set(arr));
 }
 
 /**
  * @returns {string}
  */
 export function createUniqueString() {
-  const timestamp = +new Date() + ''
-  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
-  return (+(randomNum + timestamp)).toString(32)
+  const timestamp = +new Date() + '';
+  const randomNum = parseInt((1 + Math.random()) * 65536) + '';
+  return (+(randomNum + timestamp)).toString(32);
 }
 
 /**
@@ -296,7 +303,7 @@ export function createUniqueString() {
  * @returns {boolean}
  */
 export function hasClass(ele, cls) {
-  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'));
 }
 
 /**
@@ -305,7 +312,7 @@ export function hasClass(ele, cls) {
  * @param {string} cls
  */
 export function addClass(ele, cls) {
-  if (!hasClass(ele, cls)) ele.className += ' ' + cls
+  if (!hasClass(ele, cls)) ele.className += ' ' + cls;
 }
 
 /**
@@ -315,23 +322,21 @@ export function addClass(ele, cls) {
  */
 export function removeClass(ele, cls) {
   if (hasClass(ele, cls)) {
-    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
-    ele.className = ele.className.replace(reg, ' ')
+    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)');
+    ele.className = ele.className.replace(reg, ' ');
   }
 }
 
 export function makeMap(str, expectsLowerCase) {
-  const map = Object.create(null)
-  const list = str.split(',')
+  const map = Object.create(null);
+  const list = str.split(',');
   for (let i = 0; i < list.length; i++) {
-    map[list[i]] = true
+    map[list[i]] = true;
   }
-  return expectsLowerCase
-    ? val => map[val.toLowerCase()]
-    : val => map[val]
+  return expectsLowerCase ? (val) => map[val.toLowerCase()] : (val) => map[val];
 }
- 
-export const exportDefault = 'export default '
+
+export const exportDefault = 'export default ';
 
 export const beautifierConf = {
   html: {
@@ -372,19 +377,78 @@ export const beautifierConf = {
     e4x: true,
     indent_empty_lines: true
   }
-}
+};
 
 // 首字母大小
 export function titleCase(str) {
-  return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
+  return str.replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 }
 
 // 下划转驼峰
 export function camelCase(str) {
-  return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+  return str.replace(/_[a-z]/g, (str1) => str1.substr(-1).toUpperCase());
 }
 
 export function isNumberStr(str) {
-  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
+  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str);
 }
- 
+
+export const isValidIDCard = (idCard) => {
+  //15位和18位身份证号码的正则表达式
+  var regIdCard =
+    /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
+
+  //如果通过该验证，说明身份证格式正确，但准确性还需计算
+  if (!regIdCard.test(idCard)) {
+    return false;
+  }
+  if (idCard.length == 18) {
+    var idCardWi = new Array(
+      7,
+      9,
+      10,
+      5,
+      8,
+      4,
+      2,
+      1,
+      6,
+      3,
+      7,
+      9,
+      10,
+      5,
+      8,
+      4,
+      2
+    ); //将前17位加权因子保存在数组里
+    var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3, 2); //这是除以11后，可能产生的11位余数、验证码，也保存成数组
+    var idCardWiSum = 0; //用来保存前17位各自乖以加权因子后的总和
+    for (var i = 0; i < 17; i++) {
+      idCardWiSum += idCard.substring(i, i + 1) * idCardWi[i];
+    }
+
+    var idCardMod = idCardWiSum % 11; //计算出校验码所在数组的位置
+    var idCardLast = idCard.substring(17); //得到最后一位身份证号码
+
+    //如果等于2，则说明校验码是10，身份证号码最后一位应该是X
+    if (idCardMod == 2) {
+      if (idCardLast == 'X' || idCardLast == 'x') {
+        return true;
+      } else {
+        return false;
+      }
+    } else {
+      //用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
+      if (idCardLast == idCardY[idCardMod]) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+  }
+};
+// 验证手机号
+export const checkPhone = (phone) => {
+  return /^1\d{10}$/.test(phone);
+};

src/views/dataReport/intakeWaterAnalysis.vue

@@ -158,6 +158,7 @@ export default {
       );
     },
     setYear() {
+      this.options = []
       let date = new Date
       let currentYear = date.getFullYear()
       this.currentYear = currentYear

src/views/gisShow/index.vue

@@ -94,7 +94,7 @@ export default {
         tmnstatusRunstatus: this.tmnstatusRunstatus
       })
       this.positions = res?.data
-      this.center = [res?.data[0].tmnLongitude, res?.data[0].tmnLatitude]
+      this.center = [res?.data[0]?.tmnLongitude, res?.data[0]?.tmnLatitude]
     },
     searchMap() {
       let that = this;

src/views/infrastructure/components/recompose.vue

@@ -64,12 +64,7 @@
       </el-row>
       <el-row>
         <el-form-item label="">
-          <span>（上年实际用水量：65546m³）</span>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-form-item label="">
-          <span>（首次新增时0、第二年新增时默认上一年）</span>
+          <span>（上年实际用水量：{{ baseForm.lastYearUseWater }}m³）</span>
         </el-form-item>
       </el-row>
       <el-row>
@@ -128,16 +123,17 @@ export default {
       baseForm: {
         area: '',
         ratedWater: '',
+        lastYearUseWater: '0'
       },
       averageWater: 0,
       infoData: {},
       hasFetched: false,
       rules: {
         area: [
-          { required: true, message: '请选输入面积', trigger: 'blur' }
+          { required: true, message: '请输入面积', trigger: 'blur' }
         ],
         ratedWater: [
-          { required: true, message: '请选输入额定水权', trigger: 'blur' }
+          { required: true, message: '请输入额定水权', trigger: 'blur' }
         ]
       }
     };
@@ -184,6 +180,7 @@ export default {
         area: '',
         ratedWater: '',
       }
+      this.averageWater = 0
     },
     async editRecompose() { 
       const { waterrightId } = this.editRow

src/views/monitoringMamage/index.vue

@@ -312,7 +312,7 @@ export default {
     },
     
     setCurrentData(areaId) {
-      this.currentClickId = areaId
+      this.areaId = areaId
       this.$refs.tableRef.refresh(false);
     },
     realTime() {

src/views/peasantHouseholdManage/components/IrrigationRecord.vue

@@ -8,15 +8,17 @@
     width="1400px"
   >
   <div style="margin-bottom: 20px">
-    <el-date-picker
-      v-model="dateValue"
-      clearable
-      value-format="yyyy-MM-dd HH:MM:SS"
-      type="daterange"
-      range-separator="至"
-      start-placeholder="开始日期"
-      end-placeholder="结束日期">
-    </el-date-picker>
+     <el-date-picker
+        v-model="dateValue"
+        clearable
+        type="daterange"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        :default-time="['00:00:00', '23:59:59']"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      >
+      </el-date-picker>
     <el-button
       type="primary"
       size="small"
@@ -150,7 +152,7 @@ export default {
       this.$refs.tableRef && this.$refs.tableRef.refresh(true);
     },
     getTableData() {
-      const [startTime,endTime] = this.dateValue
+      const [startTime, endTime] = this.dateValue
       return getCardusercdList({
         farmerId: this.farmerId,
         startTime,

src/views/peasantHouseholdManage/components/addedFarmers.vue

@@ -34,16 +34,16 @@
           <el-col>
             <el-row class="area">
               <el-col :span="5">
-                <label>总面积：</label>65446亩
+                <label>总面积：</label>{{ areaAll }}亩
               </el-col>
               <el-col :span="5">
-                <label>总水权：</label>65446m³
+                <label>总水权：</label>{{ waterRightAll }}m³
               </el-col>
               <el-col :span="7" style="width:27%">
-                <label>亩产水权：</label>65446亩/m³
+                <label>亩产水权：</label>{{ yieldPer }}亩/m³
               </el-col>
               <el-col :span="6">
-                <label>剩余水权：</label>65446m³
+                <label>剩余水权：</label>{{ residualWaterRight }}m³
               </el-col>
             </el-row>
           </el-col>
@@ -73,6 +73,7 @@
                       v-model="baseForm.farmerIdcard"
                       filterable
                       style="width: 100%"
+                      maxlength="18"
                       placeholder="请输入身份证号"
                     >
                     </el-input>
@@ -90,8 +91,10 @@
                   <el-col>
                     <el-input
                       v-model="baseForm.farmerPhone"
+                      type="number"
                       filterable
                       style="width: 100%"
+                      maxlength="11"
                       placeholder="请输入联系电话"
                     >
                     </el-input>
@@ -105,6 +108,7 @@
                   <el-col>
                     <el-input
                       v-model="baseForm.farmerWramount"
+                      type="number"
                       filterable
                       style="width: 100%"
                       placeholder="请输入水权"
@@ -124,6 +128,7 @@
                   <el-col style="position:relative">
                     <el-input
                       v-model="baseForm.farmerAreasize"
+                      type="number"
                       filterable
                       style="width: 90%"
                       placeholder="请输入土地面积"
@@ -155,6 +160,7 @@
 </template>
 
 <script>
+import { isValidIDCard, checkPhone } from '@/utils/index.js'
 import { assign } from 'lodash-es';
 import SelectTree from '@/components/SelectTree';
 import { addFarmer,editFarmer } from '@/api/farmer/list.js'
@@ -189,6 +195,10 @@ export default {
       baseForm: this.editFarmerData,
       hasFetched: false,
       cusareaName: '',
+      areaAll: '0',
+      waterRightAll: '0',
+      yieldPer: '0',
+      residualWaterRight:'0',
       rules: {
         areaId: [
           { required: true, message: '请选择所属区域', trigger: 'blur' }
@@ -197,16 +207,35 @@ export default {
           { required: true, message: '请输入农户姓名', trigger: 'blur' }
         ],
         farmerIdcard: [
-          { required: true, message: '请输入农户身份证号', trigger: 'blur' }
+          {
+            required: true, validator: (rule, value, callback) => { 
+              if (!value) callback(new Error('请输入农户身份证号'));
+              const vaild = isValidIDCard(value)
+              if (vaild) {
+                callback()
+              } else { 
+                callback(new Error('请正确输入农户身份证号'));
+              }
+            
+          }, trigger: 'blur' }
         ],
         farmerPhone: [
-          { required: true, message: '请输入联系电话', trigger: 'blur' }
+          { required: true, validator: (rule, value, callback) => {
+              if (!value) callback(new Error('请输入联系电话'));
+              const vaild = checkPhone(value)
+              if (vaild) {
+                callback()
+              } else {
+                callback(new Error('请正确输入联系电话'));
+              }
+
+            },  trigger: 'blur' }
         ],
         farmerAreasize: [
-          { required: true, message: '请输入水权', trigger: 'blur' }
+          { required: true, message: '请输入土地面积', trigger: 'blur' }
         ],
         farmerWramount: [
-          { required: true, message: '请输入土地面积', trigger: 'blur' }
+          { required: true, message: '请输入水权', trigger: 'blur' }
         ]
       }
     };
@@ -229,11 +258,21 @@ export default {
         this.cusareaName = val.cusareaName
       },
       deep: true
-    }
+    },
+    treeData: {
+      handler(val) {
+        console.log(val,'valjkvksaljvksjskvc')
+       },
+      deep: true
+     }
   },
   methods: {
     handlerClick(value) {
-      this.baseForm.areaId = value?.cusareaId
+      this.baseForm.areaId = value?.areaId
+      this.areaAll = value?.waterrightAreasize
+      this.waterRightAll = value?.waterrightAmount
+      this.yieldPer = value?.waterrightAmount == 0 ? 0 : (value?.waterrightAreasize) / (value?.waterrightAmount)
+      this.residualWaterRight = value?.amountResidue ?? 0
     },
     resetForm() {
       this.dialogVisible = false;
@@ -257,7 +296,7 @@ export default {
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
-        this.handlerAddFarmer()
+        valid && this.handlerAddFarmer()
       })
     },
     handleClose() {

src/views/peasantHouseholdManage/components/farmerManagement.vue

@@ -89,7 +89,7 @@
           </el-col>
           <el-col :span="18">
             <div class="content">
-              <span>{{detailsData.farmerAreasize || 0}}m³</span>
+              <span>{{detailsData.farmerAreasize || 0}}亩</span>
             </div>
           </el-col>
         </el-row>
@@ -123,7 +123,7 @@
           </el-col>
           <el-col :span="18">
             <div class="content_last">
-              <span>25</span>
+              <span>{{ detailsData.farmerWrbalance }}</span>
             </div>
           </el-col>
         </el-row>
@@ -133,13 +133,13 @@
           <el-col :span="6">
             <div class="label_last no_left_border">
               <span>
-                剩余水权
+                
               </span>
             </div>
           </el-col>
           <el-col :span="18">
             <div class="content_last">
-              <span>{{detailsData.farmerWrbalance}}</span>
+              <span></span>
             </div>
           </el-col>
         </el-row>

src/views/peasantHouseholdManage/index.vue

@@ -117,7 +117,7 @@
     </el-col>
   <added-farmers
     :visible.sync="associationManageShow"
-    :treeData="treeData"
+    :treeData="treeDatas"
     :editFarmerData="editFarmerData"
     :isEdit="isEdit"
     @refresh="handleSearch"
@@ -137,6 +137,7 @@
 import { getToken } from "@/utils/auth";
 import { Message } from 'element-ui'
 import { getTree } from '@/api/tree.js'
+import { getWaterrightList } from '@/api/waterright/index.js'
 import { getFarmerList,deleteFarmer,getFarmerDetail } from '@/api/farmer/list.js'
 import BTable from '@/components/Table/index.vue';
 import DataReportLeft from '@/components/DataReportLeft/index.vue'
@@ -158,6 +159,7 @@ export default {
       farmerName: '',
       detailsData: {},
       treeData: [],
+      treeDatas: [],
       currentClick:{},
       irrigationDetail: {},
       isEdit: false,
@@ -219,7 +221,7 @@ export default {
         Message.error(res?.msg)
         return
       } else { 
-        Message.error('导入成功')
+        Message.success('导入成功')
       }
     },
     handleUploadError() {
@@ -251,6 +253,14 @@ export default {
       })
       this.detailsData = res?.data
     },
+    async getWaterrighTreetList() {
+      const date = new Date()
+      const waterrightYear = date.getFullYear()
+      const res = await getWaterrightList({
+        waterrightYear
+      })
+      this.treeDatas = res?.data ?? []
+    },
     async loadData(parameter) {
       if(!this.currentClickId ) {
         const treeList = this.$store.state.tree.treeList
@@ -261,6 +271,7 @@ export default {
           res = await getTree()
           this.$store.dispatch('tree/setTree', res)
         }
+        this.getWaterrighTreetList()
         this.treeData = res?.data
         this.currentClick = res?.data[0]
         this.currentClickId = this.currentClick?.cusareaId
@@ -302,7 +313,7 @@ export default {
           farmerIds: row.farmerId
         }).then(() => {
           Message({ message: "删除成功", type: 'success' });
-          this.refresh()
+          this.handleSearch()
         })
       })
     }

src/views/waterCardManage/components/dataDetail.vue

@@ -31,7 +31,9 @@
     <el-date-picker
       v-model="value1"
       type="daterange"
+      value-format="yyyy-MM-dd HH:mm:ss"
       range-separator="至"
+      :default-time="['00:00:00', '23:59:59']"
       start-placeholder="开始日期"
       end-placeholder="结束日期">
     </el-date-picker>

src/views/waterCardManage/dataDetail.vue

@@ -33,7 +33,8 @@
         <el-date-picker
           v-model="dateValue"
           clearable
-          value-format="yyyy-MM-dd HH:MM:SS"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['00:00:00', '23:59:59']"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"

src/views/waterCardManage/index.vue

@@ -262,7 +262,7 @@ export default {
   methods: {
     // 注销 cardStatus = 2,解挂 cardStatus = 0,挂失 cardStatus = 1
     async editCardHandler(row,cardStatus) {
-      if(cardStatus == '2')return
+      // if(cardStatus == '2')return
       const { farmerId,cardNo,cardAmount,cardId } = row
       await editCard({
         farmerId,

src/views/waterSubsidy/components/newPolicy.vue

@@ -21,6 +21,7 @@
         <el-form-item label="标题：" prop="subsidypolicyTitle">
           <el-input
             placeholder="请输入"
+            maxlength="50"
             v-model="baseForm.subsidypolicyTitle">
           </el-input>
         </el-form-item>
@@ -28,6 +29,7 @@
       <el-row>
         <el-form-item label="图片：" prop="src">
            <el-upload
+             ref="uploader"
              class="avatar-uploader"
              :action="uploadUrl"
              :show-file-list="false"
@@ -122,10 +124,10 @@ export default {
           { required: true, message: '请输入您的标题', trigger: 'blur' }
         ],
         src: [
-          { required: true, message: '请选择您的图片', trigger: 'blur' }
+          { required: true, message: '请选择您的图片', trigger: 'change' }
         ],
         subsidypolicyContent: [
-          { required: true, message: '请输入内容', trigger: 'blur' }
+          { required: true, message: '请输入内容', trigger: 'change' }
         ]
       }
     };
@@ -150,7 +152,16 @@ export default {
         this.baseForm = { ...this.editRow }
       },
       deep: true
-     }
+    },
+    baseForm: {
+      handler(val) {
+        const { src, subsidypolicyContent } = val
+        const uploader = this.$refs.uploader
+        const errorUploadText = uploader 
+        console.log(errorUploadText,'uploaderuploaderuploader')
+      },
+      deep: true
+    }
   },
   methods: {
     onCreated(editor) {