diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 6751a8ccb..c3954689f 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -7,7 +7,7 @@
-
+
module>endpoint 查询只传最细粒度 - let param=this.chartInfo.param; + let chart=null; + if(chartInfo){ + chart=Object.assign({},chartInfo) + }else{ + chart=Object.assign({},this.chartInfo) + } + if(chart&&chart.param){ //按照粒度,project>module>endpoint 查询只传最细粒度 + let param=chart.param; if(param.endpointId&¶m.endpointId != ''){ queryParam.endpointId=param.endpointId; }else{ diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 6e2886175..7fa6449e8 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -57,7 +57,7 @@
{{chart.title}} -
+
- + diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index 00bcf652b..7741a14f9 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -21,7 +21,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue index 606a76947..f1d5beaad 100644 --- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue @@ -20,7 +20,7 @@ - +
{{cabinet.name}}
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 2ac024362..056202e92 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -20,7 +20,7 @@ - +
{{currentDc.name}}
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 1189f0a1a..3f593337c 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -20,7 +20,7 @@ - + @@ -137,7 +137,8 @@ +
-
diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue index 1553be501..a04bcc3aa 100644 --- a/nezha-fronted/src/components/common/rightBox/mibBox.vue +++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue @@ -20,7 +20,7 @@ - + - + @@ -69,9 +69,9 @@
- - - + + +
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index c0e02e8dd..27ca49fcf 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -20,7 +20,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/panelBox.vue b/nezha-fronted/src/components/common/rightBox/panelBox.vue index bac40d8b2..914bcb045 100644 --- a/nezha-fronted/src/components/common/rightBox/panelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/panelBox.vue @@ -16,7 +16,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/projectBox.vue b/nezha-fronted/src/components/common/rightBox/projectBox.vue index 5a3ea605a..072ced069 100644 --- a/nezha-fronted/src/components/common/rightBox/projectBox.vue +++ b/nezha-fronted/src/components/common/rightBox/projectBox.vue @@ -18,7 +18,7 @@
{{rightBox.title}}
- +
{{project.name}}
diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 050411314..4f346c24a 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -514,7 +514,11 @@ type: "line", symbol: 'none', //去掉点 smooth: 0.2, //曲线变平滑 - name: '' + name: '', + lineStyle: { + width: 1, + opacity: 0.9 + }, }; chartData.name += "{"; alias += "{"; diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 1ba86f920..b0a06ce29 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -120,7 +120,7 @@ - diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 08375f6ef..dd924f42b 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -73,7 +73,7 @@ - + 0) { series.data=response.data.result[0].values.map((item)=>{ @@ -545,6 +549,10 @@ smooth:0.2, //曲线变平滑 data: [], type:'line', + lineStyle: { + width: 1, + opacity: 0.9 + }, }; if (response.data.result.length > 0) { series.data=response.data.result[0].values.map((item)=>{ diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index dd4ca3e75..ee1cdc48c 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -593,7 +593,7 @@ margin-top: 3px; text-align:left; border-radius:4px; - width:120px; + width:260px; height:24px; border:solid 1px #d8dce1; white-space: nowrap; @@ -602,7 +602,7 @@ } .panel-list-title { min-height:24px; - width:100px; + width:236px; white-space: nowrap; overflow-x: hidden; text-overflow: ellipsis;