正则

src/app/main/module-detail/module-detail.component.ts

@@ -84,7 +84,7 @@ export class ModuleDetailComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };
@@ -100,7 +100,7 @@ export class ModuleDetailComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };

src/app/main/sensor-topic-way/sensor-topic-way.component.ts

@@ -75,7 +75,7 @@ export class SensorTopicWayComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };
@@ -91,7 +91,7 @@ export class SensorTopicWayComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };

src/app/main/topic-module-way/topic-module-way.component.ts

@@ -84,7 +84,7 @@ export class TopicModuleWayComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };
@@ -100,7 +100,7 @@ export class TopicModuleWayComponent implements OnInit {
         alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
         lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
       field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
-      float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
+      canFloat2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
       num: ['alarmInterval'],
       eng: ['name', 'alias']
     };

src/app/service/check.ts

@@ -57,6 +57,13 @@ export class CheckService {
       }
     }
 
+    if (req.canFloat2) {
+      req.canFloat2.filter((item) => this.checkCanFloat2(fieldStr, data, item));
+      if (this.flag) {
+        return false;
+      }
+    }
+
     if (req.eng) {
       req.eng.filter((item) => this.checkEng(fieldStr, data, item));
       if (this.flag) {
@@ -68,7 +75,9 @@ export class CheckService {
   }
 
   private checkField(fieldStr, data, field) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[field] === '' || isUndefined(data[field]) || data[field] === null) && fieldStr.indexOf('-' + field + '-') >= -1) {
       this.message.warning(this.translate.instant(this.trans[field]) + '为必填字段, 请检查');
       this.flag = 1;
@@ -79,7 +88,9 @@ export class CheckService {
   }
 
   private checkTime(fieldStr, data, time) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[time] === '' || isUndefined(data[time]) || data[time] === null) && fieldStr.indexOf('-' + time + '-') <= -1) {
       return true;
     }
@@ -93,7 +104,9 @@ export class CheckService {
   }
 
   private checkTel(fieldStr, data, tel) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[tel] === '' || isUndefined(data[tel]) || data[tel] === null) && fieldStr.indexOf('-' + tel + '-') <= -1) {
       return true;
     }
@@ -108,7 +121,9 @@ export class CheckService {
   }
 
   private checkMoney(fieldStr, data, money) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[money] === '' || isUndefined(data[money]) || data[money] === null) && fieldStr.indexOf('-' + money + '-') <= -1) {
       return true;
     }
@@ -122,7 +137,9 @@ export class CheckService {
   }
 
   private checkNum(fieldStr, data, num) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[num] === '' || isUndefined(data[num]) || data[num] === null) && fieldStr.indexOf('-' + num + '-') <= -1) {
       return true;
     }
@@ -137,7 +154,9 @@ export class CheckService {
   }
 
   private checkFloat2(fieldStr, data, float2) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[float2] === '' || isUndefined(data[float2]) || data[float2] === null) && fieldStr.indexOf('-' + float2 + '-') <= -1) {
       return true;
     }
@@ -150,8 +169,29 @@ export class CheckService {
     }
   }
 
+
+  private checkCanFloat2(fieldStr, data, canFloat2) {
+    if (this.flag === 1) {
+      return false;
+    }
+    if ((data[canFloat2] === '' || isUndefined(data[canFloat2]) || data[canFloat2] === null) &&
+      fieldStr.indexOf('-' + canFloat2 + '-') <= -1) {
+      return true;
+    }
+    const reg = new RegExp('^[0-9]*([.][0-9]{0,2})?$');
+    if (reg.test(data[canFloat2])) {
+      return true;
+    } else {
+      this.message.warning(this.translate.instant(this.trans[canFloat2]) + '格式填写错误, 应填入两位小数');
+      this.flag = 1;
+      return false;
+    }
+  }
+
   private checkEng(fieldStr, data, eng) {
-    if (this.flag === 1) { return false; }
+    if (this.flag === 1) {
+      return false;
+    }
     if ((data[eng] === '' || isUndefined(data[eng]) || data[eng] === null) && fieldStr.indexOf('-' + eng + '-') <= -1) {
       return true;
     }

src/environments/environment.ts

@@ -5,10 +5,10 @@
 export const environment = {
   production: false,
   test: false,
-  baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
+  // baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
   // baseUrl: 'http://172.16.1.53:8092', // cy
   // baseUrl: 'http://172.16.1.52:8094', // zz
-  // baseUrl: 'http://172.16.1.13:8094', // 测试
+  baseUrl: 'http://172.16.1.13:8094', // 测试
 };
 
 /*