From 6aba266b3cf20c8caa41fd246772ebc344051df8 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Wed, 15 Nov 2017 16:38:31 +0800
Subject: Fix monitor display bugs

Change-Id: I14e0e35331049d480beed1fdf721df1bf81dd4ba
Issue-Id: USECASEUI-54
Signed-off-by: shentao <shentao@chinamobile.com>
---
 .../scripts/controller/alarm-chartController.js      | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js')

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 () {
-- 
cgit 1.2.3-korg