From 17767ccc8bef6d2a6116f754a5ec4841eb72a1e8 Mon Sep 17 00:00:00 2001 From: shentao Date: Mon, 29 Jan 2018 19:53:34 +0800 Subject: Fix monitor bug about alarm list page Change-Id: Ieb55ab7c290160b2129734829f31a9756fdf9788 Issue-ID: USECASEUI-101 Signed-off-by: shentao --- usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js | 3 +-- .../webapp/app/uui/fusion/scripts/controller/alarmController.js | 1 - usecaseui-monitor/src/main/webapp/index.html | 7 +++++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'usecaseui-monitor/src/main') diff --git a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js index 8094710c..031cbb5f 100644 --- a/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js +++ b/usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js @@ -36,5 +36,4 @@ app.config(function ($routeProvider) { }); // 请求数据地址 -// var global_url = "http://localhost:8082/api/usecaseui/server/v1"; -var global_url = "http://10.73.233.207:8082/api/usecaseui/server/v1"; \ No newline at end of file +var global_url = "/api/usecaseui-server/v1"; 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 0acf0d41..01737677 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 @@ -21,7 +21,6 @@ app.controller('alarmGridCtrl', ['$scope', '$log', '$http', '$timeout', '$interv alarmDetailId = value; var obj = $("#lm"); angular.element(obj).scope().currentTab = "app/uui/fusion/scripts/view-models/alarm-details.html"; - s }; $scope.toChart = function () { var obj = $("#lm"); diff --git a/usecaseui-monitor/src/main/webapp/index.html b/usecaseui-monitor/src/main/webapp/index.html index 2c4d41c3..22de88c8 100644 --- a/usecaseui-monitor/src/main/webapp/index.html +++ b/usecaseui-monitor/src/main/webapp/index.html @@ -53,13 +53,16 @@ - - + + + + + -- cgit 1.2.3-korg