From 78ce7ce559227a4e0c1530b84b14ff8d03095275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com> Date: Fri, 23 Sep 2022 17:45:38 +0800 Subject: [PATCH] add terminal/alarm router --- xiuosiot-frontend/src/router/index.js | 2 +- .../src/views/terminal/PLC/index.vue | 13 +- .../src/views/terminal/alarm/index.vue | 171 ++++++++++++++++-- 3 files changed, 166 insertions(+), 20 deletions(-) diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index bcf4332..b2e7c52 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -131,7 +131,7 @@ export const constantRoutes = [ path: 'alarm', name: 'Alarm', component: () => import('@/views/terminal/alarm/index'), - meta: { title: '设备告警', disabled: true } + meta: { title: '设备告警' } }, { path: 'plc', diff --git a/xiuosiot-frontend/src/views/terminal/PLC/index.vue b/xiuosiot-frontend/src/views/terminal/PLC/index.vue index 37a212f..fcd4582 100644 --- a/xiuosiot-frontend/src/views/terminal/PLC/index.vue +++ b/xiuosiot-frontend/src/views/terminal/PLC/index.vue @@ -856,14 +856,25 @@ export default { animation: 0.5s out; } .dialog_wrapper { - z-index: 99; + z-index: 2; position: fixed; left: 230px; right: 0; top: 0; bottom: 0; margin: 0; + &::before{ + content: ''; + position: absolute; + left: -230px; + right: 0; + top: 0; + bottom: 0; + background-color: rgba(0,0,0,.4); + z-index:2 + } .dialog-container { + z-index: 10; width: 1100px; transform: none; margin: 15vh auto; diff --git a/xiuosiot-frontend/src/views/terminal/alarm/index.vue b/xiuosiot-frontend/src/views/terminal/alarm/index.vue index 9a69fc0..db5aa5b 100644 --- a/xiuosiot-frontend/src/views/terminal/alarm/index.vue +++ b/xiuosiot-frontend/src/views/terminal/alarm/index.vue @@ -1,39 +1,42 @@