diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss index 0c48d017a..3805c5a6f 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss @@ -64,6 +64,11 @@ } } .explore { + .el-collapse-item__height{ + .el-collapse-item__wrap{ + overflow: unset; + } + } .chart-view__switch { margin-top: 20px; border: 1px solid $--border-color-light; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss index 004ab9ca7..fad88880f 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss @@ -468,10 +468,10 @@ margin-bottom: 5px; } .progress-title{ - width: 64px; + min-width: 64px; } .progress-content{ - width: 20px; + min-width: 20px; } .progress-box{ width: 56px; diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index 0551bf8d2..a941da521 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -19,7 +19,7 @@ :close-delay=10 trigger="hover" popper-class="chart-warring-popper"> -
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
+
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 9d1bf34a6..fd2223aec 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -182,7 +182,7 @@ export default {
-
Asset ok
+
${self.$t('panel.assetOk')}
@@ -190,7 +190,7 @@ export default {
${dcStat.asset.ok}
-
Asset alarm
+
${self.$t('panel.assetAlarm')}
@@ -201,7 +201,7 @@ export default {
-
agent up
+
${self.$t('guide.agent')} ${self.$t('overall.normal')}
@@ -209,7 +209,7 @@ export default {
${dcStat.agent.up}
-
agent down
+
${self.$t('guide.agent')} ${self.$t('overall.unusual')}
diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue index 6ffa94932..930301870 100644 --- a/nezha-fronted/src/components/chart/chartHeader.vue +++ b/nezha-fronted/src/components/chart/chartHeader.vue @@ -19,7 +19,7 @@ :close-delay=10 trigger="hover" popper-class="chart-warring-popper"> -
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
+
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{allDataLength}}
diff --git a/nezha-fronted/src/components/common/alert/alertDaysInfo.vue b/nezha-fronted/src/components/common/alert/alertDaysInfo.vue index bf62e8658..7337fe689 100644 --- a/nezha-fronted/src/components/common/alert/alertDaysInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertDaysInfo.vue @@ -47,18 +47,17 @@ export default { methods: { showPriority (daysData) { let style = {} - // let sum = 0 + let sum = 0 this.severityDataWeight.forEach(item => { - // sum += Number(daysData[item.name]) + sum += Number(daysData[item.name]) if (daysData[item.name] && !style.background) { style = { background: item.color } } }) - // const height = sum > 0 ? (sum < 10 ? 20 : 24) : 16 - // console.log(sum, height) - // style.height = (height + 'px') + const height = sum > 0 ? (sum <= 10 ? 12 : 14) : 10 + style.height = (height + 'px') return style }, tooltipHover (item, flag, e) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index 649a338f3..b8869990e 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -249,7 +249,7 @@ export default { label: this.$t('project.endpoint.alerts'), prop: 'alerts', show: true, - width: 150 + width: 180 }, /* { label: this.$t("project.endpoint.lastUpdate"), diff --git a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue index 13b9fbe66..fbe10395e 100644 --- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue @@ -134,7 +134,7 @@ export default { label: this.$t('alert.alert'), prop: 'alertNum', show: true, - width: 150, + width: 120, sortable: 'custom' }, { label: this.$t('alert.config.receiver'), diff --git a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue index 09fc8a854..ba32513ce 100644 --- a/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue @@ -119,7 +119,7 @@ export default { label: this.$t('asset.alertNum'), prop: 'alertNum', show: true, - minWidth: 140, + width: 120, sortable: 'custom' }, { label: this.$t('asset.endpointNum2'), diff --git a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue index 55d7ca2f5..5316176f4 100644 --- a/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue @@ -91,6 +91,7 @@ export default { }, { label: this.$t('config.dc.alert'), prop: 'alertNum', + width: 120, show: true }, { label: this.$t('asset.tel'), diff --git a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue index f312ee811..7fb683510 100644 --- a/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue @@ -101,7 +101,7 @@ export default { label: this.$t('project.endpoint.alerts'), prop: 'alerts', show: true, - minWidth: 150, + minWidth: 180, sortable: 'custom' }, { diff --git a/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue b/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue index 3fcda7304..f608da4da 100644 --- a/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue @@ -89,7 +89,7 @@ export default { label: this.$t('project.module.alerts'), prop: 'alertNum', show: true, - width: 200, + width: 120, sortable: 'custom' }, { diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue index 88e5fb12f..078077502 100644 --- a/nezha-fronted/src/components/common/project/popData/assetTable.vue +++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue @@ -114,7 +114,7 @@ export default { label: this.$t('asset.alertNum'), prop: 'alertNum', show: true, - width: 140 + width: 120, }, { label: this.$t('asset.endpointNum2'), prop: 'endpointNum', diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 131ff72dc..dfa513b0f 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -228,7 +228,7 @@ export default { label: this.$t('alert.alert'), prop: 'alertNum', show: true, - width: 150, + width: 120, sortable: 'custom' }, { label: this.$t('alert.config.receiver'), diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue index 226ef68cb..661a4f730 100644 --- a/nezha-fronted/src/components/common/table/asset/assetTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue @@ -48,7 +48,7 @@
-
Alert message (active)
+
{{$t('project.topology.alert')}}({{$t('asset.pingActive')}})
{{$t('overall.result.total')}}
{{scope.row.alertNum}}
@@ -254,7 +254,7 @@ export default { label: this.$t('asset.alertNum'), prop: 'alertNum', show: true, - minWidth: 140, + width: 120, sortable: 'custom' }, { label: this.$t('asset.endpointNum2'), diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue index 612bff935..0723c9168 100644 --- a/nezha-fronted/src/components/common/table/settings/dcTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue @@ -174,6 +174,7 @@ export default { }, { label: this.$t('config.dc.alert'), prop: 'alertNum', + width: 120, show: true }, { label: this.$t('asset.tel'), diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index da83798db..a313634c8 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -262,7 +262,7 @@ export default { label: this.$t('project.endpoint.alerts'), prop: 'alerts', show: true, - minWidth: 150, + minWidth: 180, sortable: 'custom' }, { diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 759f8568a..eddcc03a8 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -148,7 +148,7 @@ export default { label: this.$t('project.module.alerts'), prop: 'alertNum', show: true, - width: 200, + width: 120, sortable: 'custom' }, { diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index c50761d59..9b69ecc56 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -137,7 +137,7 @@ export default { label: this.$t('project.endpoint.alerts'), prop: 'alerts', show: true, - width: 150 + width: 180 }, // { // label: this.$t("project.endpoint.lastUpdate"),