X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt-frontend%2Fsrc%2Fapp%2Fcorrelation-ruleList%2FalarmRule.component.html;fp=rulemgt%2Fsrc%2Fmain%2Ffrontend%2Fsrc%2Falarm%2Fapp%2Fcorrelation-ruleList%2FalarmRule.component.html;h=6e03db37e97efc3c601460f9f4dfdbbbaf30be9c;hb=9720e7d6a706d79f50778af6a39ce6fba79955ed;hp=a5ac3443ac3cb82fb2ba142ea272eb622e5924ae;hpb=0b1df79ef7749d62b4412e5433538d32feb6850c;p=holmes%2Frule-management.git

diff --git a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.html b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
similarity index 87%
rename from rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.html
rename to rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
index a5ac344..6e03db3 100644
--- a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.html
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
@@ -32,7 +32,7 @@
                         <span>{{"common_keyword"|translate}}</span>
                     </label>
                     <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">
+                        type="text" [(ngModel)]="ruleModel.ruleName" name="name">
                 </div>
 
                 <div class="fmrule_btn_group display_table">
@@ -77,28 +77,28 @@
             </thead>
             <tbody>
                 <tr *ngFor="let rule of rules">
-                    <td><a routerLink="/ruleInfo/{{rule.ruleid}}&add">{{rule.rulename}}</a></td>
-                    <td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../../public/thirdparty/images/round_off.png" alt=""></span></td>
-                    <td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../../public/thirdparty/images/round_on.png" alt=""></span></td>
-                    <td>{{rule.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                    <td><a routerLink="/ruleInfo/{{rule.ruleId}}&add">{{rule.rulename}}</a></td>
+                    <td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../assets/thirdparty/images/round_off.png" alt=""></span></td>
+                    <td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../assets/thirdparty/images/round_on.png" alt=""></span></td>
+                    <td>{{rule.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                     <td>{{rule.creator}}</td>
-                    <td>{{rule.updatetime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                    <td>{{rule.updateTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                     <td>
                         <span (click)="updateRule(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
-                        <img src="../../../public/thirdparty/images/edit.png" alt="">
+                        <img src="../../assets/thirdparty/images/edit.png" alt="">
                     </span>
                         <span>
                         
                     </span>
                         <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px"> 
-                        <img src="../../../public/thirdparty/images/on.png" alt="">
+                        <img src="../../assets/thirdparty/images/on.png" alt="">
                     </span>
                         <span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
-                        <img src="../../../public/thirdparty/images/off.png" alt="">
+                        <img src="../../assets/thirdparty/images/off.png" alt="">
                     </span>
 
-                        <span class="" id={{rule.ruleid}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">
-                         <img src="../../../public/thirdparty/images/delete.png" alt="">
+                        <span class="" id={{rule.ruleId}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">
+                         <img src="../../assets/thirdparty/images/delete.png" alt="">
                     </span>
                     </td>
                 </tr>