aboutsummaryrefslogtreecommitdiffstats
path: root/alarm-analysis
diff options
context:
space:
mode:
authorYILI <li.yi101@zte.com.cn>2017-03-22 11:36:29 +0800
committer6092002077 <li.yi101@zte.com.cn>2017-03-22 14:40:48 +0800
commit3d2fa1dc4692c869cf54a3c53288f3a5783588b3 (patch)
tree98595c9c84712745779ddb829e203947b3837889 /alarm-analysis
parent074ac4beac7451d74f11f9828e685cb2b3f16c0c (diff)
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>
Diffstat (limited to 'alarm-analysis')
-rw-r--r--alarm-analysis/src/main/webapp/alarm/app/app.routing.ts2
-rw-r--r--alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html2
-rw-r--r--alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.html10
-rw-r--r--alarm-analysis/src/main/webapp/alarm/index.html35
-rw-r--r--alarm-analysis/src/main/webapp/alarm/main.browser.ts20
-rw-r--r--alarm-analysis/src/main/webapp/alarm/main.ts2
-rw-r--r--alarm-analysis/src/main/webapp/alarm/polyfills.browser.ts43
-rw-r--r--alarm-analysis/src/main/webapp/alarm/vendor.ts4
8 files changed, 95 insertions, 23 deletions
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 173d5335..423f5f2f 100644
--- 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 = [
},
];
-export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
+export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes,{ useHash: true });
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 b294cd06..b0b811c3 100644
--- 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 @@
<div class="row form-group col-xs-12 ">
<label for="userName" class="col-xs-2 col-form-label labelstyle">
- <span>{{"field_rule_name"|translate}}</span>
+ <span>{{"field_rule_name_Add_Page"|translate}}</span>
<span style="color: red">*</span>
</label>
<div class="col-xs-6" style="margin-left: -100px">
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 f2acebd2..3a259fda 100644
--- 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">
<span>{{"common_keyword"|translate}}</span>
</label>
- <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name"|translate}}'
+ <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name_Add_Page"|translate}}'
type="text" [(ngModel)]="ruleModel.rulename" name="name">
</div>
@@ -67,7 +67,7 @@
<table class="table table-bordered table-striped customtable table-hover">
<thead class="nf_thead">
<tr class="heading">
- <td>{{"field_rule_name"|translate}}</td>
+ <td>{{"field_rule_name_Add_Page"|translate}}</td>
<td>{{"common_status"|translate}}</td>
<td>{{"field_create_time"|translate}}</td>
<td>{{"field_creator"|translate}}</td>
@@ -111,12 +111,12 @@
<span>{{"message_is_delete"|translate}}</span>
</div>
<div style="float:rightl;padding-top: 10px;margin-bottom: -20px" class="">
- <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">
- <span>{{"common_cancel"|translate}}</span>
- </button>
<button class="btn btnDefault btnmrg" data-popmodal-but="ok">
<span>{{"common_confirm"|translate}}</span>
</button>
+ <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">
+ <span>{{"common_cancel"|translate}}</span>
+ </button>
</div>
</div>
</div>
diff --git a/alarm-analysis/src/main/webapp/alarm/index.html b/alarm-analysis/src/main/webapp/alarm/index.html
index 9762df6a..094e972f 100644
--- a/alarm-analysis/src/main/webapp/alarm/index.html
+++ b/alarm-analysis/src/main/webapp/alarm/index.html
@@ -15,19 +15,28 @@
-->
<!DOCTYPE html>
<html>
+
<head>
- <base href="/iui/LY-Correlation/">
+ <base href="/holmes/">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <script src="public/thirdparty/js/jquery_1.12.4.min.js"></script>
- <script src="public/common/js/popModal.js"></script>
- <script src="public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>
- <script src="public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
- <script src="public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
- <script src="public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>
-
-<body style="overflow: auto">
-<remote-config>Loading...</remote-config>
-
-</body>
-</html>
+ <!--<script src="../public/thirdparty/js/jquery_1.12.4.min.js"></script>
+ <script src="../public/common/js/popModal.js"></script>
+ <script src="../public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>
+ <script src="../public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
+ <script src="../public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
+ <script src="../public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>-->
+
+ <script src="./public/js/jquery_1.12.4.min.js"></script>
+ <script src="./public/js/popModal.js"></script>
+ <script src="./public/js/jquery.ui.widget.js"></script>
+ <script src="./public/js/jquery.ui.widget.js"></script>
+ <script src="./public/js/jquery.iframe-transport.js"></script>
+ <script src="./public/js/jquery.fileupload.js"></script>
+
+ <body style="overflow: auto">
+ <remote-config>Loading...</remote-config>
+
+ </body>
+
+</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
index 00000000..b7bcae75
--- /dev/null
+++ b/alarm-analysis/src/main/webapp/alarm/main.browser.ts
@@ -0,0 +1,20 @@
+/* Copyright 2017 ZTE Corporation.
+ *
+ *Licensed under the Apache License, Version 2.0 (the "License");
+ *you may not use this file except in compliance with the License.
+ *You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+const platform = platformBrowserDynamic();
+
+platform.bootstrapModule(AppModule);
diff --git a/alarm-analysis/src/main/webapp/alarm/main.ts b/alarm-analysis/src/main/webapp/alarm/main.ts
index e2da65ee..e5dcf1cc 100644
--- a/alarm-analysis/src/main/webapp/alarm/main.ts
+++ b/alarm-analysis/src/main/webapp/alarm/main.ts
@@ -14,7 +14,7 @@
*/
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { enableProdMode } from '@angular/core';
-import { AppModule } from './app/app.module';
+import {AppModule } from './app/app.module';
if (process.env.ENV === 'production') {
enableProdMode();
}
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
index 00000000..7f603f48
--- /dev/null
+++ b/alarm-analysis/src/main/webapp/alarm/polyfills.browser.ts
@@ -0,0 +1,43 @@
+/* Copyright 2017 ZTE Corporation.
+ *
+ *Licensed under the Apache License, Version 2.0 (the "License");
+ *you may not use this file except in compliance with the License.
+ *You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import 'ie-shim'; // Internet Explorer 9 support
+
+// import 'core-js/es6';
+// Added parts of es6 which are necessary for your project or your browser support requirements.
+
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/set';
+import 'core-js/es6/weak-map';
+import 'core-js/es6/weak-set';
+import 'core-js/es6/typed';
+import 'core-js/es6/reflect';
+// see issue https://github.com/AngularClass/angular2-webpack-starter/issues/709
+// import 'core-js/es6/promise';
+
+import 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'zone.js/dist/long-stack-trace-zone';
diff --git a/alarm-analysis/src/main/webapp/alarm/vendor.ts b/alarm-analysis/src/main/webapp/alarm/vendor.ts
index 6ef97c23..d130e9d9 100644
--- 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';