diff --git a/src/graphql/fragments/alarm.ts b/src/graphql/fragments/alarm.ts index 76ed4672..ec091598 100644 --- a/src/graphql/fragments/alarm.ts +++ b/src/graphql/fragments/alarm.ts @@ -23,6 +23,7 @@ export const Alarm = { key: id message startTime + recoveryTime scope name tags { diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index eba15632..1a0c7773 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -215,6 +215,7 @@ const msg = { timeRange: "Time Range", duration: "Duration", startTime: "Start Time", + recoveryTime: "Recovery Time", start: "Start", spans: "Spans", spanInfo: "Span Info", @@ -327,6 +328,7 @@ const msg = { message: "Message", tooltipsContent: "Tooltip Content", alarmDetail: "Alarm Detail", + recoveredAt: "Recovered At", scope: "Scope", destService: "Destination Service", destServiceInstance: "Destination Service Instance", diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index de5505eb..b16c8f1e 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -213,6 +213,7 @@ const msg = { timeRange: "Rango de Tiempo", duration: "Duración", startTime: "Hora Inicio", + recoveryTime: "Tiempo Recuperación", start: "Incio", spans: "Lapso", spanInfo: "Info Lapso", @@ -324,6 +325,7 @@ const msg = { message: "Mensaje", tooltipsContent: "Contenido de Información de Herramienta", alarmDetail: "Detalle Alarma", + recoveredAt: "Recuperado En", scope: "Alcance", destService: "Servicio Destinación", destServiceInstance: "Instancia Servicio Destinación", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 22ffccd4..d0957acf 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -216,6 +216,7 @@ const msg = { timeRange: "时间范围", duration: "持续时间", startTime: "开始时间", + recoveryTime: "恢复时间", start: "起始点", spans: "跨度", spanInfo: "跨度信息", @@ -324,6 +325,7 @@ const msg = { message: "信息", tooltipsContent: "提示内容", alarmDetail: "警告详情", + recoveredAt: "恢复于", scope: "范围", destService: "终点服务", destServiceInstance: "终点实例", diff --git a/src/types/alarm.ts b/src/types/alarm.ts index df791ca2..6e7f4530 100644 --- a/src/types/alarm.ts +++ b/src/types/alarm.ts @@ -24,6 +24,7 @@ export interface Alarm { message: string; key: string; startTime: string; + recoveryTime: string; scope: string; tags: Array<{ key: string; value: string }>; events: Event[]; diff --git a/src/views/alarm/Content.vue b/src/views/alarm/Content.vue index aee06071..a8dafff5 100644 --- a/src/views/alarm/Content.vue +++ b/src/views/alarm/Content.vue @@ -37,6 +37,9 @@ limitations under the License. -->
{{ dateFormat(parseInt(i.startTime)) }}
+
+ {{ t("recoveredAt") }} {{ dateFormat(parseInt(i.recoveryTime)) }} +
{{ t("noData") }}
@@ -53,6 +56,9 @@ limitations under the License. --> {{ dateFormat(currentDetail[item.label]) }} + + {{ currentDetail[item.label] ? dateFormat(currentDetail[item.label]) : "" }} +
{{ d }}
diff --git a/src/views/alarm/data.ts b/src/views/alarm/data.ts index 22701308..b53186a8 100644 --- a/src/views/alarm/data.ts +++ b/src/views/alarm/data.ts @@ -40,6 +40,10 @@ export const AlarmDetailCol = [ label: "startTime", value: "startTime", }, + { + label: "recoveryTime", + value: "recoveryTime", + }, { label: "tags", value: "tags",