From 22403b198d60fca0087abf116540cc6cff25df3d Mon Sep 17 00:00:00 2001 From: lVAL Date: Thu, 14 Jan 2021 14:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=97=E4=BA=AC2=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E8=8F=9C=E5=8D=95=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/nanjing_02/menus/index.vue | 14 +- .../theme/nanjing_02/menus/menuBar.vue | 106 ++++---- .../theme/nanjing_02/menus/menuButton.vue | 226 ++++++++++-------- 3 files changed, 185 insertions(+), 161 deletions(-) diff --git a/src/jmapNew/theme/nanjing_02/menus/index.vue b/src/jmapNew/theme/nanjing_02/menus/index.vue index 4b41d47f1..506d8af2d 100644 --- a/src/jmapNew/theme/nanjing_02/menus/index.vue +++ b/src/jmapNew/theme/nanjing_02/menus/index.vue @@ -346,24 +346,14 @@ export default { .haerbin-01__systerm .el-dialog .button-group { margin-top: 10px; } - .haerbin-01__systerm .nav-border .el-button { + .haerbin-01__systerm .el-button { height: 20px; line-height: 20px; padding: 0px; width: 80px; border: 1px solid #1F313F; font-size: 12px; - border-radius: 5px !important; + border-radius: 1px !important; color: #000; - background: #FFFFFF; - } - .haerbin-01__systerm .nav-border-other .el-button { - height: 20px; - line-height: 20px; - padding: 0px; - width: 80px; - border: 1px solid #1F313F; - font-size: 12px; - border-radius: 5px !important; } diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue index 774ee154c..2440b2661 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuBar.vue @@ -13,32 +13,30 @@ - -
- - - - - - -
+ + + + + + +
- A级警报 - B级警报 - C级警报 + A级警报 + B级警报 + C级警报 记录 @@ -66,7 +64,7 @@ -
+
{{ `${tipContent[0].level}` }}
@@ -93,7 +91,7 @@
编表
车辆段
- +
轨道
调度
录放
@@ -105,30 +103,30 @@
-
+
-
A
-
B
-
C
+
A
+
B
+
C
报警
运图
 - +
报表
时刻表
- +
考评
日志
 - +
锁屏
退出
 @@ -469,15 +467,6 @@ export default { border-right: 2px solid #FBFBFA; border-bottom: 2px solid #FBFBFA; } - .nav-border-other { - font-size: 12px; - color: #000; - text-align: center; - border-top: 2px solid #7E8076; - border-left: 2px solid #6A6B64; - border-right: 2px solid #FBFBFA; - border-bottom: 2px solid #FBFBFA; - } .nav { display: block; cursor: pointer; @@ -486,7 +475,6 @@ export default { background: -o-linear-gradient(#FDFDFE, #DEE3F3); background: -moz-linear-gradient(#FDFDFE, #DEE3F3); background: linear-gradient(#FDFDFE, #DEE3F3); - /*background: #FFFFFF;*/ border: 1px solid #B6BCCC !important; border-bottom: 2px solid #B6BCCC !important; list-style: none; @@ -501,7 +489,7 @@ export default { .nav-li:active { background: #C9D0E1; - border-radius: 4px; + border-radius: 1px; } .nav-li-text { @@ -588,9 +576,9 @@ export default { width: 80px; border: 1px solid #1F313F; font-size: 12px; - border-radius: 5px !important; + border-radius: 1px !important; color: #000; - background: #FFFFFF; + background: #DDD; margin: 5px auto; } .fake-button-active{ @@ -600,9 +588,11 @@ export default { width: 80px; border: 1px solid #1F313F; font-size: 12px; - border-radius: 5px !important; - color: #70B6FF; - background: #ECF5FF; + &.el-button { + border-radius: 1px !important; + background: #ECF5FF !important; + color: #70B6FF !important; + } margin: 5px auto; } @@ -613,8 +603,8 @@ export default { border: 1px solid rgb(204, 204, 204); line-height: 20px; margin: 5px auto; - border-radius: 5px; - background: #ffffff; + border-radius: 1px; + background: #DDD; cursor: not-allowed; } .div-simulate-button{ @@ -624,9 +614,9 @@ export default { font-size: 14px; color: #303030; border: 1px solid #44556D; - background: #FFF; + background: #DDD; text-align: center; - border-radius: 5px; + border-radius: 1px; width: 80px; } .tip-content-box{ @@ -668,9 +658,23 @@ export default { opacity: 1.0; } } + .headerBox { background: #f00; animation: fade 600ms infinite; -webkit-animation: fade 600ms infinite; } + + .nav-border .el-button { + background: #DDDDDD; + border: 1px solid #000 !important; + &.disabled { + border: 1px solid #D0CEC5 !important; + /*background: #DDDDDD !important;*/ + color: #a0a0a0!important; + } + &:hover, &.active{ + background: #eeeeee; + } + } diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue index 169abaeb1..535f15726 100644 --- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue +++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue @@ -1,11 +1,11 @@