shaojiahao
/
Jinan_project
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[修改]单位信息填写项

非煤矿山灾害智能感知和预警系统
邵佳豪 1 year ago
parent
09ffe89a72
commit
41d9a0e35a
9 changed files with 829 additions and 598 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      proxy.config.json
  2. 4
      src/app/home/basic-info/add-unit/add-unit.component.html
  3. 2
      src/app/home/basic-info/add-unit/add-unit.component.ts
  4. 48
      src/app/home/basic-info/unit-details/unit-details.component.html
  5. 1345
      src/app/home/basic-info/unit-details/unit-details.component.ts
  6. 6
      src/app/home/basic-info/unit/unit.component.ts
  7. 1
      src/app/home/commonComponents/chat-window/chat-window.component.ts
  8. 5
      src/app/home/statistic-analysis/home/home.component.ts
  9. 10
      src/styles.scss

6
proxy.config.json
Unescape View File

@ -1,11 +1,13 @@
{
"/api": {
"target": "https://fx.anxincloud.cn/",
"target": "https://121.36.37.70:8204/",
"测试": "https://121.36.37.70:8204/",
"生产": "https://fx.anxincloud.cn/",
"secure": false,
"changeOrigin": true
},
"/hubs": {
"target": "https://fx.anxincloud.cn/",
"target": "https://121.36.37.70:8204/",
"secure": false,
"ws": true,
"logLevel": "debug"

4
src/app/home/basic-info/add-unit/add-unit.component.html
Unescape View File

@ -74,14 +74,14 @@
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<!-- <nz-form-item>
<nz-form-label [nzSm]="7" [nzXs]="24" nzFor="使用性质">使用性质</nz-form-label>
<nz-form-control>
<nz-input-group>
<input nz-input type="text" formControlName="nature" placeholder="请输入使用性质" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
</nz-form-item> -->
<nz-form-item>
<nz-form-label [nzSm]="7" [nzXs]="24" nzFor="单位类型">单位类型</nz-form-label>
<nz-form-control>

2
src/app/home/basic-info/add-unit/add-unit.component.ts
Unescape View File

@ -24,7 +24,7 @@ export class AddUnitComponent implements OnInit {
orStation: [null, [Validators.required]],
orDa: [null],
companyLevel: [null, [Validators.required]],
nature: [null],
// nature: [null],
unittype: [null]
});
this.getAllOrganization()

48
src/app/home/basic-info/unit-details/unit-details.component.html
Unescape View File

@ -9,19 +9,19 @@
</div>
</div>
<div class="title">单位信息</div>
<div class="content" style="display: flex;">
<div class="content" id="unitInfo" style="display: flex;">
<div class="content-left" style="width: 50%;">
<form [ngClass]="{'form': disableds}" nz-form [formGroup]="validateForm">
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="社会统一信用代码">社会统一信用代码</nz-form-label>
<!-- <nz-form-item>
<nz-form-label [nzSpan]="8" nzFor="社会统一信用代码">社会统一信用代码</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="code" placeholder="请输入社会统一信用代码" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
</nz-form-item> -->
<nz-form-item>
<nz-form-label [nzSpan]="7" nzRequired nzFor="所属救援站">所属救援站</nz-form-label>
<nz-form-label [nzSpan]="8" nzRequired nzFor="所属救援站">所属救援站</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-tree-select [nzNodes]="nodes" nzShowSearch nzPlaceHolder="所属救援站" formControlName="organizationId"
[nzDropdownClassName]="'maxHeightTreeSelect'" [nzAllowClear]="false">
@ -29,7 +29,7 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="所属大队">所属大队</nz-form-label>
<nz-form-label [nzSpan]="8" nzRequired nzFor="所属大队">所属大队</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-select formControlName="relatedOrganizationId" nzPlaceHolder="所属大队">
<nz-option *ngFor="let item of battalionList" [nzValue]="item.id" [nzLabel]="item.name">
@ -38,7 +38,7 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="单位类型">单位类型</nz-form-label>
<nz-form-label [nzSpan]="8" nzRequired nzFor="单位类型">单位类型</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-select formControlName="buildingTypeId" nzPlaceHolder="请选择单位类型">
<nz-option *ngFor="let item of BuildingTypes" [nzValue]="item.id" [nzLabel]="item.buildingTypeName">
@ -47,7 +47,7 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label nzRequired [nzSpan]="7" nzFor="单位级别">单位级别</nz-form-label>
<nz-form-label nzRequired [nzSpan]="8" nzFor="单位级别">单位级别</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-select formControlName="companyLevel" nzAllowClear nzPlaceHolder="请选择单位级别">
<nz-option nzValue="一般单位" nzLabel="一般单位"></nz-option>
@ -57,32 +57,32 @@
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="使用性质">使用性质</nz-form-label>
<!-- <nz-form-item>
<nz-form-label [nzSpan]="8" nzFor="使用性质">使用性质</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="useNature" placeholder="使用性质" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
</nz-form-item> -->
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="法定代表人">法定代表人</nz-form-label>
<nz-form-label nzRequired [nzSpan]="8">法人/消防负责人</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="legalPersonName" placeholder="请输入法定代表人" />
<input nz-input type="text" formControlName="legalPersonName" placeholder="法人/消防负责人" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="法人联系方式">法人联系方式</nz-form-label>
<nz-form-label nzRequired [nzSpan]="8">法人/消防责任人<br/>联系方式</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="legalPersonPhone" placeholder="请输入法人联系方式" />
<input nz-input type="text" formControlName="legalPersonPhone" placeholder="请输入联系方式" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="消防责任人">消防责任人</nz-form-label>
<!-- <nz-form-item>
<nz-form-label [nzSpan]="8" nzFor="消防责任人">消防责任人</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="principalName" placeholder="请输入消防责任人" />
@ -90,31 +90,31 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="消防责任人">消防责任人手机</nz-form-label>
<nz-form-label [nzSpan]="8" nzFor="消防责任人">消防责任人手机</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="principalPhone" placeholder="请输入消防责任人手机" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
</nz-form-item> -->
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="消防安全管理员">消防安全管理员</nz-form-label>
<nz-form-label nzRequired [nzSpan]="8">消防安全管理人</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="adminName" placeholder="请输入消防安全管理员" />
<input nz-input type="text" formControlName="adminName" placeholder="消防安全管理人" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="管理员联系方式">管理员联系方式</nz-form-label>
<nz-form-label nzRequired [nzSpan]="8" style="height: 40px!important">消防安全管理员<br/>联系方式</nz-form-label>
<nz-form-control [nzSpan]="12">
<nz-input-group>
<input nz-input type="text" formControlName="adminPhone" placeholder="请输入管理员联系方式" />
<input nz-input type="text" formControlName="adminPhone" placeholder="请输入联系方式" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="7" nzFor="单位照片">单位照片</nz-form-label>
<nz-form-label [nzSpan]="8" nzFor="单位照片">单位照片</nz-form-label>
<nz-form-control [nzSpan]="12">
<div class="uploadPhotobox">
<div class="uploadDiv uploadDiv2">

1345
src/app/home/basic-info/unit-details/unit-details.component.ts
View File

File diff suppressed because it is too large Load Diff

6
src/app/home/basic-info/unit/unit.component.ts
Unescape View File

@ -146,14 +146,14 @@ export class UnitComponent implements OnInit {
let integrity = this.methodService.getAddIntegrity(instance.validateForm.value)
let body = {
companyName: instance.validateForm.value.unitname,
directorName: instance.validateForm.value.person,
directorPhone: instance.validateForm.value.phone,
legalPersonName: instance.validateForm.value.person,
legalPersonPhone: instance.validateForm.value.phone,
address: instance.validateForm.value.addr,
organizationId: instance.validateForm.value.orStation || null,
relatedOrganizationId: instance.validateForm.value.orDa || null,
buildingTypeId: instance.validateForm.value.unittype || null,
companyLevel: instance.validateForm.value.companyLevel,
useNature: instance.validateForm.value.nature,
// useNature: instance.validateForm.value.nature,
data: null,
integrity: integrity
}

1
src/app/home/commonComponents/chat-window/chat-window.component.ts
Unescape View File

@ -4,7 +4,6 @@ import signalR from '../../../../signalRChat'
import { HttpClient } from '@angular/common/http';
import { StationWeeklyPlanComponent } from '../../task/station-weekly-plan/station-weekly-plan.component';
import { StationTaskExecutionComponent } from '../../task/station-task-execution/station-task-execution.component';
import { HubConnection } from '@microsoft/signalr';
@Component({

5
src/app/home/statistic-analysis/home/home.component.ts
Unescape View File

@ -731,6 +731,9 @@ export class HomeComponent implements OnInit {
}
echartsSetData_taskStatByOrg() {
console.log()
this.completionOfTaskPie.clear();
this.completionOfTaskBar.clear();
//任务完成情况两个echarts
@ -743,6 +746,8 @@ export class HomeComponent implements OnInit {
this.completionOfTaskPie &&
this.completionOfTaskPie.setOption(this.completionOfTaskPieOption);
console.log(666,this.statisticalData_taskStatByOrg)
let taskBar = task['组织机构数据'];
let taskBarx = [];
let taskBary1 = [];

10
src/styles.scss
Unescape View File

@ -327,3 +327,13 @@ ul {
}
#unitInfo{
.ant-form-item-label > label{
height: 40px;
}
.ant-form-item-control-input{
min-height: 40px;
}
}
Write Preview
Loading…
Cancel
Save