From 704c19c2fef0beb4b0d19081fcb72b4d945eb257 Mon Sep 17 00:00:00 2001 From: zhangab Date: Fri, 25 May 2018 19:15:03 +0800 Subject: fix scaling progress display bug Change-Id: I60edb3c467ed46bb9e948837f537e06fed8b1aec Issue-ID: USECASEUI-119 Signed-off-by: zhangab --- .../webapp/app/uui/fusion/scripts/controller/alarm-chartController.js | 4 ++-- .../webapp/app/uui/fusion/scripts/controller/left-menuController.js | 2 +- .../app/uui/fusion/scripts/controller/performance-chartController.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'usecaseui-monitor/src/main/webapp/app') 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 d064f311..c98336e0 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 @@ -159,7 +159,7 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', var options = { tooltip: { trigger: 'axis', - formatter: (params) => { + formatter: function(params) { var res = '

' + params[0].name + '

' + '
'; // console.log(params); for (var i = 0; i < params.length; i++) { @@ -189,7 +189,7 @@ app.controller('alarmchartCtrl', ['$scope', '$http', '$routeParams', '$window', boundaryGap: false, data: data.dateList, axisLabel:{ - formatter:(value)=>{ + formatter:function(value){ if($scope.showModeId == 'day'){ return value.slice(5,10) }else if($scope.showModeId == 'hour'){ diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/left-menuController.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/left-menuController.js index 93608a69..135ed768 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/left-menuController.js +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/left-menuController.js @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -var currentTab = 'app/uui/fusion/scripts/view-models/performance.html'; +var currentTab = 'app/uui/fusion/scripts/view-models/lifecyclemanagement.html'; app.controller('cmCtrl', ['$scope', function ($scope) { $scope.routeData = [{ 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 6d9c36a7..21363ff0 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 @@ -211,7 +211,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' , var options = { tooltip: { trigger: 'axis', - formatter: (params) => { + formatter: function(params){ var res = '

' + params[0].name + '

' + '
'; // console.log(params); for (var i = 0; i < params.length; i++) { @@ -241,7 +241,7 @@ app.controller('pertabCtrl', ['$scope', '$http', '$routeParams', '$window' , boundaryGap: true, data: data.dateList, axisLabel:{ - formatter:(value)=>{ + formatter:function(value){ if($scope.showModeId == 'day'){ return value.slice(5,10) }else if($scope.showModeId == 'hour'){ -- cgit 1.2.3-korg