diff options
author | zhangab <zhanganbing@chinamobile.com> | 2018-05-31 10:35:19 +0800 |
---|---|---|
committer | zhangab <zhanganbing@chinamobile.com> | 2018-05-31 10:35:27 +0800 |
commit | a3be3e341d242b8544e0f75f6bd067d9eb481df6 (patch) | |
tree | 3450b228297949e7c7dda6e6165607c3619cd76c /usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js | |
parent | ed95800538cd31cc60aa5ea055ec2d3939432607 (diff) |
modify alarm time display
Change-Id: Ic5c5a7657f7aa0be1b5eea071fc85a06681258bb
Issue-ID: USECASEUI-124
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js')
-rw-r--r-- | usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js index cb897a46..6c1e6853 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/performanceController.js @@ -87,6 +87,7 @@ app.controller('pipeCtrl', ['$scope', 'Resource', '$interval', function ($scope, service.getPage(start, number, $scope.seek1 === "" ? "null" : $scope.seek1, $scope.seek2 === "" ? "null" : $scope.seek2, $scope.seek3 === "" ? "null" : $scope.seek3, $scope.seek4 === "" ? "null" : $scope.seek4, $scope.seek5 === "" ? "null" : $scope.seek5).then(function (result) { + console.log(result) ctrl.displayed = result.data; tableState.pagination.numberOfPages = result.numberOfPages; ctrl.isLoading = false; @@ -102,7 +103,6 @@ app.controller('pipeCtrl', ['$scope', 'Resource', '$interval', function ($scope, .factory('Resource', ['$q', '$filter', '$timeout', '$http', function ($q, $filter, $timeout, $http) { var randomsItems = []; var totalCount = 0; - function getPage(start, number) { var url = global_url + '/performance/' + start + '/' + number + ''; url += arguments[2] === "" ? "/null" : "/" + arguments[2]; @@ -165,4 +165,20 @@ app.controller('pipeCtrl', ['$scope', 'Resource', '$interval', function ($scope, }); } } + }).filter('dateformater',function(){ + return function(vmstime){ + if(!vmstime){ + return '' + } + let mstime = Number((vmstime + '').slice(0,13)); + let time = new Date(mstime); + let year = time.getFullYear(); + let month = time.getMonth() + 1; + let day = time.getDate(); + let hours = time.getHours(); + let minutes = time.getMinutes(); + let seconds = time.getSeconds(); + let formattime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds; + return formattime; + } });
\ No newline at end of file |