diff options
Diffstat (limited to 'alarm-analysis/src/main/webapp/alarm/app')
3 files changed, 7 insertions, 7 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>
|