From 2d5bbb8626cfeb37819d745c3ce6a2fa507a9c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=95=AC=E7=91=9C?= <1148019379@qq.com>
Date: Mon, 15 Nov 2021 15:53:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E4=BB=8A=E6=97=A5=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E9=A6=96=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9=E6=A1=86?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=90=8E=E7=AB=AF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/pages.module.ts                 |  8 ++++--
 .../today-warning-admin.component.html        | 17 +++++------
 .../today-warning-admin.component.scss        |  3 ++
 .../today-warning-admin.component.ts          | 28 +++++++++++++++++--
 .../today-warning.component.html              |  5 ++--
 .../today-warning/today-warning.component.ts  | 16 ++++++++++-
 6 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 73c0fc2..a29c189 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -37,10 +37,13 @@ import { OilStationInfoComponent } from './oil-station-info/oil-station-info.com
 import { LeftDomainComponent } from './left-domain/left-domain.component';
 import { AddequipmentComponent } from './equipment-info/addequipment/addequipment.component';
 import { EditequipmentComponent } from './equipment-info/editequipment/editequipment.component';
+import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
 
 
 @NgModule({
-  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, AddequipmentComponent, EditequipmentComponent],
+  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, 
+    TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, 
+    AddequipmentComponent, EditequipmentComponent],
   imports: [
     PagesRoutingModule,
     CommonModule,
@@ -67,7 +70,8 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip
     NzDropDownModule,
     NzMessageModule,
     NzSpinModule,
-    NzTreeModule
+    NzTreeModule,
+    NzTreeSelectModule
   ],
   entryComponents: [AddequipmentComponent, EditequipmentComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html
index 58ed49f..dd0b68d 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.html
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html
@@ -10,6 +10,7 @@
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option nzValue="4" nzLabel="四级"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
@@ -17,20 +18,19 @@
       <nz-form-item class="searchParams">
         <nz-form-control>
           <nz-select id="type" formControlName="type" nzPlaceHolder="请选择预警类型">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option *ngFor="let item of yujingTypes" [nzValue]="item.id" [nzLabel]="item.violationName"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
 
       <nz-form-item class="searchParams">
         <nz-form-control>
-          <nz-select id="company" formControlName="company" nzPlaceHolder="请选择所属机构">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
-          </nz-select>
+          <!-- <nz-select id="company" formControlName="company" nzPlaceHolder="请选择所属机构">
+            
+          </nz-select> -->
+          <nz-tree-select id="company" formControlName="company" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+          </nz-tree-select>
+         
         </nz-form-control>
       </nz-form-item>
       <!-- <nz-form-item class="searchParams">
@@ -150,4 +150,5 @@
       </div>
     </div>
   </div>
+  
 </div>
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
index 0a9adc7..ac58c65 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
@@ -38,6 +38,9 @@
         color: rgba(145, 204, 255, 0.95);
         ;
       }
+      nz-tree-select{
+        color: rgba(145, 204, 255, 0.95);
+      }
 
       nz-date-picker {
         background-color: rgba(0, 0, 0, 0);
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
index 6b9169b..7e9a44e 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router'
+import { Router } from '@angular/router';
+import { HttpClient } from '@angular/common/http';
+import { TreeService } from 'src/app/service/tree.service';
 @Component({
   selector: 'app-today-warning-admin',
   templateUrl: './today-warning-admin.component.html',
@@ -9,7 +11,7 @@ import { Router } from '@angular/router'
 export class TodayWarningAdminComponent implements OnInit {
 
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder, private router: Router) { }
+  constructor(private http: HttpClient,private fb: FormBuilder, private router: Router, private toTree: TreeService) { }
 
   ngOnInit(): void {
     this.validateForm = this.fb.group({
@@ -20,6 +22,28 @@ export class TodayWarningAdminComponent implements OnInit {
       site: [null],
       datePicker: [null]
     });
+    this.yujingType()
+    this.getAllOrganization()
+  }
+  //预警类型接口
+  yujingTypes:any //预警接口数据
+  yujingType(){
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+        this.yujingTypes=data.result
+      }
+    )
+  }
+  //获取所有组织机构
+  nodes:any = []
+  getAllOrganization() {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+      data.result.items.forEach(element => {
+        element.key = element.code
+        element.title = element.displayName
+      });
+      this.nodes = [...this.toTree.toTree(data.result.items)]
+      console.log(this.nodes)
+    })
   }
 
   submitForm(): void {
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 33d2c81..942eadb 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -10,6 +10,7 @@
             <nz-option nzValue="1" nzLabel="一级"></nz-option>
             <nz-option nzValue="2" nzLabel="二级"></nz-option>
             <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option nzValue="4" nzLabel="四级"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
@@ -17,9 +18,7 @@
       <nz-form-item class="searchParams">
         <nz-form-control>
           <nz-select id="type" formControlName="type" nzPlaceHolder="请选择预警类型">
-            <nz-option nzValue="1" nzLabel="一级"></nz-option>
-            <nz-option nzValue="2" nzLabel="二级"></nz-option>
-            <nz-option nzValue="3" nzLabel="三级"></nz-option>
+            <nz-option *ngFor="let item of yujingTypes" [nzValue]="item.id" [nzLabel]="item.violationName"></nz-option>
           </nz-select>
         </nz-form-control>
       </nz-form-item>
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index d61b579..a6ff501 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/src/app/pages/today-warning/today-warning.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { TreeService } from 'src/app/service/tree.service';
 @Component({
   selector: 'app-today-warning',
   templateUrl: './today-warning.component.html',
@@ -7,7 +9,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 })
 export class TodayWarningComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder) { }
+  constructor(private http: HttpClient,private fb: FormBuilder, private toTree: TreeService) { }
 
   ngOnInit(): void {
     this.validateForm = this.fb.group({
@@ -16,8 +18,20 @@ export class TodayWarningComponent implements OnInit {
       site: [null],
       datePicker: [null]
     });
+    this.yujingType()
+    //this.getAllOrganization()
   }
 
+  //预警类型接口
+  yujingTypes:any //预警接口数据
+  yujingType(){
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+        this.yujingTypes=data.result
+      }
+    )
+  }
+  
+
   submitForm(): void {
     for (const i in this.validateForm.controls) {
       this.validateForm.controls[i].markAsDirty();