Skip to content

W
witiumCloud2
Commit 77d35442 authored by van.chen's avatar van.chen
Browse files
Options

更改报警的值类型

parent fec31078
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
src/app/main/module-detail/module-detail.component.ts
View file @ 77d35442
...@@ -84,7 +84,8 @@ export class ModuleDetailComponent implements OnInit { ...@@ -84,7 +84,8 @@ export class ModuleDetailComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
...@@ -99,7 +100,8 @@ export class ModuleDetailComponent implements OnInit { ...@@ -99,7 +100,8 @@ export class ModuleDetailComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['probesModelNo', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
......
src/app/main/sensor-topic-way/sensor-topic-way.component.ts
View file @ 77d35442
...@@ -75,7 +75,8 @@ export class SensorTopicWayComponent implements OnInit { ...@@ -75,7 +75,8 @@ export class SensorTopicWayComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
...@@ -90,7 +91,8 @@ export class SensorTopicWayComponent implements OnInit { ...@@ -90,7 +91,8 @@ export class SensorTopicWayComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['deviceNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
......
src/app/main/topic-module-way/topic-module-way.component.ts
View file @ 77d35442
...@@ -84,7 +84,8 @@ export class TopicModuleWayComponent implements OnInit { ...@@ -84,7 +84,8 @@ export class TopicModuleWayComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
...@@ -99,7 +100,8 @@ export class TopicModuleWayComponent implements OnInit { ...@@ -99,7 +100,8 @@ export class TopicModuleWayComponent implements OnInit {
alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin', alarmUp: 'alarmMax', upperAlarmLimit: 'alarmMaxMax', rangeMax: 'max', alarmDown: 'alarmMin',
lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'}, lowerAlarmLimit: 'alarmMinMin', alarmInterval: 'alarmInterval', rangeMin: 'min'},
field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'], field: ['topicModelNo', 'topicName', 'name', 'alias', 'description', 'type', 'isAlarm'],
num: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'alarmInterval', 'rangeMin'], float2: ['alarmUp', 'upperAlarmLimit', 'rangeMax', 'alarmDown', 'lowerAlarmLimit', 'rangeMin'],
num: ['alarmInterval'],
eng: ['name', 'alias'] eng: ['name', 'alias']
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment