update

src/main/webapp/app/modal/strategy/strategy.component.html

@@ -80,7 +80,7 @@
                         <input nz-input [(ngModel)]="item.value">
                     </nz-form-control>
                     <nz-form-control nz-col [nzSpan]="3">
-                        <span (click)="deleteMacro1(i)">移除</span>
+                        <span class="main-color cursor" (click)="deleteMacro1(i)">移除</span>
                     </nz-form-control>
                 </div>
                 <div nz-row [nzGutter]="24">
@@ -128,7 +128,7 @@
                         <span>"public"</span>
                     </div>
                     <div nz-col [nzSpan]="2">
-                        <span class="cursor" (click)="deleteMacro2(i)">移除</span>
+                        <span class="cursor main-color" (click)="deleteMacro2(i)">移除</span>
                     </div>
                 </div>
                 <button nz-button (click)="addMacro2()" nzType="default">添加</button>

src/main/webapp/app/modal/strategy/strategy.component.ts

@@ -42,6 +42,7 @@ export class StrategyComponent implements OnInit {
     }
 
     initForm() {
+        this.tabNum = 0;
         this.templateList.forEach(e => {
             e.checked = false;
         });
@@ -124,6 +125,18 @@ export class StrategyComponent implements OnInit {
                     this.validateForm.templates = tempArr;
                     this.templatesResoure = tempArr;
                 }
+                if(data.macros){
+                    //宏回显
+                    let macroArr = [];
+                    macroArr = data.macros.map(e=>{
+                        const d = {
+                            macro:e.macro,
+                            value:e.value,
+                        };
+                        return d;
+                    })
+                    this.macroList1 = macroArr;
+                }
             }
         );
     }
@@ -133,8 +146,7 @@ export class StrategyComponent implements OnInit {
         if (han.test(this.validateForm.host)) {
             this.message.error('模版真实名称不能输入中文');
             return false;
-        }
-        ;
+        };
         return true;
     }
 

src/main/webapp/app/overAll/template/discovery-list/discovery-list.component.html

@@ -52,10 +52,13 @@
     <td class="cursor main-color">
       <span (click)="goToTrigger(data)">{{data.triggersCount}}</span>
     </td>
-    <td>{{data.stock}}</td>
-    <td>{{data.usedcount}}</td>
-    <td>{{data.lendcount}}</td>
-    <td>{{data.repaircount}}</td>
+    <td>{{data.key_}}</td>
+    <td>{{data.delay}}</td>
+    <td>{{data.type}}</td>
+    <td>
+      <span *ngIf="data.status == 0">启用</span>
+      <span *ngIf="data.status == 1">禁用</span>
+    </td>
     <td class="main-color cursor">
       <span (click)="showEditModal(data)">编辑</span>
       <span (click)="deleteDiscovery(data)">删除</span>

src/main/webapp/app/overAll/template/template.component.html

@@ -43,7 +43,7 @@
     <th>描述</th>
     <th>自动发现</th>
     <th>监控项</th>
-    <th>触发器</th>
+    <th>阈值</th>
     <th>操作</th>
   </tr>
   </thead>
@@ -77,7 +77,7 @@
               <td class="main-color cursor">
                 <span (click)="goToDiscovery(item)">{{item.discoveriesCount}}</span>
               </td>
-              <td>{{item.itemCount}}</td>
+              <td>{{item.itemsCount}}</td>
               <td>{{item.triggersCount}}</td>
             </ng-container>
 
@@ -110,6 +110,8 @@
           <span >{{item.name}}</span>
         </td>
         <td>{{item.description}}</td>
+        <td>{{item.itemsCount}}</td>
+        <td>{{item.triggersCount}}</td>
         <td class="main-color cursor">
           <span (click)="goToDiscovery(item)">{{item.discoveriesCount}}</span>
         </td>