From 61147f77629bed8a806d72bdd3385255e80a22f1 Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Tue, 2 Jun 2020 19:59:59 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-290=20feat:=20=E5=A2=9E=E5=8A=A0project?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84chart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/stylus/main.scss | 6 + .../src/components/charts/chart-list.vue | 108 ++++-- .../components/charts/chart-project-info.vue | 336 ++++++++++++++++++ .../src/components/charts/chart.scss | 4 +- .../common/bottomBox/tabs/panelTab.vue | 6 +- .../src/components/common/language/en.js | 6 + 6 files changed, 440 insertions(+), 26 deletions(-) create mode 100644 nezha-fronted/src/components/charts/chart-project-info.vue diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index b5f7f1de0..23ad8cad6 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1556,6 +1556,12 @@ li{ .grey { background-color:lightGrey; } +.dark-red { + background-color: #aa0000 !important; +} +.orange { + background-color: #ffa500 !important; +} .clickable:hover{ cursor:pointer; diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 2aeea610d..77062713d 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -107,6 +107,14 @@ :editChartId="'editChartId' + item.id" > + + + @import './chart.scss'; + + + + diff --git a/nezha-fronted/src/components/charts/chart.scss b/nezha-fronted/src/components/charts/chart.scss index 550605130..a3a1ce8e0 100644 --- a/nezha-fronted/src/components/charts/chart.scss +++ b/nezha-fronted/src/components/charts/chart.scss @@ -197,7 +197,7 @@ } } } - .chart-asset-info { + .chart-asset-info, .chart-project-info { .chart-info-container { padding-top: 6px; } @@ -329,7 +329,7 @@ } } } - .line-chart-block, .chart-table, .chart-single-stat, .chart-url, .chart-asset-info, .chart-alert-info { + .line-chart-block, .chart-table, .chart-single-stat, .chart-url, .chart-asset-info, .chart-alert-info, .chart-project-info { height: 100%; position: relative; background-color: white; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue index b4d347a99..7a9715fb0 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue @@ -430,9 +430,11 @@ }, obj: { immediate: true, - handler(n) { + handler(n, o) { setTimeout(() => { - this.getTableData(n.id); + if (n && !o || n.id != o.id) { + this.getTableData(n.id); + } }, 500); } } diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 6a3e470e6..433e06609 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -25,6 +25,7 @@ const en = { search: 'Search', //'搜索' add: 'Create', //"新增" option: 'Operation', //"操作" + remark: "Description", clear: 'Clear', //"清除" name: 'Name', //'名称' cover: 'Override', //'覆盖' @@ -793,6 +794,11 @@ const en = { } }, project: { + chart: { + basicTitle: "Basic info", + alertStat: "Alert state", + endpointStat: "Endpoint state", + }, project: { project: 'Project',//"系统" projectName: 'Project name',//"系统名称"