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" > + + { + if(response.code == 200){ + this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, response.data, this.filter.panelId, this.filter); + }else{ + this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, {}, this.filter.panelId, this.filter, response.msg); + } + }) + }else { + let data={ + basic: { + id: 1, + name: "system", + remark: "描述信息", + alertStat: [1,2,3], + }, + module: [ + { + id: 1, + name: "kafka", + type: "http", + remark: "描述信息", + endpointStat: [3,23], + alertStat: [2,3,4], + }, + { + id: 2, + name: "kafkakafkakafkakafkakafkakafkakafka", + type: "http", + remark: "描述信息", + endpointStat: [3,23], + alertStat: [2,0,4], + }, + { + id: 3, + name: "kafkakafka", + type: "snmp", + remark: "描述信息", + endpointStat: [3,0], + alertStat: [2,3,4], + }, + ] + }; this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, data, this.filter.panelId, this.filter); } }, diff --git a/nezha-fronted/src/components/charts/chart-project-info.vue b/nezha-fronted/src/components/charts/chart-project-info.vue new file mode 100644 index 000000000..b9ad0340b --- /dev/null +++ b/nezha-fronted/src/components/charts/chart-project-info.vue @@ -0,0 +1,336 @@ + + + + + + + + + + {{errorContent}} + + + + + + + {{$t('asset.createAssetTab.assetInfo')}} + + + + + + + + + + {{$t('project.chart.basicTitle')}} + + + + + + {{item.label}} + {{item.label}} + + + + {{projectInfos.basic.alertStat[0]}} + + {{projectInfos.basic.alertStat[1]}} + + {{projectInfos.basic.alertStat[2]}} + + + {{projectInfos.basic[item.prop] ? projectInfos.basic[item.prop] : " "}} + {{projectInfos.basic[item.prop]}} + + + + + + + + + {{$t('project.module.module')}}:{{module.name}} + + + + + {{item.label}} + {{item.label}} + + + + {{projectInfos.basic.alertStat[0]}} + + {{projectInfos.basic.alertStat[1]}} + + + + {{module.alertStat[0]}} + + {{module.alertStat[1]}} + + {{module.alertStat[2]}} + + + {{module[item.prop] ? module[item.prop] : " "}} + {{module[item.prop]}} + + + + + + + + + + + + + + + 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',//"系统名称"