update

src/main/webapp/app/alarm/alarm-list/alarm-list.component.html

@@ -34,7 +34,7 @@
   <div nz-col nzSpan="3">
     <nz-select style="width: 100%;" nzShowSearch nzAllowClear nzPlaceHolder="选择设备类型" [(ngModel)]="obj.equipmentType" >
       <ng-container *ngFor="let item of warnCountList;">
-        <nz-option nzLabel="{{item.equipmentType}}" nzValue="{{item.equipmentType}}"></nz-option>
+        <nz-option nzLabel="{{item.equipmentType}}" nzValue="{{item.equipmentTypeId}}"></nz-option>
       </ng-container>
     </nz-select>
   </div>
@@ -61,7 +61,7 @@
   </div>
 </div>
 <div nz-row class="search-form" style="border-top: none;padding: 0 0 15px 0;">
-  <input [(ngModel)]="obj.name" nz-input placeholder="告警信息">
+  <input style="width: 15%;" [(ngModel)]="obj.name" nz-input placeholder="告警信息">
   <button (click)="searchValue()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
 </div>
 

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

@@ -117,7 +117,7 @@
                             </ng-container>
 
                         </td>
-                        <td>
+                        <td class="cursor">
                             <span (click)="goTOInventory(item?.inventory?.id)">{{item?.inventory?.name}}</span>
                         </td>
                         <!--<td class="round-tag tag-form" >-->
@@ -227,7 +227,9 @@
                             </ng-container>
 
                         </td>
-                        <td>{{item?.inventory?.name}}</td>
+                        <td class="cursor">
+                            <span (click)="goTOInventory(item?.inventory?.id)">{{item?.inventory?.name}}</span>
+                        </td>
                         <!--<nz-tag *ngIf="item.status == 0" [nzColor]="color.green"></nz-tag>-->
                         <!--<nz-tag *ngIf="item.status == 1" [nzColor]="color.gray"></nz-tag>-->
                         <td class="default">
@@ -323,8 +325,9 @@
                     </ng-container>
 
                 </td>
-                <td>{{item?.inventory?.name}}</td>
-
+                <td class="cursor">
+                    <span (click)="goTOInventory(item?.inventory?.id)">{{item?.inventory?.name}}</span>
+                </td>
                 <td class="default">
                     <ng-container *ngIf="item.available == 0">
                         <nz-tag>AGENT</nz-tag>

src/main/webapp/app/work/modal/type-asets/type-asets.component.ts

@@ -81,8 +81,8 @@ export class TypeAsetsComponent implements OnInit {
         this.workSer.findType(id).subscribe(
             (res)=>{
                 if(res.data.parentid){
-                    this.isParent = 'primary';
-                    this.isChildren = 'default';
+                    this.isParent = 'default';
+                    this.isChildren = 'primary';
                 }
                 this.validateForm.patchValue(res.data);
             }

src/main/webapp/app/work/work-handle/Event/event.component.ts

@@ -103,7 +103,9 @@ export class EventComponent implements OnInit {
             this.message.error("请选择人员");
             return false;
         }
-        this.validateForm.value.operators = this.operatorsList;
+        this.validateForm.patchValue({
+            operators: this.operatorsList
+        });
         for (let i in this.validateForm.controls) {
             this.validateForm.controls[i].markAsDirty();
             this.validateForm.controls[i].updateValueAndValidity();
@@ -132,7 +134,9 @@ export class EventComponent implements OnInit {
         this.fileList.forEach((file: any) => {
             formData.append('file', file);
         });
-        this.validateForm.value.operators = this.operatorsList;
+        this.validateForm.patchValue({
+            operators: this.operatorsList
+        });
 
         if(this.operatorsList.length  == 0){
             this.message.error("请选择人员");

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html

@@ -75,9 +75,9 @@
       <div nz-col nzSpan="4">关联资产</div>
       <div nz-col nzSpan="1"></div>
       <div nz-col nzSpan="19">
-        <p *ngFor="let item of linkList;">
-          <span>资产编号</span>
-          <span>{{item.name}}</span>
+        <p *ngFor="let item of event?.inventorys;">
+          <span style="margin-right: 5px">{{item.inventoryNo}}</span>
+          <span style="margin-right: 5px">{{item.name}}</span>
           <span>{{item.typeName}}</span>
         </p>
       </div>

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.ts

@@ -26,7 +26,6 @@ export class HandleDetailComponent implements OnInit {
 
     eventId;
     event;
-    linkList;
     transforsList;
 
     constructor(private workSer: WorkService, private message: NzMessageService,

src/main/webapp/app/work/work.service.ts

@@ -31,7 +31,7 @@ export class WorkService {
 
     //根据事件编号查询
     findByNo(params): Observable<any>{
-        return this.http.get(SERVER_API_URL + '/sysevent/find/' +params);
+        return this.http.get(SERVER_API_URL + '/sysevent/findTransferAndInventory/' +params);
     }
 
     //添加事件