diff options
| author |   shentao <shentao@chinamobile.com> | 2017-11-16 04:13:45 +0800 |
|---|---|---|
| committer | shentao <shentao@chinamobile.com> | 2017-11-16 04:13:54 +0800 |
| commit | 3e38fb1ed4af0d15e15b7d416902ba52de04c33b (patch) | |
| tree | cd35d950a0b189f6bf8585a47bd637da0b303914 /usecaseui-monitor/src/main/webapp | |
| parent | 6aba266b3cf20c8caa41fd246772ebc344051df8 (diff) | |
Fix monitor display bugs
Change-Id: Ie725cfa14618c6054998ce76c17e123949ce6f11
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>
Diffstat (limited to 'usecaseui-monitor/src/main/webapp')
5 files changed, 6 insertions, 8 deletions
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js index 737ddd77..4fe896d6 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js @@ -34,4 +34,4 @@ app.config(function ($routeProvider) { }) .otherwise({redirectTo: '/common'}) }); -var global_url = "/api/usecaseui/server/v1"; +var global_url = "/api/usecaseui-server/v1"; diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js index f5e92b50..f73785a6 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js @@ -80,10 +80,9 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv {field: "alarmsHeader.sourceName", displayName: 'Source Name', enableCellEdit: false}, {field: "alarmsHeader.reportingEntityId", displayName: 'Reporting Entity Id', enableCellEdit: false}, {field: "alarmsHeader.reportingEntityName", displayName: 'Reporting Entity Name', enableCellEdit: false}, - {field: "alarmsHeader.Priority", displayName: 'Priority', enableCellEdit: false}, {field: "alarmsHeader.createTime", displayName: 'Start Time', enableCellEdit: false}, {field: "alarmsHeader.status", displayName: 'Status', cellFilter: 'mapGender',enableCellEdit: false}, - {field: "option",displayName: 'option', enableCellEdit: false ,cellTemplate: '<button ng-click="grid.appScope.jump(row.entity.alarmsHeader.eventName)" class="btn btn-primary" >Details</button>'}, + {field: "option",displayName: 'option', enableCellEdit: false ,cellTemplate: '<button ng-click="grid.appScope.jump(row.entity.alarmsHeader.sourceId)" class="btn btn-primary" >Details</button>'}, ], enableSorting: true, useExternalSorting: false, diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html index 96cf8460..15cebe57 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/alarm-details.html @@ -95,5 +95,5 @@ </tbody> </table> </div> - + <br><br> </div>
\ No newline at end of file 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 0d83682e..612631d6 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 @@ -17,8 +17,7 @@ <h3>VNF Alarm</h3> <div class="row margin-bottom-20"> </div> - <div class="row margin-bottom-10"> - + <!--div class="row margin-bottom-10"> <div class="col-md-4"> <ul class="nav nav-pills"> <li style="background-color: #ddd" ng-repeat="O in open" @@ -32,7 +31,7 @@ <input type="hidden" ng-model="selectedOpen"/> </ul> </div> - </div> + </div--> <ul class="list"> <li>Source Id <input ng-model="condition1" type="text"/></li> <li>Source Name <input ng-model="condition2" type="text"/></li> diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html index 61c2bc57..f70bba06 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/view-models/performance-details.html @@ -70,5 +70,5 @@ </tbody> </table> </div> - + <br><br> </div>
\ No newline at end of file |