[完善]decs修改为哦content1；修改首页展示字段

src/app/pages/home-page/home-page.component.html

@@ -82,7 +82,7 @@
                     <div class="box eventbox">
                         <div class="eventboxitem"
                             *ngFor="let item of HomeAggregatioData.violationNameAgg;let key = index">
-                            <div class="eventname" [title]="item.key">
+                            <div class="eventname" [title]="item.eventSystemName">
                                 <div class="block" [ngClass]="{'yellow': key < 3,'blue': key > 2}">
                                     <ng-container *ngIf="key != 9; else elseTemplate">
                                         {{'0' + (key + 1)}}
@@ -91,7 +91,7 @@
                                         {{key + 1}}
                                     </ng-template>
                                 </div>
-                                {{item.key}}
+                                {{item.eventSystemName}}
                             </div>
                             <div class="progressbox">
                                 <div class="progress">
@@ -124,7 +124,7 @@
                                         {{key + 1}}
                                     </ng-template>
                                 </div>
-                                {{item.companyName}}  {{item.name}} 
+                                {{item.companyName}}  {{item.stationName}} 
                             </div>
                             <div class="progressbox">
                                 <div class="progress">

src/app/pages/home-page/home-page.component.ts

@@ -696,7 +696,7 @@ export class HomePageComponent implements OnInit {
   look(item) {
     // console.log(item)
     if (item.notification.data.eventSystemName == '灭火器维护' || item.notification.data.eventSystemName == '证照预警') {
-      this.message.create('warning', item.notification.data.desc);
+      this.message.create('warning', item.notification.data.content1);
     } else {
       this.isOpenModel = true
       let data = {

src/app/pages/home/home.component.ts

@@ -114,7 +114,7 @@ export class HomeComponent implements OnInit {
     }).subscribe((data: any) => {
       // console.log(data)
       if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
-        this.message.create('warning', data.result.desc);
+        this.message.create('warning', data.result.content1);
       } else {
         const modal = this.modal.create({
           nzContent: GetOutOfLineDetailsComponent,

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@@ -19,7 +19,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   details
   ngOnInit(): void {
     console.log(this.data)
-    this.details = this.data.desc
+    this.details = this.data.content1
     this.imgUrl = this.data.violateImage
     this.vedioUrl = this.data.violateVideo
     this.content = this.data.handleRecord

src/app/system-management/organization/organization.component.ts

@@ -155,28 +155,33 @@ export class OrganizationComponent implements OnInit {
   }
   deleteOr(item) {
     console.log(item)
-    this.modal.confirm({
+    if (item.origin.children && item.origin.children.length != 0) {
-      nzTitle: `确定要删除${item.title}这个机构吗?`,
+      this.message.create('warning', '请先删除所有子节点');
-      nzOkText: '确定',
+    } else {
-      nzOkType: 'danger',
+      this.modal.confirm({
-      nzOnOk: () => {
+        nzTitle: `确定要删除${item.title}这个机构吗?`,
-        this.http.delete('/api/services/app/Organization/Delete', {
+        nzOkText: '确定',
-          params: {
+        nzOkType: 'danger',
-            Id: item.origin.id
+        nzOnOk: () => {
-          }
+          this.http.delete('/api/services/app/Organization/Delete', {
-        }).subscribe(data => {
+            params: {
-          this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+              Id: item.origin.id
-            this.defaultExpandedKeys.push(item.key)
+            }
+          }).subscribe(data => {
+            this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+              this.defaultExpandedKeys.push(item.key)
+            })
+            this.getAllOrganization()
+            this.message.create('success', '删除成功！');
           })
-          this.getAllOrganization()
+        },
-          this.message.create('success', '删除成功！');
+        nzCancelText: '取消',
-        })
+        nzOnCancel: () => {
-      },
+
-      nzCancelText: '取消',
+        }
-      nzOnCancel: () => {
+      });
+    }
 
-      }
-    });
   }