diff options
Diffstat (limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js')
| -rw-r--r-- | usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarm-chartController.js | 118 |
1 files changed, 90 insertions, 28 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 5906c42c..9153cc40 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,9 +16,11 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', function ($scope, $http, $routeParams, $window) { - $scope.goIsShow = false; - $scope.chartShow = false; + $scope.chartShow = false; $scope.valuess = []; + $scope.ndaShow = false; + $scope.hdaShow = false; + $scope.sourceId = ""; $scope.today = function () { $scope.startTime = new Date(); $scope.endTime = new Date(); @@ -27,11 +29,9 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', url: global_url + "/alarm/sourceId", headers: { 'Access-Control-Allow-Origin': "*", - "Content-Type": "application/json", - "Authorization": "Basic " + btoa("usecase" + ':' + "usecase") + "Content-Type": "application/json" } }).then(function successCallback(resp) { - //console.info(resp); $scope.sourceIds = resp.data; }, function errorCallback(resp) { @@ -39,6 +39,64 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', }; $scope.today(); + $scope.options = { + chart: { + type: 'historicalBarChart', + height: 300, + margin : { + top: 20, + right: 20, + bottom: 65, + left: 50 + }, + x: function(d){return d[0];}, + y: function(d){return d[1];}, + showValues: true, + valueFormat: function(d){ + return d3.format(',.1f')(d); + }, + duration: 100, + xAxis: { + //axisLabel: 'X Axis', + tickFormat: function(d) { + return d3.time.format('%x %H:%M')(new Date(d)) + }, + rotateLabels: 30, + showMaxMin: true + }, + yAxis: { + //axisLabel: 'Y Axis', + axisLabelDistance: -10, + tickFormat: function(d){ + return d3.format(',.1f')(d); + } + }, + tooltip: { + keyFormatter: function(d) { + return d3.time.format('%x %H:%M')(new Date(d)); + } + }, + zoom: { + enabled: true, + scaleExtent: [1, 10], + useFixedDomain: false, + useNiceScale: false, + horizontalOff: false, + verticalOff: true, + unzoomEventType: 'dblclick.zoom' + } + } + }; + + + $scope.data = [ + { + "key" : "Quantity" , + "bar": true, + "values" : [] + }]; + + $scope.genDiagram = function () { $http({ method: 'POST', @@ -46,7 +104,8 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', data: { "sourceId": $scope.sourceId, "startTime": FormatDate($scope.startTime), - "endTime": FormatDate($scope.endTime) + "endTime": FormatDate($scope.endTime), + "showMode" : ($scope.showModeId==undefined?"auto":$scope.showModeId) }, headers: {'Content-Type': 'application/x-www-form-urlencoded'}, transformRequest: function (obj) { @@ -57,42 +116,43 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', return str.join("&"); } }).then(function successCallback(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); - }, 1500); - }; + if (resp.data.length > 0){ + $scope.ndaShow = false; + $scope.hdaShow = true; + $scope.data = [ + { + "key" : "Max" , + "bar": true, + "values" : resp.data + }]; + $scope.api.refresh(); + } + else{ + $scope.ndaShow = true; + $scope.hdaShow = false; + $scope.data = [ + { + "key" : "Max" , + "bar": true, + "values" : [] + }]; + $scope.api.refresh(); + } + }, function errorCallback(resp) { }); } - $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); }; $scope.endTimeChanged = function () { if ($scope.endTime < $scope.startTime) $scope.startTime = ""; - // console.info($scope.endTime); }; $scope.open1 = function () { @@ -111,6 +171,8 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', opened: false }; + $scope.showModeIds = ["minute","hour","day","month","year"]; + function FormatDate(strTime) { var date = new Date(strTime); return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes(); |