diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 129aba35c..975d40445 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -96,16 +96,6 @@ {{scope.row['state'] == 1 ? "Pending" : ""}} {{scope.row['state'] == 2 ? "Expired" : ""}} -
- - - -
- - {{formatThreshold(scope.row.current[1],scope.row.alertRule.unit)}} -
-
{{$unixTimeParseToString(scope.row.current[0])}}
-
-
{{scope.row[item.prop]}} @@ -116,11 +106,37 @@ fixed="right">
{{$t('overall.option')}}
- + +
+ - + +
+ + {{formatThreshold(scope.row.current[1],scope.row.alertRule.unit)}} +
+
{{$unixTimeParseToString(scope.row.current[0])}}
+
+
+
+ +
+ {{$t("project.endpoint.dialogTitle")}} +
+ +
+
+ +
@@ -133,12 +149,14 @@ import chartDataFormat from '../../../charts/chartDataFormat' import alertRuleInfo from '../../alert/alertRuleInfo' import alertLabel from '../../alert/alertLabel' import { calcDurationByStringTimeB } from '../../js/tools' +import chart from "../../../page/dashboard/overview/chart" export default { name: 'alertMessageTable', components: { nzAlertTag, alertRuleInfo: alertRuleInfo, - alertLabel: alertLabel + alertLabel: alertLabel, + chart:chart, }, props: { nowTime: { @@ -269,6 +287,12 @@ export default { }) return result }, + chartUnitChange:function(unit){ + this.chartUnit=unit; + this.$nextTick(()=>{ + this.queryChartDate() + }) + }, formatThreshold (value, unit) { const unitMethod = chartDataFormat.getUnit(unit) if (unitMethod && value) { @@ -414,7 +438,9 @@ export default { this.queryChartDate() }) }, - + dialogClose() { + this.graphShow = false; + }, getAlertList () { if (!this.scrollbarWrap) { this.$nextTick(() => { @@ -589,6 +615,18 @@ export default {