summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshentao <shentao@chinamobile.com>2018-01-29 19:53:34 +0800
committershentao <shentao@chinamobile.com>2018-01-29 19:53:40 +0800
commit17767ccc8bef6d2a6116f754a5ec4841eb72a1e8 (patch)
tree7146d916dd5234d419bf558f84b93d7b374cd05f
parent38e9a13577863ec33962aa52885250845b40be98 (diff)
Fix monitor bug about alarm list page
Change-Id: Ieb55ab7c290160b2129734829f31a9756fdf9788 Issue-ID: USECASEUI-101 Signed-off-by: shentao <shentao@chinamobile.com>
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js3
-rw-r--r--usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js1
-rw-r--r--usecaseui-monitor/src/main/webapp/index.html7
3 files changed, 6 insertions, 5 deletions
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 @@
<script src="app/uui/fusion/scripts/controller/topology-diagram.js"></script>
<script src="app/uui/fusion/scripts/controller/topological.js"></script>
-
<link rel="stylesheet" href="app/uui/fusion/nvd3/nv.d3.min.css">
<script src="app/uui/fusion/nvd3/angular-nvd3.js"></script>
<script src="app/uui/fusion/nvd3/d3.min.js"></script>
<script src="app/uui/fusion/nvd3/nv.d3.min.js"></script>
- <title></title>
+ <script src="app/uui/fusion/scripts/controller/lcmController.js"></script>
+ <script src="app/uui/fusion/scripts/controller/ServiceTemplateService.js"></script>
+ <script src="static/fusion/js/lifecyclemanager.js" ></script>
+
+ <title></title>
</head>
<body>