diff --git a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue index 5ef2ace..3e100e0 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue @@ -7,7 +7,7 @@ - Create Alert Rule + Create Alarm Rule @@ -750,11 +750,11 @@ export default { .item-label{ display: inline-block; font-size: 16px; - font-family: ArialMT; - color: #ade6ee; - line-height: 32px; - height: 32px; - margin-right: 10px; + font-family: ArialMT; + color: #ade6ee; + line-height: 32px; + height: 32px; + margin-right: 10px; } .rules-add{ background-color: #1397a3; diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue index 46dd640..fb2febf 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue @@ -10,11 +10,35 @@ :list="dataSource" :loading="loading" :pagination="false" - :canSelect="false" + :selectRowClick="rowClick" > - - {{ record.alarmValue }}{{ JSON.parse(record.operator).units }} - {{ JSON.parse(record.operator).name }} {{ JSON.parse(record.operator).operator }} {{ JSON.parse(record.operator).threshold }}{{ JSON.parse(record.operator).units }} + + + + {{ text.join("/") }} + + {{ text.join("/") }} + + + + + + {{ text.join("/") }} + + {{ text.join("/") }} + + + + + + + + {{ text }} + + \ No newline at end of file diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue new file mode 100644 index 0000000..88116cc --- /dev/null +++ b/src/views/abnormalAlarm/analysisMonitor/alarmRules/index.vue @@ -0,0 +1,597 @@ + + + + + + + + + Create Alarm Rule + + + + + Station + + + + + + Data Sources + + + + + + Nuclide + + + + + + + + + Search + + + + + + + + + + + asdfsd + + Qualifier: + FULL + + + + + + Source: + + + asdfasdfas + + asdfasdfas + + + + Stations: + + + asdfasdfas + + asdfasdfas + + + + Nuclides: + + + asdfasdfas + + asdfasdfas + + + + + {{ 1==1?"Enable":"Disabled" }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.text || item.label }} + + + + + + + + + + Save + Cancel + + + + + + + + + \ No newline at end of file diff --git a/src/views/abnormalAlarm/components/searchBar.vue b/src/views/abnormalAlarm/components/searchBar.vue index 6360281..1749ab0 100644 --- a/src/views/abnormalAlarm/components/searchBar.vue +++ b/src/views/abnormalAlarm/components/searchBar.vue @@ -80,7 +80,7 @@ - + { if (!err) { - console.log('Received values of form: ', values); if (this.isAdd) { postAction("/sysDatabase/create", values).then(res => { if (res.success) {