Fix monitor display bugs

Change-Id: I14e0e35331049d480beed1fdf721df1bf81dd4ba
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>

5 files changed, 67 insertions, 54 deletions

diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js
index 8096d702..5906c42c 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js
@@ -16,6 +16,8 @@
 
 app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window',
     function ($scope, $http, $routeParams, $window) {
+		$scope.goIsShow = false;
+        $scope.chartShow = false;
         $scope.valuess = [];
         $scope.today = function () {
             $scope.startTime = new Date();
@@ -29,7 +31,7 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window',
                     "Authorization": "Basic " + btoa("usecase" + ':' + "usecase")
                 }
             }).then(function successCallback(resp) {
-                console.info(resp);
+                //console.info(resp);
                 $scope.sourceIds = resp.data;
             }, function errorCallback(resp) {
 
@@ -55,13 +57,16 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window',
                     return str.join("&");
                 }
             }).then(function successCallback(resp) {
-                //console.info(resp);
+                console.info(resp);
+                $scope.chartShow = true;
                 if (resp.data.length > 0)
                     for (var i = 0; i < resp.data.length; i++) {
                         $scope.valuess[i] = {};
                         $scope.valuess[i].x = resp.data[i].Time;
                         $scope.valuess[i].y = resp.data[i].Count;
                     }
+                else
+                    $scope.valuess = [];
                 for (var d = 0; d < 5; d++) {
                     window.setTimeout(function () {
                         redraw("_alarm", $scope.valuess);
@@ -72,17 +77,22 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window',
 
             });
         }
-
+		$scope.sourceIdChanged = function(){
+			if ($scope.sourceId != null)
+				$scope.goIsShow = true;
+			else
+				$scope.goIsShow = false;	
+		};
 
         $scope.startTimeChanged = function () {
             if ($scope.startTime > $scope.endTime)
                 $scope.endTime = "";
-            console.info($scope.startTime);
+           // console.info($scope.startTime);
         };
         $scope.endTimeChanged = function () {
             if ($scope.endTime < $scope.startTime)
                 $scope.startTime = "";
-            console.info($scope.endTime);
+           // console.info($scope.endTime);
         };
 
         $scope.open1 = function () {
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
index 65d1fc3d..f0e0605c 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-detailsController.js
@@ -20,30 +20,34 @@ app.controller("alarmDetailsController",function ($scope,$http,$window) {
     };
     $http({
         method : "GET",
-        url : global_url + "/alarm/1/1/null/"+alarmDetailId+"/null/null/null/null"
+        url : global_url + "/alarm/1/1/"+alarmDetailId+"/null/null/null/null/null"
     }).then(function successCallback(resp) {
-        $scope.alarmCondition = resp.data.alarms[0].alarmsHeader.alarmCondition;
-        $scope.alarmInterfaceA = resp.data.alarms[0].alarmsHeader.alarmInterfaceA;
-        $scope.eventCategory = resp.data.alarms[0].alarmsHeader.eventCategory;
-        $scope.eventId = resp.data.alarms[0].alarmsHeader.eventId;
-        $scope.eventName = resp.data.alarms[0].alarmsHeader.eventName;
-        $scope.eventServrity = resp.data.alarms[0].alarmsHeader.eventServrity;
-        $scope.eventSourceType = resp.data.alarms[0].alarmsHeader.eventSourceType;
-        $scope.eventType = resp.data.alarms[0].alarmsHeader.eventType;
-        $scope.faultFieldsVersion = resp.data.alarms[0].alarmsHeader.faultFieldsVersion;
-        $scope.lastEpochMicroSec = resp.data.alarms[0].alarmsHeader.lastEpochMicroSec;
-        $scope.nfNamingCode = resp.data.alarms[0].alarmsHeader.nfNamingCode;
-        $scope.nfcNamingCode = resp.data.alarms[0].alarmsHeader.nfcNamingCode;
-        $scope.priority = resp.data.alarms[0].alarmsHeader.priority;
-        $scope.reportingEntityId = resp.data.alarms[0].alarmsHeader.reportingEntityId;
-        $scope.reportingEntityName = resp.data.alarms[0].alarmsHeader.reportingEntityName;
-        $scope.sequence = resp.data.alarms[0].alarmsHeader.sequence;
-        $scope.sourceId = resp.data.alarms[0].alarmsHeader.sourceId;
-        $scope.sourceName = resp.data.alarms[0].alarmsHeader.sourceName;
-        $scope.specificProblem = resp.data.alarms[0].alarmsHeader.specificProblem;
-        $scope.startEpochMicrosec = resp.data.alarms[0].alarmsHeader.startEpochMicrosec;
-        $scope.startTIme = resp.data.alarms[0].alarmsHeader.createTime;
-        $scope.alarmInformation = resp.data.alarms[0].alarmsInformation;
+        if (resp.data.alarms.length > 0){
+            $scope.alarmCondition = resp.data.alarms[0].alarmsHeader.alarmCondition;
+            $scope.alarmInterfaceA = resp.data.alarms[0].alarmsHeader.alarmInterfaceA;
+            $scope.eventCategory = resp.data.alarms[0].alarmsHeader.eventCategory;
+            $scope.eventId = resp.data.alarms[0].alarmsHeader.eventId;
+            $scope.eventName = resp.data.alarms[0].alarmsHeader.eventName;
+            $scope.eventServrity = resp.data.alarms[0].alarmsHeader.eventServrity;
+            $scope.eventSourceType = resp.data.alarms[0].alarmsHeader.eventSourceType;
+            $scope.eventType = resp.data.alarms[0].alarmsHeader.eventType;
+            $scope.faultFieldsVersion = resp.data.alarms[0].alarmsHeader.faultFieldsVersion;
+            $scope.lastEpochMicroSec = resp.data.alarms[0].alarmsHeader.lastEpochMicroSec;
+            $scope.nfNamingCode = resp.data.alarms[0].alarmsHeader.nfNamingCode;
+            $scope.nfcNamingCode = resp.data.alarms[0].alarmsHeader.nfcNamingCode;
+            $scope.priority = resp.data.alarms[0].alarmsHeader.priority;
+            $scope.reportingEntityId = resp.data.alarms[0].alarmsHeader.reportingEntityId;
+            $scope.reportingEntityName = resp.data.alarms[0].alarmsHeader.reportingEntityName;
+            $scope.sequence = resp.data.alarms[0].alarmsHeader.sequence;
+            $scope.sourceId = resp.data.alarms[0].alarmsHeader.sourceId;
+            $scope.sourceName = resp.data.alarms[0].alarmsHeader.sourceName;
+            $scope.specificProblem = resp.data.alarms[0].alarmsHeader.specificProblem;
+            $scope.startEpochMicrosec = resp.data.alarms[0].alarmsHeader.startEpochMicrosec;
+            $scope.startTIme = resp.data.alarms[0].alarmsHeader.createTime;
+            $scope.alarmInformation = resp.data.alarms[0].alarmsInformation;
+        }else {
+            alert("No Data!");
+        }
     },function errorCallback(resq) {
 
     });
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 fccecb66..f5e92b50 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
@@ -70,14 +70,13 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv
                 {
                     field: 'alarmsHeader.eventName',
                     displayName: 'eventName',
-                    cellTemplate: '<a ng-click="grid.appScope.jump(row.entity.alarmsHeader.eventName)"; style="cursor:pointer" href="">{{row.entity.alarmsHeader.eventName}}</a>',
-                    width : 500,
+                    width : '10%',
                     enableHiding: false,
                     suppressRemoveSort: true,
                     enableCellEdit: false
                 },
                 {field: "alarmsHeader.eventId", displayName: 'eventId', enableCellEdit: false},
-                {field: "alarmsHeader.sourceId", displayName: 'Source Id', enableCellEdit: false},
+                {field: "alarmsHeader.sourceId", displayName: 'Source Id', enableCellEdit: false,cellTemplate: '<a ng-click="grid.appScope.jump(row.entity.alarmsHeader.sourceId)"; style="cursor:pointer" href="">{{row.entity.alarmsHeader.sourceId}}</a>'},
                 {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},
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-chartController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-chartController.js
index b96abb95..39845e87 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-chartController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-chartController.js
@@ -16,8 +16,7 @@
 
 app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
     function ($scope, $http, $routeParams, $window) {
-        $scope.sourceIds = ["112","119","101"];
-        $scope.namePs = [];
+		$scope.chartShow = false;
         $scope.valuess = [];
         $scope.namesPIsShow = false;
         $scope.namesCIsShow = false;
@@ -30,8 +29,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
                 url : global_url+"/performance/resourceIds",
                 headers: {
                     'Access-Control-Allow-Origin': "*",
-                    "Content-Type": "application/json",
-                    "Authorization": "Basic " + btoa("usecase" + ':' + "usecase")
+                    "Content-Type": "application/json"
                 }
             }).then(function successCallback(resp) {
                 $scope.sourceIds = resp.data;
@@ -69,6 +67,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
 
                 }).then(function successCallback(resp) {
                     $scope.namePs = resp.data;
+                    $scope.nameP = null;
                 },function errorCallback(resq) {
 
                 });
@@ -96,14 +95,8 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
                         return str.join("&");
                     }
                 }).then(function successCallback(resp) {
-                    if (resp.data.length <= 0){
-                        $scope.namesCIsShow = false;
-                        $scope.goIsShow = true;
-                    }else{
-                        $scope.namesCIsShow = true;
-                        $scope.goIsShow = false;
-                        $scope.nameCs = resp.data;
-                    }
+                    $scope.goIsShow = true;
+                    $scope.chartShow = true;
                 },function errorCallback(resq) {
 
                 });
@@ -135,6 +128,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
                 }
             }).then(function successCallback(resp) {
                 console.info(resp.data);
+				chartShow = true;
                 if (resp.data.length > 0)
                     for (var i = 0 ; i<resp.data.length ; i++){
                         $scope.valuess[i] = {};
@@ -142,6 +136,8 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' ,
                         $scope.valuess[i].y = resp.data[i];
                         $scope.valuess[i].x.length = i;
                     }
+                else
+                    $scope.valuess = [];
                 for (var d = 0; d < 5; d++) {
                     window.setTimeout(function () {
                         redraw("_performance", $scope.valuess);
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
index ca87a4af..78330285 100644
--- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
+++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performance-detailsController.js
@@ -22,17 +22,21 @@ app.controller("performanceDetailsController",function ($scope,$http,$window) {
         method : "GET",
         url : global_url + "/performance/1/1/"+permanceId+"/null/null/null/null"
     }).then(function successCallback(resp) {
-        $scope.eventName = resp.data.performances[0].performanceHeader.eventName;
-        $scope.eventId = resp.data.performances[0].performanceHeader.eventId;
-        $scope.sourceId = resp.data.performances[0].performanceHeader.sourceId;
-        $scope.sourceName = resp.data.performances[0].performanceHeader.sourceName;
-        $scope.reportingEntityId = resp.data.performances[0].performanceHeader.reportingEntityId;
-        $scope.reportingEntityName = resp.data.performances[0].performanceHeader.reportingEntityName;
-        $scope.priority = resp.data.performances[0].performanceHeader.priority;
-        $scope.createTime = resp.data.performances[0].performanceHeader.createTime;
-        $scope.nfcNamingCode = resp.data.performances[0].performanceHeader.nfcNamingCode;
-        $scope.nfNamingCode = resp.data.performances[0].performanceHeader.nfNamingCode;
-        $scope.performanceInformation = resp.data.performances[0].performanceInformation;
+       if (resp.data.performances.length > 0){
+           $scope.eventName = resp.data.performances[0].performanceHeader.eventName;
+           $scope.eventId = resp.data.performances[0].performanceHeader.eventId;
+           $scope.sourceId = resp.data.performances[0].performanceHeader.sourceId;
+           $scope.sourceName = resp.data.performances[0].performanceHeader.sourceName;
+           $scope.reportingEntityId = resp.data.performances[0].performanceHeader.reportingEntityId;
+           $scope.reportingEntityName = resp.data.performances[0].performanceHeader.reportingEntityName;
+           $scope.priority = resp.data.performances[0].performanceHeader.priority;
+           $scope.createTime = resp.data.performances[0].performanceHeader.createTime;
+           $scope.nfcNamingCode = resp.data.performances[0].performanceHeader.nfcNamingCode;
+           $scope.nfNamingCode = resp.data.performances[0].performanceHeader.nfNamingCode;
+           $scope.performanceInformation = resp.data.performances[0].performanceInformation;
+       }else {
+           alert("No Data");
+       }
     },function errorCallback(resq) {
 
     });