diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index 342a74560..314f23d14 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -25,4 +25,6 @@ $content-left-text-color: #666; //左侧菜单默认字色 $dropdown-hover-background-color: #fafafa; //下拉鼠标悬停背景色 +$left-menu-bgcolor:#FFF; + @import './main.scss'; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 72db40066..741e01ee2 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1685,7 +1685,7 @@ li{ width: 90px; } .left-menu-bg .el-collapse-item__header,.left-menu-bg .el-collapse-item__content{ //当左侧菜单含有el-collapse组件时使用 - background-color: #e2e2e2; + background-color: $left-menu-bgcolor; } .transparent-pop{ //防止popover的提示框挡住页面元素无法操作 pointer-events: none; diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue index 28e09d190..0ede05858 100644 --- a/nezha-fronted/src/components/common/leftMenu.vue +++ b/nezha-fronted/src/components/common/leftMenu.vue @@ -4,7 +4,7 @@
-
+
@@ -49,7 +49,7 @@ } .content .left-slot{ position: relative; - background-color: #e2e2e2; + background-color: $left-menu-bgcolor; /*border-bottom: 1px solid #eeeeee;*/ /*transition: all 100ms;*/ } diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index a56cc420e..9758f9baa 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -134,10 +134,14 @@
- +
+
+
up
+
down:
{{getStateErrorMsg(scope.row)}}
+
{{scope.row[item.prop]}} @@ -622,10 +626,10 @@ getStateContent:function(row){ if(row){ if(row.state == 1){ - return 'up'; }else{ - return 'down'; + // return 'down'+'['+this.getStateErrorMsg(row)+']'; + return `down:${this.getStateErrorMsg(row)}` } } }, @@ -1120,4 +1124,8 @@ .project .sidebar-info-item{ margin:0px !important; } + .small-pop{ + width: 25px !important; + min-width: unset !important; + }