bug修复，正则补充

src/views/planOutage/dialogComponent.vue

@@ -264,6 +264,12 @@ export default defineComponent({
         ],
         contacts: [
           { required: true, message: '请输入联系人', trigger: 'blur' },
+           {
+            min: 1,
+            max: 10,
+            message: '长度在 1 到 10 个字符',
+            trigger: 'blur',
+          },
         ],
         planType: [
           { required: true, message: '请选择计划类型', trigger: 'blur' },

src/views/siteManage/basicInfo/index.vue

@@ -659,6 +659,7 @@ export default defineComponent({
         ],
         siteType: [
           { required: true, message: '请输入站点类型', trigger: 'blur' },
+          { pattern: /^[1-9][\d]*$/ , message: '请输入正整数' }
         ],
         userCompany: [
           { required: true, message: '请输入用户公司', trigger: 'blur' },
@@ -718,7 +719,8 @@ export default defineComponent({
             trigger: 'blur',
           },],
         demolitionStandardCoal1: [
-          { required: true, message: '请输入折煤标准', trigger: 'blur' },
+          { required: true, message: '请输入折标准煤', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,7})?$/ , message: '请输入数字，可保留7位小数' }
         ],
         routeId: [
           { required: true, message: '选择所属线路', trigger: 'change' },

src/views/siteManage/camera/dialogComponent.vue

@@ -23,8 +23,8 @@
         <el-input-number
           v-model="form.floor"
           controls-position="right"
-          :min="0"
-          :max="255"
+          :min="-20"
+          :max="100"
         ></el-input-number>
       </el-form-item>
 
@@ -96,7 +96,7 @@
 
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, watchEffect } from 'vue'
+import { defineComponent, ref, watchEffect,watch } from 'vue'
 import * as api from '@/api/siteManage/camera.js'
 import { ElMessage } from 'element-plus'
 
@@ -148,6 +148,7 @@ export default defineComponent({
         callback()
       }
     }
+    
 
     // 保存-修改操作
     const submitForm = () => {
@@ -187,6 +188,15 @@ export default defineComponent({
       })
     }
 
+     watch(
+      () => form.value.floor,
+      (newVal,oldVal) => {
+        newVal,oldVal
+        
+      }
+    )
+
+
     return {
       store,
       // ...toRefs(state),
@@ -198,12 +208,20 @@ export default defineComponent({
       form,
       open,
       submitForm,
+      // InputDiff,
       rules: {
         deviceName: [
           { required: true, message: '请输入设备名称', trigger: 'blur' },
+           {
+            min: 1,
+            max: 25,
+            message: '长度在 1 到 25 个字符',
+            trigger: 'blur',
+          },
         ],
         deviceCode: [
           { required: true, message: '请输入设备编号', trigger: 'blur' },
+         
         ],
         floor: [{ required: true, message: '请选择所属楼层', trigger: 'blur' }],
         siteId: [
@@ -219,7 +237,17 @@ export default defineComponent({
         deviceType: [
           { required: true, message: '请选择设备类型', trigger: 'change' },
         ],
-        sim: [{ required: true, message: '请输入sim卡号', trigger: 'blur' }],
+        sim: [
+          { required: false, message: '请输入sim卡号', trigger: 'blur' } , //
+            // { pattern:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{0,25}$/, message: '请输入英文和数字组合的卡号,并且长度小于25!' },
+             { pattern:/^[A-Za-z0-9]+$/, message: '请输入含有英文或数字的卡号!' },
+            {
+            min: 0,
+            max: 25,
+            message: '长度在 0 到 25 个字符',
+            trigger: 'blur',
+          },
+          ],   
       },
       deviceType: ref([
         {

src/views/siteManage/powerScore/index.vue

@@ -202,25 +202,32 @@ export default defineComponent({
       rules: {
         powerFactorOne: [
           { required: true, message: '请输入功率因数', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         voltageQualified: [
           { required: true, message: '请输入电压合格率', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         loadRate: [
           { required: true, message: '请输入负载率', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
 
         currentBalance: [
           { required: true, message: '请输入电流平衡度', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         voltageBalance: [
           { required: true, message: '请输入电压平衡度', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         thdu: [
           { required: true, message: '请输入谐波畸变率', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         powerFactorTwo: [
           { required: true, message: '请输入功率因数', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
       },
       submitForm,

src/views/siteManage/variableList/dialogComponent.vue

@@ -288,9 +288,12 @@ export default defineComponent({
         ],
         coefficient: [
           { required: true, message: '请输入系数', trigger: 'blur' },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         saveCycle: [
           { required: true, message: '请输入存盘周期', trigger: 'blur' },
+          { pattern: /^[1-9][\d]*$/ , message: '请输入正确的分钟数' }
+          // { pattern: /^(?:[1-9]?\d|60)$/ , message: '请输入正确的分钟数' }
         ],
         dataArea: [
           { required: true, message: '请选中状态', trigger: 'blur' },

src/views/siteManage/watchDog/dialogComponent.vue

@@ -74,7 +74,7 @@
         </el-form-item>
         <el-form-item label="电流负载率门限：" prop="currentLoadRate">
           <el-input v-model="form.currentLoadRate"></el-input>
-          <div class="remarksTxt">(0-100之间的数字)</div>
+          <div class="remarksTxt">(0-100之间的整数)</div>
         </el-form-item>
         <el-form-item label="设备能力：" prop="qualityAnalysis">
           <el-checkbox v-model="form.qualityAnalysis">电能质量分析</el-checkbox>
@@ -227,6 +227,12 @@ export default defineComponent({
       rules: {
         monitorDeviceName: [
           { required: true, message: "请输入设备名称", trigger: "blur" },
+           {
+            min: 1,
+            max: 25,
+            message: '长度在 1 到 25 个字符',
+            trigger: 'blur',
+          },
         
         ],
         monitorDeviceCode: [
@@ -245,12 +251,20 @@ export default defineComponent({
         ],
         ratedVoltage: [
           { required: true, message: "请输入额定电压", trigger: "change" },
+          { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         ratedCurrent: [
           { required: true, message: "请输入额定电流", trigger: "blur" },
+           { pattern:/^\d+(\.\d{1,2})?$/ , message: '请输入数字，可保留两位小数' }
         ],
         currentLoadRate: [
           { required: true, message: "请输入电流负载率门限", trigger: "blur" },
+          { pattern: /^(?:[1-9]?\d|100)$/ , message: '请输入0-100的整数' }
+  
+          //  { pattern: /^(?:100|\d{1,2})(?:\.\d{1,2})?$/ , message: '请输入0-100的数字，可保留两位小数' }  //aa 100.99也ok??
+            // { pattern: /^(?:100|\d{1,2})?$/ , message: '请输入0-100的整数!' }
+          // { pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入正确格式,可保留两位小数' }
+            
         ],
       },
     }