Modify RuleList and RuleInfo

modify some issue and add 2 file for package

Issue-ID:CLIENT-151

Change-Id: I86878b22f723592c3d6bf8c8d6d980ebe22be241
Signed-off-by: YILI <li.yi101@zte.com.cn>

diff --git a/alarm-analysis/src/main/webapp/alarm/app/app.routing.ts b/alarm-analysis/src/main/webapp/alarm/app/app.routing.ts
index 173d533..423f5f2 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/app.routing.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/app.routing.ts
@@ -37,4 +37,4 @@ const appRoutes: Routes = [
     },\r
 \r
 ];\r
-export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);\r
+export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes,{ useHash: true });\r

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html
index b294cd0..b0b811c 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html
@@ -19,7 +19,7 @@
 \r
             <div class="row form-group col-xs-12 ">\r
                 <label for="userName" class="col-xs-2 col-form-label labelstyle">\r
-                        <span>{{"field_rule_name"|translate}}</span>\r
+                        <span>{{"field_rule_name_Add_Page"|translate}}</span>\r
                         <span style="color: red">*</span>\r
                     </label>\r
                 <div class="col-xs-6" style="margin-left: -100px">\r

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html
index f2acebd..3a259fd 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html
@@ -31,7 +31,7 @@
                     <label for="userName" class="col-xs-3 control-label" style="padding-top: 8px">\r
                         <span>{{"common_keyword"|translate}}</span>\r
                     </label>\r
-                    <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name"|translate}}'\r
+                    <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name_Add_Page"|translate}}'\r
                         type="text" [(ngModel)]="ruleModel.rulename" name="name">\r
                 </div>\r
 \r
@@ -67,7 +67,7 @@
         <table class="table table-bordered table-striped customtable table-hover">\r
             <thead class="nf_thead">\r
                 <tr class="heading">\r
-                    <td>{{"field_rule_name"|translate}}</td>\r
+                    <td>{{"field_rule_name_Add_Page"|translate}}</td>\r
                     <td>{{"common_status"|translate}}</td>\r
                     <td>{{"field_create_time"|translate}}</td>\r
                     <td>{{"field_creator"|translate}}</td>\r
@@ -111,12 +111,12 @@
                 <span>{{"message_is_delete"|translate}}</span>\r
             </div>\r
             <div style="float:rightl;padding-top: 10px;margin-bottom: -20px" class="">\r
-                <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">\r
-                    <span>{{"common_cancel"|translate}}</span>\r
-                </button>\r
                 <button class="btn btnDefault btnmrg" data-popmodal-but="ok">\r
                     <span>{{"common_confirm"|translate}}</span>\r
                 </button>\r
+                 <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">\r
+                    <span>{{"common_cancel"|translate}}</span>\r
+                </button>\r
             </div>\r
         </div>\r
     </div>\r

diff --git a/alarm-analysis/src/main/webapp/alarm/index.html b/alarm-analysis/src/main/webapp/alarm/index.html
index 9762df6..094e972 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/index.html
+++ b/alarm-analysis/src/main/webapp/alarm/index.html
@@ -15,19 +15,28 @@
 -->\r
 <!DOCTYPE html>\r
 <html>\r
+\r
 <head>\r
-    <base href="/iui/LY-Correlation/">\r
+    <base href="/holmes/">\r
     <meta charset="UTF-8">\r
     <meta name="viewport" content="width=device-width, initial-scale=1">\r
-    <script src="public/thirdparty/js/jquery_1.12.4.min.js"></script>\r
-    <script src="public/common/js/popModal.js"></script>\r
-    <script src="public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>\r
-    <script src="public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>\r
-    <script src="public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>\r
-    <script src="public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>\r
-    \r
-<body style="overflow: auto">\r
-<remote-config>Loading...</remote-config>\r
-\r
-</body>\r
-</html>\r
+    <!--<script src="../public/thirdparty/js/jquery_1.12.4.min.js"></script>\r
+    <script src="../public/common/js/popModal.js"></script>\r
+    <script src="../public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>\r
+    <script src="../public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>\r
+    <script src="../public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>\r
+    <script src="../public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>-->\r
+\r
+    <script src="./public/js/jquery_1.12.4.min.js"></script>\r
+    <script src="./public/js/popModal.js"></script>\r
+    <script src="./public/js/jquery.ui.widget.js"></script>\r
+    <script src="./public/js/jquery.ui.widget.js"></script>\r
+    <script src="./public/js/jquery.iframe-transport.js"></script>\r
+    <script src="./public/js/jquery.fileupload.js"></script>\r
+\r
+    <body style="overflow: auto">\r
+        <remote-config>Loading...</remote-config>\r
+\r
+    </body>\r
+\r
+</html>
\ No newline at end of file

diff --git a/alarm-analysis/src/main/webapp/alarm/main.browser.ts b/alarm-analysis/src/main/webapp/alarm/main.browser.ts
new file mode 100644 (file)
index 0000000..b7bcae7
--- /dev/null
+++ b/alarm-analysis/src/main/webapp/alarm/main.browser.ts
@@ -0,0 +1,20 @@
+/* Copyright 2017 ZTE Corporation.\r
+ *\r
+ *Licensed under the Apache License, Version 2.0 (the "License");\r
+ *you may not use this file except in compliance with the License.\r
+ *You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';\r
+\r
+import { AppModule } from './app/app.module';\r
+const platform = platformBrowserDynamic();\r
+\r
+platform.bootstrapModule(AppModule);\r

diff --git a/alarm-analysis/src/main/webapp/alarm/main.ts b/alarm-analysis/src/main/webapp/alarm/main.ts
index e2da65e..e5dcf1c 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/main.ts
+++ b/alarm-analysis/src/main/webapp/alarm/main.ts
@@ -14,7 +14,7 @@
  */\r
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';\r
 import { enableProdMode } from '@angular/core';\r
-import { AppModule } from './app/app.module';\r
+import {AppModule } from './app/app.module';\r
 if (process.env.ENV === 'production') {\r
     enableProdMode();\r
 }\r

diff --git a/alarm-analysis/src/main/webapp/alarm/polyfills.browser.ts b/alarm-analysis/src/main/webapp/alarm/polyfills.browser.ts
new file mode 100644 (file)
index 0000000..7f603f4
--- /dev/null
+++ b/alarm-analysis/src/main/webapp/alarm/polyfills.browser.ts
@@ -0,0 +1,43 @@
+/* Copyright 2017 ZTE Corporation.\r
+ *\r
+ *Licensed under the Apache License, Version 2.0 (the "License");\r
+ *you may not use this file except in compliance with the License.\r
+ *You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+import 'ie-shim'; // Internet Explorer 9 support\r
+\r
+// import 'core-js/es6';\r
+// Added parts of es6 which are necessary for your project or your browser support requirements.\r
+\r
+import 'core-js/es6/symbol';\r
+import 'core-js/es6/object';\r
+import 'core-js/es6/function';\r
+import 'core-js/es6/parse-int';\r
+import 'core-js/es6/parse-float';\r
+import 'core-js/es6/number';\r
+import 'core-js/es6/math';\r
+import 'core-js/es6/string';\r
+import 'core-js/es6/date';\r
+import 'core-js/es6/array';\r
+import 'core-js/es6/regexp';\r
+import 'core-js/es6/map';\r
+import 'core-js/es6/set';\r
+import 'core-js/es6/weak-map';\r
+import 'core-js/es6/weak-set';\r
+import 'core-js/es6/typed';\r
+import 'core-js/es6/reflect';\r
+// see issue https://github.com/AngularClass/angular2-webpack-starter/issues/709\r
+// import 'core-js/es6/promise';\r
+\r
+import 'core-js/es7/reflect';\r
+import 'zone.js/dist/zone';\r
+import 'zone.js/dist/long-stack-trace-zone';\r

diff --git a/alarm-analysis/src/main/webapp/alarm/vendor.ts b/alarm-analysis/src/main/webapp/alarm/vendor.ts
index 6ef97c2..d130e9d 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/vendor.ts
+++ b/alarm-analysis/src/main/webapp/alarm/vendor.ts
@@ -21,7 +21,7 @@ import '@angular/router';
 import 'angular-in-memory-web-api';
 import 'rxjs';
 
-
+import '../public/thirdparty/js/jquery_1.12.4.min.js';
 import '../public/thirdparty/css/bootstrap.min.css';
 import '../public/thirdparty/css/magic-check.css';
 import '../public/thirdparty/css/zTreeStyle.css';
@@ -32,7 +32,7 @@ import '../public/thirdparty/js/bootstrap.min.js';
 import '../public/thirdparty/js/bootstrap-table.min.js';
 import '../public/thirdparty/js/bootstrap-table-filter-control.min.js';
 import '../public/thirdparty/js/jquery.ztree.core-3.5.js';
-import '../public/thirdparty/js/jquery_1.12.4.min.js';
+
 import '../public/thirdparty/js/mustache.js';