diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html index b10aae4..5acfd98 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.html +++ b/src/app/home/basic-info/unit-details/unit-details.component.html @@ -3,8 +3,8 @@
- - +
@@ -236,7 +236,7 @@ -

+

@@ -253,7 +253,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

@@ -263,7 +263,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

@@ -273,7 +273,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

@@ -283,7 +283,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

@@ -295,7 +295,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

@@ -305,7 +305,7 @@

+ style="font-family:'Times New Roman'; font-size:9pt">

diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index c3e4fa5..a0ea3a8 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -95,6 +95,30 @@ export class UnitDetailsComponent implements OnInit { } exportClick() { + let alarm="" + let spray="" + let broadcast="" + let smoke="" + if(this.datas.facilities.alarm){ + alarm="有" + }else{ + alarm="无" + } + if(this.datas.facilities.spray){ + spray="有" + }else{ + spray="无" + } + if(this.datas.facilities.broadcast){ + broadcast="有" + }else{ + broadcast="无" + } + if(this.datas.facilities.smoke){ + smoke="有" + }else{ + smoke="无" + } let box=` @@ -179,7 +203,7 @@ export class UnitDetailsComponent implements OnInit { @@ -221,22 +245,22 @@ export class UnitDetailsComponent implements OnInit { @@ -248,7 +272,7 @@ export class UnitDetailsComponent implements OnInit { @@ -269,7 +293,7 @@ export class UnitDetailsComponent implements OnInit { @@ -286,7 +310,7 @@ export class UnitDetailsComponent implements OnInit { @@ -328,7 +352,7 @@ export class UnitDetailsComponent implements OnInit { @@ -351,8 +375,7 @@ export class UnitDetailsComponent implements OnInit { @@ -401,7 +421,7 @@ export class UnitDetailsComponent implements OnInit { @@ -430,20 +450,20 @@ export class UnitDetailsComponent implements OnInit { style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:41.5pt">

数量：

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.pumpNumber+`

@@ -473,20 +493,20 @@ export class UnitDetailsComponent implements OnInit { style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:41.5pt">

数量：

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.SprayPumpNumber+`

@@ -516,7 +536,7 @@ export class UnitDetailsComponent implements OnInit { @@ -553,7 +573,7 @@ export class UnitDetailsComponent implements OnInit { @@ -578,7 +598,7 @@ export class UnitDetailsComponent implements OnInit { @@ -606,7 +626,7 @@ export class UnitDetailsComponent implements OnInit {
-

+

`+this.datas.basicInfo.layer+`

+ style="font-family:宋体; font-size:9pt">`+this.datas.basicInfo.structure+`

 @@ -189,7 +213,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.basicInfo.coveredArea+`

 @@ -199,7 +223,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.basicInfo.builtUpArea+`

 @@ -209,7 +233,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:宋体; font-size:9pt">`+this.datas.basicInfo.nature+`

东：

+ style="font-family:宋体; font-size:9pt">东：`+this.datas.basicInfo.east+`

南：

+ style="font-family:宋体; font-size:9pt">南：`+this.datas.basicInfo.south+`

西：

+ style="font-family:宋体; font-size:9pt">西：`+this.datas.basicInfo.west+`

北：

+ style="font-family:宋体; font-size:9pt">北：`+this.datas.basicInfo.north+`

+ style="font-family:宋体; font-size:9pt">`+this.datas.basicInfo.routeAndTime+`
-

+

`+this.datas.facilities.controlPosition+`

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.poolNumbe+`

 @@ -296,7 +320,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.poolPosition+`

 @@ -306,7 +330,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.poolCapacity+`

 @@ -316,7 +340,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt"`+this.datas.facilities.supplyMode+`

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.waterSources+`

 @@ -338,7 +362,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.waterSourcesPosition+`

- - + `+alarm+`

- - + `+spray+`

- - + `+broadcast+`

- - + `+smoke+`

`+this.datas.facilities.hydrantsNumber+`个

+ style="font-family:宋体; font-size:9pt">`+this.datas.facilities.hydrantsPosition+`

扬程：`+this.datas.facilities.pumpRange+`m

流量：`+this.datas.facilities.pumpFlow+`L/S

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.pumpAdapter+`

扬程：`+this.datas.facilities.SprayPumpRange+`m

流量：`+this.datas.facilities.SprayPumpFlow+`L/S

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.SprayPumpAdapter+`
-

+

`+this.datas.facilities.elevator+`

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.stairs+`

 @@ -541,7 +561,7 @@ export class UnitDetailsComponent implements OnInit {

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.Export+`

`+this.datas.facilities.indoorHydrant+`个

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.standardIndoorHydrant+`

+ style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.tips+`

 

` - // return + const htmlString = ` @@ -614,7 +634,7 @@ export class UnitDetailsComponent implements OnInit { Document - `+ this.box.nativeElement.innerHTML + ` + `+ box + ` ` const fileData = asBlob(htmlString).then((data: any) => { diff --git a/src/app/home/basic-info/unit-edit/unit-edit.component.html b/src/app/home/basic-info/unit-edit/unit-edit.component.html new file mode 100644 index 0000000..ca53762 --- /dev/null +++ b/src/app/home/basic-info/unit-edit/unit-edit.component.html @@ -0,0 +1,73 @@ +
+
+ + 单位名称 + + + + + + + + 消防安全责任人 + + + + + + + + 联系方式 + + + + + + + + 单位地址 + + + + + + + + + + 所属救援站 + + + + + + + + + 所属大队 + + + + + + + + + 使用性质 + + + + + + + + 建筑类型 + + + + + + + +
+
\ No newline at end of file diff --git a/src/app/home/basic-info/unit-edit/unit-edit.component.scss b/src/app/home/basic-info/unit-edit/unit-edit.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/home/basic-info/unit-edit/unit-edit.component.spec.ts b/src/app/home/basic-info/unit-edit/unit-edit.component.spec.ts new file mode 100644 index 0000000..a03f331 --- /dev/null +++ b/src/app/home/basic-info/unit-edit/unit-edit.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UnitEditComponent } from './unit-edit.component'; + +describe('UnitEditComponent', () => { + let component: UnitEditComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ UnitEditComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(UnitEditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/home/basic-info/unit-edit/unit-edit.component.ts b/src/app/home/basic-info/unit-edit/unit-edit.component.ts new file mode 100644 index 0000000..42858a9 --- /dev/null +++ b/src/app/home/basic-info/unit-edit/unit-edit.component.ts @@ -0,0 +1,99 @@ +import { Component, OnInit,Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; +import { TreeService } from 'src/app/service/tree.service'; + +@Component({ + selector: 'app-unit-edit', + templateUrl: './unit-edit.component.html', + styleUrls: ['./unit-edit.component.scss'] +}) +export class UnitEditComponent implements OnInit { + + + @Input() title?: string; + @Input() subtitle?: string; + validateForm!: FormGroup; + zhidui=[] + dadui=[] + jiuyuanzhan=[] + constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { } + + ngOnInit(): void { + this.validateForm = this.fb.group({ + unit: [null, [Validators.required]], + name: [null], + iphone: [null], + addr: [null], + role: [null], + role2: [null], + nature: [null], + role4: [null], + phonenum: [null] + }); + this.getAllOrganization() + } + destroyModal(): void { + this.modal.destroy({ data: 'this the result data' }); + } + + listOfData: any[] = []; + listOfData2: any[] = []; + + //获取角色列表 + getAllRoles() { + let params = { + SkipCount: '0', + MaxResultCount: '999' + } + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { + // console.log('角色列表', data.result.items) + this.listOfData = data.result.items + }) + } + //获取角色列表 + getAllRoles2() { + let params = { + SkipCount: '0', + MaxResultCount: '999', + IsViolationRoles:'true' + } + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { + // console.log('角色列表', data.result.items) + this.listOfData2 = data.result.items + }) + } + //获取所有组织机构 + nodes: any = [] + getAllOrganization(){ + let params = { + // OrganizationUnitId: OrganizationUnitId, + // IsContainsChildren: "true" + ContainsChildren: true, + pageSize: 9999 + } + this.http.get('/api/Organizations', { + params: params + }).subscribe((data: any) => { + console.log(data); + for (let index = 0; index < data.items.length; index++) { + if(data.items[index].level==1){ + this.zhidui.push(data.items[index]) + }else if(data.items[index].level==2){ + this.dadui.push(data.items[index]) + }else{ + this.jiuyuanzhan.push(data.items[index]) + } + + } + console.log(this.dadui); + + }) + } + +} diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html index 2d32b70..a273d07 100644 --- a/src/app/home/basic-info/unit/unit.component.html +++ b/src/app/home/basic-info/unit/unit.component.html @@ -82,10 +82,10 @@ {{ data.creationTime }} {{ data.addr }} {{ data.state }} - - 查看详情 -   - 关闭 + + 查看详情 + 关闭 + diff --git a/src/app/home/basic-info/unit/unit.component.scss b/src/app/home/basic-info/unit/unit.component.scss index 481f6b5..712b86a 100644 --- a/src/app/home/basic-info/unit/unit.component.scss +++ b/src/app/home/basic-info/unit/unit.component.scss @@ -70,33 +70,9 @@ } - .operation { - position: absolute; - right: 0; - - span { - margin-left: 40px; - } - - span:nth-child(1), - span:nth-child(2), - span:nth-child(3) { - color: #2399FF; - } - - .grey{ - color: rgba(0, 13, 33, 0.48)!important; - } - .progress{ - width: 100%; - height: 20px; - background: #eee; - border-radius: 2px; - .bg{ - width: 32%; - height: 100%; - background: #46B783; - } + .caozuo { + span{ + margin: 0 5px; } } \ No newline at end of file diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts index 5a4a2d5..0539526 100644 --- a/src/app/home/basic-info/unit/unit.component.ts +++ b/src/app/home/basic-info/unit/unit.component.ts @@ -1,6 +1,5 @@ import { Router } from '@angular/router'; -import { AddUnitComponent } from '../add-unit/add-unit.component'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit, AfterViewInit, ViewChild, ViewContainerRef } from '@angular/core'; import { TreeService } from 'src/app/service/tree.service'; @@ -8,7 +7,8 @@ import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro- import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzModalService } from 'ng-zorro-antd/modal'; import { NzMessageService } from 'ng-zorro-antd/message'; - +import { AddUnitComponent } from '../add-unit/add-unit.component'; +import { UnitEditComponent }from '../unit-edit/unit-edit.component' @Component({ selector: 'app-unit', templateUrl: './unit.component.html', @@ -58,6 +58,7 @@ export class UnitComponent implements OnInit { console.log('删除了6666666666666') // CustomReuseStrategy.deleteRouteSnapshot('/basicInfo/unit'); } + addOr(node?: any) { const modal = this.modal.create({ @@ -106,4 +107,5 @@ export class UnitComponent implements OnInit { const instance = modal.getContentComponent(); } + } diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 5d2d19d..8ddc6ac 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -52,6 +52,7 @@ import { ApplyComponent } from './task/station-task-apply/apply/apply.component' import { ApplyLookComponent } from './task/station-task-apply/apply-look/apply-look.component'; import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.component'; +import { UnitEditComponent } from './basic-info/unit-edit/unit-edit.component'; @NgModule({ declarations: [ NavComponent, @@ -81,7 +82,8 @@ import { LookTaskComponent } from './task/zhi-audit/look-task/look-task.componen AddUnitComponent, ApplyComponent, ApplyLookComponent, - LookTaskComponent + LookTaskComponent, + UnitEditComponent ], imports: [ CommonModule,