diff --git a/proxy.config.json b/proxy.config.json index 12f3cd9..11223c9 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://39.106.78.171:8920", + "target": "https://121.36.37.70:8204", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://39.106.78.171:8920", + "target": "https://121.36.37.70:8204", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/home/basic-info/add-unit/add-unit.component.html b/src/app/home/basic-info/add-unit/add-unit.component.html index 7304300..72e4c2b 100644 --- a/src/app/home/basic-info/add-unit/add-unit.component.html +++ b/src/app/home/basic-info/add-unit/add-unit.component.html @@ -37,7 +37,7 @@ 所属救援站 - + @@ -46,7 +46,7 @@ 所属大队 - + @@ -55,7 +55,7 @@ 使用性质 - + @@ -64,7 +64,7 @@ 建筑类型 - + diff --git a/src/app/home/basic-info/add-unit/add-unit.component.ts b/src/app/home/basic-info/add-unit/add-unit.component.ts index 42dc884..0589415 100644 --- a/src/app/home/basic-info/add-unit/add-unit.component.ts +++ b/src/app/home/basic-info/add-unit/add-unit.component.ts @@ -19,15 +19,14 @@ export class AddUnitComponent implements OnInit { ngOnInit(): void { this.validateForm = this.fb.group({ unit: [null, [Validators.required]], - name: [null, [Validators.required]], - iphone: [null, [Validators.required]], - addr: [null, [Validators.required]], - role: [[], [Validators.required]], + name: [null], + iphone: [null], + addr: [null], + role: [[]], role2: [[]], role3: [[]], role4: [[]], - role5: [[]], - phonenum: [null, [Validators.required]] + phonenum: [null] }); } 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 0975346..cdc2807 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 @@ -43,7 +43,7 @@ 建筑类型 - + @@ -62,7 +62,7 @@
- +
@@ -236,7 +236,7 @@ @@ -278,8 +278,7 @@ @@ -318,11 +317,12 @@
@@ -210,12 +210,12 @@

辖区中队行驶路线及时间

+ style="font-family:宋体; font-size:9pt; word-break: break-all; width: 70px;">辖区中队行驶路线及时间

+ style="font-family:宋体; font-size:9pt">
-

无

+

补给
方式

+ style="font-family:宋体; font-size:9pt">补给方式

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

 

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

 @@ -306,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 0a7ac9d..515a687 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 @@ -1,4 +1,4 @@ -import { Component, Renderer2, OnDestroy, AfterViewInit,ElementRef, OnInit,ViewChild } from '@angular/core'; +import { Component, Renderer2, OnDestroy, AfterViewInit, ElementRef, OnInit, ViewChild } from '@angular/core'; import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { asBlob } from 'html-docx-js-typescript' @@ -12,7 +12,7 @@ import { saveAs } from 'file-saver' export class UnitDetailsComponent implements OnInit { @ViewChild('box') box: ElementRef; - constructor(private fb: FormBuilder,private renderer: Renderer2,private el: ElementRef) { + constructor(private fb: FormBuilder, private renderer: Renderer2, private el: ElementRef) { this.validateForm = this.fb.group({ userName: [''], email: [''], @@ -21,9 +21,45 @@ export class UnitDetailsComponent implements OnInit { comment: [''] }); } - aaa="山东小满园" + datas: { + basicInfo: { + name: "", + addr: "", + phone: "", + total: "", + height: "", + layer: "", + structure:"", + coveredArea:"", + builtUpArea:"", + nature:"", + east:"", + south:"", + west:"", + north:"", + routeAndTime:"", + + }, + facilities:{ + controlPosition:"", + poolNumbe:"", + poolPosition:"", + poolCapacity:"", + supplyMode:"", + waterSources:"", + waterSourcesPosition:"", + alarm:false, + + } + } + aaa = "山东小满园" validateForm!: FormGroup; ngOnInit(): void { + setTimeout(() => { + console.log(666,this.datas); + }, 0); + + } submitForm(value: { userName: string; email: string; password: string; confirm: string; comment: string }): void { for (const key in this.validateForm.controls) { @@ -54,13 +90,13 @@ export class UnitDetailsComponent implements OnInit { Document - `+this.box.nativeElement.innerHTML+` + `+ this.box.nativeElement.innerHTML + ` ` - const fileData = asBlob(htmlString).then((data:any) => { + const fileData = asBlob(htmlString).then((data: any) => { saveAs(data, 'file.docx') // 保存为docx文件 - }) - + }) + } back() { diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts index 9b2da89..9e76949 100644 --- a/src/app/home/basic-info/unit/unit.component.ts +++ b/src/app/home/basic-info/unit/unit.component.ts @@ -55,11 +55,7 @@ export class UnitComponent implements OnInit { }); this.http.get('/api/Companies').subscribe((data: any) => { - - console.log(data); - - }) } constructor(private router: Router,private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private message: NzMessageService, private viewContainerRef: ViewContainerRef) { } @@ -81,8 +77,34 @@ export class UnitComponent implements OnInit { nzWidth: 450, nzComponentParams: {}, nzOnOk: async () => { + console.log(instance.validateForm); if (instance.validateForm.valid) { - console.log(1); + console.log(instance.validateForm); + // return + await new Promise(resolve => { + let body = { + companyName: instance.validateForm.value.unit, + directorName: instance.validateForm.value.name, + directorPhone: instance.validateForm.value.iphone, + address:instance.validateForm.value.addr, + organizationId:instance.validateForm.value.role.id || 0, + relatedOrganizationId:instance.validateForm.value.role2.id || 0, + buildingTypeId:instance.validateForm.value.role3.id || 0, + useNature:instance.validateForm.value.role4.id || 0, + } + this.http.post('/api/Companies', body).subscribe({ + next: (data: any) => { + console.log(data,80808) + + }, + error: (err) => { + + console.log(err) + } + } + + ) + }) } else { this.message.create('warning', '请填写完整！');