Merge branch 'alarm' into dev
commit d986d6db1dc63fe9c79a6fc0069b79a391adfa94
2 parents e878188 + 2512dc4
dutingting authored 14 days ago
Showing 4 changed files
View
src/views/bigScreen/index.vue
View
src/views/monitor/realTime/index-new-gm-plugin.vue
View
src/views/system/approval/approvalDialog.vue
View
src/views/system/approval/index.vue