diff --git a/src/assets/images/device01.gif b/src/assets/images/device01.gif index beb27d6..22c1d9f 100644 Binary files a/src/assets/images/device01.gif and b/src/assets/images/device01.gif differ diff --git a/src/assets/images/device02.gif b/src/assets/images/device02.gif new file mode 100644 index 0000000..89c263a Binary files /dev/null and b/src/assets/images/device02.gif differ diff --git a/src/assets/images/device03.gif b/src/assets/images/device03.gif new file mode 100644 index 0000000..1fb9251 Binary files /dev/null and b/src/assets/images/device03.gif differ diff --git a/src/styles/index.scss b/src/styles/index.scss index 0e55986..e80d98e 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -159,4 +159,8 @@ } } } +} + +.el-overlay{ + z-index: 99999 !important; } \ No newline at end of file diff --git a/src/views/monitoring/components/header.vue b/src/views/monitoring/components/header.vue index fa4a0b7..72e730f 100644 --- a/src/views/monitoring/components/header.vue +++ b/src/views/monitoring/components/header.vue @@ -225,7 +225,7 @@ function getwaringList() { } function waringConfirm(item: any) { //报警确认 - ElMessageBox.confirm('是否确认?', '提示', { + ElMessageBox.confirm('是否确认操作?', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', diff --git a/src/views/monitoring/components/menu.vue b/src/views/monitoring/components/menu.vue index ee08f30..a310c5a 100644 --- a/src/views/monitoring/components/menu.vue +++ b/src/views/monitoring/components/menu.vue @@ -120,6 +120,18 @@ function menuUpdateValue(key: string, item: MenuOption) { font-family: 'AlibabaPuHuiTiBold'; padding: 0 15px; } + .n-menu-item-content__arrow{ + color: #B1E3FF; + } + } + + .n-menu-item-content.n-menu-item-content--child-active { + .n-menu-item-content-header { + color: #B1E3FF; + } + .n-menu-item-content__arrow{ + color: #B1E3FF; + } } // .n-menu-item-content--child-active { @@ -141,6 +153,10 @@ function menuUpdateValue(key: string, item: MenuOption) { } } + .n-menu-item:hover { + color: red; + } + .n-submenu-children { .n-menu-item-content-header { font-size: 1.6rem; diff --git a/src/views/monitoring/devicemanage/components/main.vue b/src/views/monitoring/devicemanage/components/main.vue index fbd97ec..caf10eb 100644 --- a/src/views/monitoring/devicemanage/components/main.vue +++ b/src/views/monitoring/devicemanage/components/main.vue @@ -60,7 +60,7 @@