diff --git a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html index 6e375e36a67..b8973666912 100644 --- a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html +++ b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html @@ -17,155 +17,159 @@ ~ under the License. --> - -
-
-

ID

-

{{ monitorId }}

-
-
-

{{ 'monitors.detail.name' | i18n }}

-

{{ monitor.name }}

-
-
-

HOST

-

{{ monitor.host }}

-
-
-

{{ 'monitors.detail.port' | i18n }}

-

{{ port }}

-
-
-

{{ 'monitors.detail.description' | i18n }}

-

{{ monitor.description }}

-
-
-

{{ 'monitors.detail.status' | i18n }}

-
- - - {{ 'monitor.status.paused' | i18n }} - - - - {{ 'monitor.status.up' | i18n }} - - - - {{ 'monitor.status.down' | i18n }} - + + + + +
+
+

ID

+

{{ monitorId }}

+
+
+

{{ 'monitors.detail.name' | i18n }}

+

{{ monitor.name }}

+
+
+

HOST

+

{{ monitor.host }}

+
+
+

{{ 'monitors.detail.port' | i18n }}

+

{{ port }}

+
+
+

{{ 'monitors.detail.description' | i18n }}

+

{{ monitor.description }}

+
+
+

{{ 'monitors.detail.status' | i18n }}

+
+ + + {{ 'monitor.status.paused' | i18n }} + + + + {{ 'monitor.status.up' | i18n }} + + + + {{ 'monitor.status.down' | i18n }} + +
+
+
+

{{ 'monitor.intervals' | i18n }}

+

{{ monitor.intervals }}s

+
+
+

{{ 'common.new-time' | i18n }}

+

{{ monitor.gmtCreate | date : 'YYYY-MM-dd HH:mm:ss' }}

+
+
+

{{ 'common.edit-time' | i18n }}

+

{{ monitor.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss' }}

-
-

{{ 'monitor.intervals' | i18n }}

-

{{ monitor.intervals }}s

-
-
-

{{ 'common.new-time' | i18n }}

-

{{ monitor.gmtCreate | date : 'YYYY-MM-dd HH:mm:ss' }}

-
-
-

{{ 'common.edit-time' | i18n }}

-

{{ monitor.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss' }}

-
-
- - - - - {{ 'monitor.app.' + app + '.metrics.' + metrics + '.metric.' + field.name | i18nElse : field.name }} - - - - - - - - - {{ value.origin }} - {{ 'monitors.detail.value.null' | i18n }} - {{ fields[i].unit }} - - - - - - - - - {{ 'common.name' | i18n }} - {{ 'common.value' | i18n }} - - - - - - {{ 'monitor.app.' + app + '.metrics.' + metrics + '.metric.' + field.name | i18nElse : field.name }} - - {{ rowValues[i].origin }} - {{ 'monitors.detail.value.null' | i18n }} - {{ field.unit }} - - - - - + + + + + {{ 'monitor.app.' + app + '.metrics.' + metrics + '.metric.' + field.name | i18nElse : field.name }} + + + + + + + + + {{ value.origin }} + {{ 'monitors.detail.value.null' | i18n }} + {{ fields[i].unit }} + + + + + + + + + {{ 'common.name' | i18n }} + {{ 'common.value' | i18n }} + + + + + + {{ 'monitor.app.' + app + '.metrics.' + metrics + '.metric.' + field.name | i18nElse : field.name }} + + {{ rowValues[i].origin }} + {{ 'monitors.detail.value.null' | i18n }} + {{ field.unit }} + + + + + +

@@ -178,10 +182,41 @@ -

- - - {{ 'monitors.collect.time' | i18n }}: {{ time | _date : 'HH:mm:ss' }} - +
+
+ + + {{ 'monitors.collect.time' | i18n }}: {{ time | _date : 'HH:mm:ss' }} + +
+
+ +
+
+ + + +
+ +
+
+ + + {{ ('monitors.collect.time.tip' | i18n) + ': ' + (time | _date : 'yyyy-MM-dd HH:mm:ss') }} + +
+
+
+ + + diff --git a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.ts b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.ts index a268d5bfeda..a2a66783670 100644 --- a/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.ts +++ b/web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.ts @@ -53,6 +53,7 @@ export class MonitorDataTableComponent implements OnInit { @Input() height: string = '100%'; + showModal!: boolean; time!: any; fields!: any[]; valueRows!: any[];