Fix monitor bug about alarm display

Change-Id: I95d6740351745d772d29b98d6c58e142a0c34b84
Issue-ID: USECASEUI-101
Signed-off-by: shentao <shentao@chinamobile.com>

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 0173767..a533ac2 100644 (file)
--- 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
@@ -21,6 +21,7 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
             alarmDetailId = value;
             var obj = $("#lm");
             angular.element(obj).scope().currentTab = "app/uui/fusion/scripts/view-models/alarm-details.html";
+            s
         };
         $scope.toChart = function () {
             var obj = $("#lm");
@@ -41,12 +42,12 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
 
         // li的数据
         $scope.open = [{
-                id: 1,
+                id: 'active',
                 name: 'Active',
                 count: 0
             },
             {
-                id: 2,
+                id: 'close',
                 name: 'Closed',
                 count: 0
             },
@@ -93,6 +94,7 @@ app.controller('pipeAlarmCtrl', ['$scope', 'ResourceAlarm', '$interval', functio
 
     $scope.selectOpen = function (v, func) {
         $scope.vfstatus = typeof (v) == "undefined" ? "null" : v;
+        $scope.tableState.pagination.start = 0;
         $scope.selectedOpen = v;
         func($scope.tableState);
     };

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/topological.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/topological.js
index 8e4731e..a63e964 100644 (file)
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/topological.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/topological.js
@@ -26,7 +26,7 @@ app.controller('devicetopologicalCtrl', ['$scope', '$http', function ($scope, $h
 
     function node(x, y, img, name, zIndex) {
       var node = new JTopo.Node(name);
-      node.setImage('/app/uui/fusion/images/' + img, true);
+      node.setImage('/iui/usecaseui/app/uui/fusion/images/' + img, true);
       node.setLocation(x, y);
       node.zIndex = zIndex;
       scene.add(node);
@@ -62,13 +62,13 @@ app.controller('devicetopologicalCtrl', ['$scope', '$http', function ($scope, $h
     container.borderRadius = 200;
     container.setBound(0, 0, 300, 300);
     container.dragble = false;
-    container.background = '/app/uui/fusion/images/cloud_r.png';
+    container.background = '/iui/usecaseui/app/uui/fusion/images/cloud_r.png';
 
     var container2 = new JTopo.Container()
     container2.borderRadius = 200;
     container2.setBound(0, 0, 300, 300);
     container2.dragble = false;
-    container2.background = '/app/uui/fusion/images/cloud_r.png';
+    container2.background = '/iui/usecaseui/app/uui/fusion/images/cloud_r.png';
 
     var routerX = width / 2 - 40;
     var routerY = height / 2;

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 3e45f23..b256c62 100644 (file)
--- 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
@@ -82,8 +82,6 @@
                 <button ng-click="toChart()" class="btn btn-primary">Chart</button>
             </div>
         </div>
-
-
         <div>
             <table class="table" st-pipe="amc.callServer" st-table="amc.displayed">
                 <thead>
@@ -104,7 +102,7 @@
                         <td>{{row.alarmsHeader.sourceName}}</td>
                         <td>{{row.alarmsHeader.priority}}</td>
                         <td>{{row.alarmsHeader.createTime}}</td>
-                        <td>{{row.alarmsHeader.status == 1?"Active":"Closed"}}</td>
+                        <td>{{row.alarmsHeader.status}}</td>
                         <td>
                             <button ng-click="jump(row.alarmsHeader.sourceId)" class="btn btn-primary">Detail</button>
                         </td>