diff --git a/nezha-fronted/.gitignore b/nezha-fronted/.gitignore index 541a820f6..ce84da4cf 100644 --- a/nezha-fronted/.gitignore +++ b/nezha-fronted/.gitignore @@ -1,6 +1,7 @@ .DS_Store node_modules/ /dist/ +static/Tiles/ npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/nezha-fronted/src/assets/stylus/index.scss b/nezha-fronted/src/assets/stylus/index.scss index 1a312e2a0..934d16ed0 100644 --- a/nezha-fronted/src/assets/stylus/index.scss +++ b/nezha-fronted/src/assets/stylus/index.scss @@ -43,6 +43,7 @@ $dropdown-hover-background-color: #fafafa; //下拉鼠标悬停背景色 $danger-color: #DE5D3F; //全局警告色红色 $success-color: #23BF9A; //全局正常色绿色 +$suspended-color: #71706D; //全局停用色灰色 $left-menu-bgcolor:#FFF; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index a92f07838..3af0e2484 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -888,6 +888,18 @@ li{ padding:2px 5px; border-radius: 4px; } +.nz-table td.suspended .cell>span { + background-color: $suspended-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} +.nz-table td.success .cell>span { + background-color: $success-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} .nz-table th { padding: 0; } @@ -1733,8 +1745,8 @@ li{ //background-color:#50d050 !important; background-color:$success-color !important; } -.grey { - background-color:lightGrey; +.gray { + background-color: $suspended-color !important; } .dark-red { background-color: #aa0000 !important; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index e678bc342..63ea1dbd9 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -103,7 +103,7 @@
-
+
@@ -411,13 +411,13 @@ return year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; }, getStateContent:function(row){ - if(row){ - if(row.state == 1){ + if (row) { + if (row.state == 1) { return 'up'; - //return 'up'+'['+this.formatUpdateTime(row.lastUpdate)+']'; - }else{ + } else if (row.state == 0){ return 'down'; - //return 'down'+'['+this.getStateErrorMsg(row)+']'; + } else if (row.state == 2) { + return 'suspended'; } } }, diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index a033644e6..3f847ab39 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -546,6 +546,7 @@ const cn = { endpointNum:'代表总的数量', active:"Alive",// "存活", total:"Total", // "总数", + down: "Down", }, config: { config: "设置", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 8da3efcb8..db23db46b 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -548,6 +548,7 @@ const en = { }, active:"Alive",// "存活", total:"Total",// "总数", + down: "Down" }, config: { config: 'Settings',//"设置" diff --git a/nezha-fronted/src/components/common/project/popData/Main.vue b/nezha-fronted/src/components/common/project/popData/Main.vue index d20aca36a..3f60a0502 100644 --- a/nezha-fronted/src/components/common/project/popData/Main.vue +++ b/nezha-fronted/src/components/common/project/popData/Main.vue @@ -20,6 +20,7 @@
{{moduleInfo.endpointStat.up}}
{{moduleInfo.endpointStat.down}}
+
{{moduleInfo.endpointStat.suspended}}
@@ -116,10 +117,11 @@ endpointOption.series[0].label.formatter = this.moduleInfo.endpointStat.down+this.moduleInfo.endpointStat.up + ""; endpointOption.series[0].data = [ {name: this.$t("dashboard.overview.asset.pingUp"), value: this.moduleInfo.endpointStat.up ? this.moduleInfo.endpointStat.up : 0}, - {name: this.$t("dashboard.overview.asset.pingDown"), value: this.moduleInfo.endpointStat.down ? this.moduleInfo.endpointStat.down : 0} + {name: this.$t("dashboard.overview.asset.pingDown"), value: this.moduleInfo.endpointStat.down ? this.moduleInfo.endpointStat.down : 0}, + {name: this.$t("asset.suspended"), value: this.moduleInfo.endpointStat.suspended ? this.moduleInfo.endpointStat.suspended : 0} ]; endpointOption.title.show = false; - endpointOption.legend.data = [this.$t("dashboard.overview.asset.pingUp"), this.$t("dashboard.overview.asset.pingDown")]; + endpointOption.legend.data = [this.$t("dashboard.overview.asset.pingUp"), this.$t("dashboard.overview.asset.pingDown"), this.$t("asset.suspended")]; assetOption.series[0].label.formatter = this.moduleInfo.assetStat.up+this.moduleInfo.assetStat.down + ""; assetOption.series[0].data = [ {name: this.$t("dashboard.overview.asset.pingUp"), value: this.moduleInfo.assetStat.up ? this.moduleInfo.assetStat.up : 0}, @@ -144,13 +146,13 @@ .tooltip--row { position: relative; - height: 50px; + height: 70px; .legend-value { font-size: 12px; color: #333333; position: absolute; - left: 125px; + left: 150px; top: 6px; } @@ -227,7 +229,7 @@ .main-box{ background: #FFFFFF; border: 1px solid #E7EAED; - width: 180px; + width: 190px; margin-bottom: 15px; } .main-box-title{ @@ -258,7 +260,7 @@ margin-right: 5px; line-height: 1; } - .bg23BF9A{ +/* .bg23BF9A{ background: #23BF9A; } .bgEC7F66{ @@ -266,6 +268,6 @@ } .bg3C92F1{ background: #3C92F1; - } + }*/ diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue index 2954bcd84..4b45db2f9 100644 --- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue +++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue @@ -20,10 +20,6 @@ - - - - @@ -73,11 +69,12 @@
-
+
up
-
down:
{{getStateErrorMsg(scope.row)}}
+
down:
{{getStateErrorMsg(scope.row)}}
+
suspended
@@ -98,8 +95,6 @@