diff --git a/src/assets/images/abnormalAlarm/delete.png b/src/assets/images/abnormalAlarm/delete.png new file mode 100644 index 0000000..c8f409e Binary files /dev/null and b/src/assets/images/abnormalAlarm/delete.png differ diff --git a/src/assets/images/abnormalAlarm/edit.png b/src/assets/images/abnormalAlarm/edit.png new file mode 100644 index 0000000..0724619 Binary files /dev/null and b/src/assets/images/abnormalAlarm/edit.png differ diff --git a/src/assets/images/abnormalAlarm/user.png b/src/assets/images/abnormalAlarm/user.png new file mode 100644 index 0000000..7c64fb5 Binary files /dev/null and b/src/assets/images/abnormalAlarm/user.png differ diff --git a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue index 57c6708..7b2a477 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmContactGroup/index.vue @@ -1,15 +1,477 @@ - \ No newline at end of file diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue index cd23274..c6e2f27 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue @@ -1,14 +1,41 @@ @@ -37,14 +378,13 @@ export default { \ No newline at end of file diff --git a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue index 073599b..2501b4f 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue @@ -1,6 +1,47 @@ @@ -10,6 +51,28 @@ } - \ No newline at end of file diff --git a/src/views/abnormalAlarm/components/searchBar.vue b/src/views/abnormalAlarm/components/searchBar.vue index 3d4b05f..ac8b67f 100644 --- a/src/views/abnormalAlarm/components/searchBar.vue +++ b/src/views/abnormalAlarm/components/searchBar.vue @@ -6,7 +6,7 @@ - +
@@ -15,13 +15,13 @@ style="padding: 4px 12px; cursor: pointer;" @mousedown="e => e.preventDefault()" > - ALL + ALL
- + @@ -32,7 +32,7 @@ style="padding: 4px 12px; cursor: pointer;" @mousedown="e => e.preventDefault()" > - ALL + ALL @@ -40,7 +40,10 @@ - + @@ -54,7 +57,15 @@