Explorar o código

bug修复完善优化

ming %!s(int64=3) %!d(string=hai) anos
pai
achega
44b377c0cc
Modificáronse 2 ficheiros con 67 adicións e 11 borrados
  1. 33 0
      src/utils/index.js
  2. 34 11
      src/views/siteManage/basicInfo/index.vue

+ 33 - 0
src/utils/index.js

@@ -306,4 +306,37 @@ export function validatorPhone(rule, value, callback) {
     } else {
         callback()
     }
+}
+
+/**
+ 判断是否为数字
+ */
+export function isNumber(rule, value, callback) {
+    if (!/^[0-9]*$/.test(value)) {
+        callback(new Error('输入数字'))
+    } else {
+        callback()
+    }
+}
+
+/**
+ 判断纬度 -90.0~+90.0(整数部分为0~90,必须输入1到5位小数)
+ */
+export function isLatitude(rule, value, callback) {
+    if (!/^[-|+]?([0-8]?\d{1}\.\d{1,6}|90\.0{1,5})$/.test(value)) {
+        callback(new Error('输入纬度'))
+    } else {
+        callback()
+    }
+}
+
+/**
+ 判断经度 -180.0~+180.0(整数部分为0~180,必须输入1到5位小数)
+ */
+export function isLongitude(rule, value, callback) {
+    if (!/^[-|+]?(0?\d{1,2}\.\d{1,5}|1[0-7]?\d{1}\.\d{1,6}|180\.0{1,5})$/.test(value)) {
+        callback(new Error('输入经度'))
+    } else {
+        callback()
+    }
 }

+ 34 - 11
src/views/siteManage/basicInfo/index.vue

@@ -236,7 +236,8 @@ import * as api from '@/api/siteManage/basicInfo'
 import { ElMessage } from 'element-plus'
 
 import { useStore } from 'vuex'
-import { parseTime, validatorPhone } from '@/utils'
+import { parseTime, validatorPhone,isNumber,isLatitude,isLongitude} from '@/utils'
+// import { isNumber } from '@/utils/validate.js'
 
 export default defineComponent({
   name: 'BasicInfo',
@@ -453,6 +454,7 @@ export default defineComponent({
 
     //表单提交
     function submitForm() {
+    
       ruleForm.value.sitePictureOne = newArray.value[0] ? newArray.value[0] : ''
       ruleForm.value.sitePictureTwo = newArray.value[1] ? newArray.value[1] : ''
       ruleForm.value.sitePictureThree = newArray.value[2]
@@ -534,8 +536,8 @@ export default defineComponent({
               store.state.basicInfoSiteName = '' //新增成功后存储的站点名称设为空
 
               setTimeout(() => {
-                isDisable.value = false //点击一次时隔秒后才能再次点击
-              }, 2000)
+                isDisable.value = false //点击一次时隔2秒后才能再次点击
+              }, 5000)
 
               formStatus.value = '修改'
               context.emit('func',params.id)
@@ -554,6 +556,7 @@ export default defineComponent({
     watch(
       () => props.siteId,
       (newVal) => {
+        isDisable.value=false
        
         newVal
         if (props.activeName == 'first') {
@@ -675,14 +678,18 @@ export default defineComponent({
         installedCapacity: [
           { required: true, message: '请输入装机容量', trigger: 'blur' },
           {
-            min: 1,
-            max: 20,
-            message: '长度在 1 到 20 个字符',
+            validator: isNumber,
+            message: '请输入数字',
             trigger: 'blur',
           },
         ],
         voltageLevel: [
           { required: true, message: '请输入电压等级', trigger: 'blur' },
+         {
+            validator: isNumber,
+            message: '请输入数字',
+            trigger: 'blur',
+          },
         ],
         siteAddress: [
           { required: true, message: '请输入站点地址', trigger: 'blur' },
@@ -696,8 +703,20 @@ export default defineComponent({
         stationAreaId: [
           { required: true, message: '请选择所属台区', trigger: 'change' },
         ],
-        longitude: [{ required: true, message: '请输入经度', trigger: 'blur' }],
-        latitude: [{ required: true, message: '请输入纬度', trigger: 'blur' }],
+        longitude: [
+          { required: true, message: '请输入经度', trigger: 'blur' },
+          {
+            validator: isLongitude,
+            message: '请输入正确经度',
+            trigger: 'blur',
+          },
+          ],
+        latitude: [{ required: true, message: '请输入纬度', trigger: 'blur' },
+         {
+            validator: isLatitude,
+            message: '请输入正确维度',
+            trigger: 'blur',
+          },],
         demolitionStandardCoal1: [
           { required: true, message: '请输入折煤标准', trigger: 'blur' },
         ],
@@ -706,6 +725,11 @@ export default defineComponent({
         ],
         rheologicalChange: [
           { required: true, message: '请输入流变变比', trigger: 'blur' },
+         {
+            validator: isNumber,
+            message: '请输入数字',
+            trigger: 'blur',
+          },
         ],
 
         userName: [
@@ -741,9 +765,8 @@ export default defineComponent({
         sparePhone: [
           { required: true, message: '请输入联系方式2', trigger: 'blur' },
           {
-            min: 1,
-            max: 11,
-            message: '长度在 1 到 11 个字符',
+            validator: validatorPhone,
+            message: '输入的电话号码不正确',
             trigger: 'blur',
           },
         ],