Procházet zdrojové kódy

视频诊断周期正则式

humingshi-7@163.com před 11 měsíci
rodič
revize
6e8cb6eb34

+ 7 - 5
src/views/iot/diagnoseMission/dialog.addMission.vue

@@ -119,7 +119,7 @@ export default {
         name: null,
         beginTime: "00:00:00",
         endTime: "23:59:59",
-        cycle: "",
+        cycle: "0.1",
         enabled: 1,
       };
     },
@@ -173,11 +173,13 @@ export default {
         return callback(new Error('请输入诊断周期'));
       }
       const port = parseInt(value, 10);
-      if (isNaN(port)) {
+
+      const ipRegex = /^\d+(\.\d+)?$/;
+      if (!ipRegex.test(value)) {
         callback(new Error('诊断周期必须是一个数字'));
-      } else if (port < 1 || port > 65535) {
-        callback(new Error('诊断周期必须在1到65535之间'));
-      } else {
+      }else if (value < 0 || value > 65535) {
+        callback(new Error('诊断周期在0到65535之间'));
+      }else {
         callback();
       }
     },

+ 9 - 4
src/views/iot/diagnoseThreshold/dialog.addThreshold.vue

@@ -76,11 +76,11 @@ export default {
         thresholdName: [{required: true, message: "请输入阈值名称", trigger: 'blur'}],
         timeRange: [{required: true, message: "请选择有效时段", trigger: 'blur'}],
         nosignal: [
-          {required: true, message: '请输入信号丢失', trigger: 'blur'},
+          {required: true, message: '请输入信号丢失,格式为:@value==255', trigger: 'blur'},
           {validator: this.validatePort, trigger: 'blur'}
         ],
         covered: [
-          {required: true, message: '请输入遮挡', trigger: 'blur'},
+          {required: true, message: '请输入遮挡,格式为:@value>=255', trigger: 'blur'},
           {validator: this.validatePort, trigger: 'blur'}
         ],
       },
@@ -146,9 +146,14 @@ export default {
     },
     validatePort(rule, value, callback) {
       if (!value) {
-        return callback(new Error('请输入诊断周期'));
+        return callback(new Error('请输入'));
+      }
+      const ipRegex = /^@value[<>=!]{1,1}[=]{0,1}\d+$/;
+      if (!ipRegex.test(value)) {
+        callback(new Error('格式错误,格式为:@value>=255'));
+      } else {
+        callback();
       }
-      callback();
     },
 
   },