Code Review / usecase-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 38e9a13)
Fix monitor bug about alarm list page 03/29503/1
authorshentao <shentao@chinamobile.com>
Mon, 29 Jan 2018 11:53:34 +0000 (19:53 +0800)
committershentao <shentao@chinamobile.com>
Mon, 29 Jan 2018 11:53:40 +0000 (19:53 +0800)
Change-Id: Ieb55ab7c290160b2129734829f31a9756fdf9788
Issue-ID: USECASEUI-101
Signed-off-by: shentao <shentao@chinamobile.com>
usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/appUUI.js patch | blob | history
usecaseui-monitor/src/main/webapp/app/uui/fusion/scripts/controller/alarmController.js patch | blob | history
usecaseui-monitor/src/main/webapp/index.html patch | blob | history

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 8094710..031cbb5 100644 (file)
--- 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 0acf0d4..0173767 100644 (file)
--- 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 2c4d41c..22de88c 100644 (file)
--- 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>
Graphical User Interface wifor operators and end-users from the point of view of use cases.