Modify i18n file and other bugs

modify i18n configuration in app.component.ts file and modify other bugs

Issue-ID:CLIENT-164

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

diff --git a/alarm-analysis/src/main/webapp/alarm/app/app.component.ts b/alarm-analysis/src/main/webapp/alarm/app/app.component.ts
index d6ad1c0..cc8fdc7 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/app.component.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/app.component.ts
@@ -33,7 +33,7 @@ export class AppComponent implements OnInit{
     }\r
 \r
     ngOnInit():void {\r
-        this.translate.addLangs(["en", "zh"]);\r
+        this.translate.addLangs(["en-US", "zh-CN"]);\r
         this.translate.setDefaultLang('zh');\r
         let language = this.getLanguage();\r
         this.translate.use(language);\r

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.ts
index 8bcbad5..26c28b8 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.ts
@@ -41,18 +41,16 @@ export class RuleInfo implements OnInit {
 \r
             this.alarmRuleService.checkContent(this.queryRule.content)\r
                 .then(res => {\r
-                    if (res.status == 200) {\r
+                    if (res._body == 'true') {\r
                         this.alarmRuleService.updateRule(this.queryRule)\r
                             .then(res => {\r
-                                if (res.status == 200) {\r
+                                let resp: string = res._body;\r
+                                if (resp.includes("ruleid")) {\r
                                     let msg = { title: "modalTitleUpdate", message: "message_update_rule_success" };\r
                                     this.modalService.getmodalObservable.next(msg);\r
                                     this.router.navigate(['alarmRule']);\r
-                                } else if (res.status == 499) {\r
-                                    let msg = { title: "modalTitleUpdate", message: "message_exception_rule_fail" };\r
-                                    this.modalService.getmodalObservable.next(msg);\r
                                 } else {\r
-                                    let msg = { title: "modalTitleUpdate", message: "message_other_exception_rule_fail" };\r
+                                    let msg = { title: "modalTitleUpdate", message: res._body };\r
                                     this.modalService.getmodalObservable.next(msg);\r
                                 }\r
                             }).catch(\r
@@ -62,14 +60,9 @@ export class RuleInfo implements OnInit {
                             }\r
                             );\r
 \r
-                    } else if (res.status == 499) {\r
-                        let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
-                        this.modalService.getmodalObservable.next(msg);\r
-                        return false;\r
                     } else {\r
-                        let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+                        let msg = { title: "modalTitleUpdate", message: res._body };\r
                         this.modalService.getmodalObservable.next(msg);\r
-                        return false;\r
                     }\r
                 })\r
         }\r
@@ -85,17 +78,15 @@ export class RuleInfo implements OnInit {
             this.modalService.getmodalObservable.next(msg);\r
         } else {\r
             this.alarmRuleService.checkContent(this.queryRule.content).then(res => {\r
-                if (res.status == 200) {\r
+                if (res._body == 'true') {\r
                     this.alarmRuleService.save(this.queryRule).then(res => {\r
-                        if (res.status == 200) {\r
+                        let resp: string = res._body;\r
+                        if (resp.includes("ruleid")) {\r
                             let msg = { title: "modalTitleDefault", message: "message_add_rule_success" };\r
                             this.modalService.getmodalObservable.next(msg);\r
                             this.router.navigate(['alarmRule']);\r
-                        } else if (res.status == 499) {\r
-                            let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" };\r
-                            this.modalService.getmodalObservable.next(msg);\r
                         } else {\r
-                            let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+                            let msg = { "title": "modalTitleCheck", message: res._body };\r
                             this.modalService.getmodalObservable.next(msg);\r
                         }\r
 \r
@@ -103,15 +94,9 @@ export class RuleInfo implements OnInit {
                         let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" };\r
                         this.modalService.getmodalObservable.next(msg);\r
                     });\r
-                    return true;\r
-                } else if (res.status == 499) {\r
-                    let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
-                    this.modalService.getmodalObservable.next(msg);\r
-                    return false;\r
                 } else {\r
-                    let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+                    let msg = { "title": "modalTitleCheck", message: res._body };\r
                     this.modalService.getmodalObservable.next(msg);\r
-                    return false;\r
                 }\r
             })\r
         }\r
@@ -132,15 +117,11 @@ export class RuleInfo implements OnInit {
         } else {\r
             this.alarmRuleService.checkContent(this.queryRule.content)\r
                 .then(res => {\r
-                    if (res.status == 200) {\r
+                    if (res._body == 'true') {\r
                         let msg = { "title": "modalTitleCheck", message: "message_checkContent_rule_success" };\r
                         this.modalService.getmodalObservable.next(msg);\r
-                    } else if (res.status == 499) {\r
-                        let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
-                        this.modalService.getmodalObservable.next(msg);\r
-                        return false;\r
                     } else {\r
-                        let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+                        let msg = { "title": "modalTitleCheck", message: res._body };\r
                         this.modalService.getmodalObservable.next(msg);\r
                         return false;\r
                     }\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 3a259fd..ead9300 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
@@ -78,27 +78,27 @@
             <tbody>\r
                 <tr *ngFor="let rule of rules">\r
                     <td><a routerLink="/ruleInfo/{{rule.ruleid}}&add">{{rule.rulename}}</a></td>\r
-                    <td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../../public/thirdparty/images/round_off.png" alt=""></span></td>\r
-                    <td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../../public/thirdparty/images/round_on.png" alt=""></span></td>\r
+                    <td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="public/thirdparty/images/round_off.png" alt=""></span></td>\r
+                    <td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="public/thirdparty/images/round_on.png" alt=""></span></td>\r
                     <td>{{rule.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
                     <td>{{rule.creator}}</td>\r
                     <td>{{rule.updatetime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
                     <td>\r
                         <span (click)="updateRule(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
-                        <img src="../../../public/thirdparty/images/edit.png" alt="">\r
+                        <img src="public/thirdparty/images/edit.png" alt="">\r
                     </span>\r
                         <span>\r
                         \r
                     </span>\r
-                        <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px"> \r
-                        <img src="../../../public/thirdparty/images/on.png" alt="">\r
+                        <span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px"> \r
+                        <img src="public/thirdparty/images/on.png" alt="">\r
                     </span>\r
-                        <span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
-                        <img src="../../../public/thirdparty/images/off.png" alt="">\r
+                        <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
+                        <img src="public/thirdparty/images/off.png" alt="">\r
                     </span>\r
 \r
                         <span class="" id={{rule.ruleid}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">\r
-                         <img src="../../../public/thirdparty/images/delete.png" alt="">\r
+                         <img src="public/thirdparty/images/delete.png" alt="">\r
                     </span>\r
                     </td>\r
                 </tr>\r

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.ts
index 7fec7a8..f46ece0 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.component.ts
@@ -104,11 +104,28 @@ export class AlarmRule implements OnInit {
     }\r
 \r
     on_off(rule: RuleModel) {\r
-        rule.enabled == 0 ? rule.enabled = 1 : rule.enabled = 0;\r
+\r
+        let ru: RuleModel = rule;\r
+        if (ru.enabled == 0) {\r
+            ru.enabled = 1;\r
+        } else {\r
+            ru.enabled = 0;\r
+        }\r
         this._alarmRuleService\r
-            .updateRule(rule)\r
+            .updateRule(ru)\r
             .then(res => {\r
-                rule = res;\r
+                let resp: string = res._body;\r
+                if (resp.includes("ruleid")) {\r
+                    if (rule.enabled == 0) {\r
+                        rule.enabled = 1;\r
+                    } else {\r
+                        rule.enabled = 0;\r
+                    }\r
+                } else {\r
+                    let msg = { title: "modalTitleUpdate", message: resp };\r
+                    this.modalService.getmodalObservable.next(msg);\r
+                }\r
+\r
             });\r
     }\r
 \r

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.service.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.service.ts
index a76319f..5f84a5b 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.service.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleList/alarmRule.service.ts
@@ -23,8 +23,8 @@ import { Router } from '@angular/router';
 import { ModalService } from '../correlation-modal/modal.service';
 
 @Injectable()
-export class AlarmRuleService {
-    private ruleUrl = "/api/correlation-mgt/v1/rule";
+export class AlarmRuleService {//api/holmes-rule-mgmt/v1  /api/correlation-mgt/v1/rul
+    private ruleUrl = "/api/holmes-rule-mgmt/v1/rule";
     private headers = new Headers({ 'Content-Type': 'application/json' });
     constructor(private http: Http, private modalService: ModalService, private router: Router) { }
 
@@ -73,8 +73,8 @@ export class AlarmRuleService {
             .catch(this.handleError);
     }
 
-    checkContent(ruleContent: string): Promise<any> {
-        const url = "/api/correlation-engine/v1/rule";
+    checkContent(ruleContent: string): Promise<any> {//api/holmes-engine-mgmt/v1  api/correlation-engine/v1
+        const url = "/api/holmes-engine-mgmt/v1/rule";
         let data = { content: ruleContent };
         return this.http
             .post(url, JSON.stringify(data), { headers: this.headers })

diff --git a/alarm-analysis/src/main/webapp/alarm/app/pages/remote.component.html b/alarm-analysis/src/main/webapp/alarm/app/pages/remote.component.html
index 398159a..3d8c483 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/pages/remote.component.html
+++ b/alarm-analysis/src/main/webapp/alarm/app/pages/remote.component.html
@@ -13,7 +13,5 @@
  See the License for the specific language governing permissions and\r
  limitations under the License.\r
 -->\r
-<div class="tabzone">\r
-</div>\r
 <sif-modal></sif-modal>\r
 <router-outlet></router-outlet>
\ No newline at end of file

diff --git a/alarm-analysis/src/main/webapp/alarm/index.html b/alarm-analysis/src/main/webapp/alarm/index.html
index 094e972..234d716 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/index.html
+++ b/alarm-analysis/src/main/webapp/alarm/index.html
@@ -20,12 +20,12 @@
     <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
+    <!--<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