diff options
| author |   zhangab <zhanganbing@chinamobile.com> | 2018-05-31 10:35:19 +0800 |
|---|---|---|
| committer | zhangab <zhanganbing@chinamobile.com> | 2018-05-31 10:35:27 +0800 |
| commit | a3be3e341d242b8544e0f75f6bd067d9eb481df6 (patch) | |
| tree | 3450b228297949e7c7dda6e6165607c3619cd76c /usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models | |
| parent | ed95800538cd31cc60aa5ea055ec2d3939432607 (diff) | |
modify alarm time display
Change-Id: Ic5c5a7657f7aa0be1b5eea071fc85a06681258bb
Issue-ID: USECASEUI-124
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models')
| -rw-r--r-- | usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html | 10 | ||||
| -rw-r--r-- | usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html index 6711749f..dcc6d44a 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm.html @@ -87,11 +87,12 @@ <thead> <tr> <th width="5%">Id</th> - <th width="25%">Event Name</th> - <th width="25%">Source Name</th> + <th width="20%">Event Name</th> + <th width="20%">Source Name</th> <th width="10%">Priority</th> <th width="15%">Start Time</th> - <th width="10%">Status</th> + <th width="15%">Clear Time</th> + <th width="8%">Status</th> <th>Option</th> </tr> </thead> @@ -101,7 +102,8 @@ <td>{{row.alarmsHeader.eventName}}</td> <td>{{row.alarmsHeader.sourceName}}</td> <td>{{row.alarmsHeader.priority}}</td> - <td>{{row.alarmsHeader.createTime}}</td> + <td>{{row.alarmsHeader.startEpochMicrosec || row.alarmsHeader.lastEpochMicroSec | dateformater}}</td> + <td>{{row.alarmsHeader.startEpochMicrosecCleared || row.alarmsHeader.lastEpochMicrosecCleared | dateformater}}</td> <td>{{row.alarmsHeader.status}}</td> <td> <button ng-click="jump(row.alarmsHeader.id)" class="btn btn-primary">Detail</button> diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html index 1a7348a5..11e183cf 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance.html @@ -90,7 +90,7 @@ <td>{{row.performanceHeader.eventName}}</td> <td>{{row.performanceHeader.sourceName}}</td> <td>{{row.performanceHeader.priority}}</td> - <td>{{row.performanceHeader.createTime}}</td> + <td>{{row.performanceHeader.startEpochMicrosec || row.performanceHeader.lastEpochMicrosec | dateformater}}</td> <td> <button ng-click="jump(row.performanceHeader.id)" class="btn btn-primary">Detail</button> </td> |