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

[完善]数字化预案同步基本信息

非煤矿山灾害智能感知和预警系统
邵佳豪 3 years ago
parent
f2782a1fcc
commit
cd0a758f19
6 changed files with 877 additions and 819 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. 1396
      src/app/home/basic-info/unit-details/unit-details.component.html
  2. 263
      src/app/home/basic-info/unit-details/unit-details.component.ts
  3. 7
      src/app/home/basic-info/unit/unit.component.ts
  4. 1
      src/app/home/nav/nav.component.ts
  5. 8
      src/app/home/task/station-task-execution/task-details/task-details.component.html
  6. 21
      src/app/home/task/station-task-execution/task-details/task-details.component.ts

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

File diff suppressed because it is too large Load Diff

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

@ -245,12 +245,8 @@ export class UnitDetailsComponent implements OnInit {
* 消防控制室
*/
kongzhishi = {
data: {
addres: ''
}
}
kongzhishiweizhi = ''
shiwaixiaohuoshuanweizhi = ''
/**
* 室外消火栓
*/
@ -261,72 +257,139 @@ export class UnitDetailsComponent implements OnInit {
}
company: string
organization: string
datas = {
datas: any = {
basicInfo: {
name: "",
addr: "",
phone: "",
total: "",
height: "",
layer: "",
structure: "",
coveredArea: "",
builtUpArea: "",
nature: "",
east: "",
south: "",
west: "",
north: "",
routeAndTime: "",
positionCoordinates: { x: 0, y: 0 }
name: '',
address: '',
people: '',
phone: '',
peoplenum: '',
buildingheight: '',
cengshu: '',
jiegou: '',
zhandimianji: '',
zongmianji: '',
xingzhi: '',
pilin: {
dong: '',
xi: '',
nan: '',
bei: ''
},
luxian: '',
time: ''
},
facilities: {
controlPosition: "",
poolNumbe: "",
poolPosition: "",
poolCapacity: "",
supplyMode: "",
waterSources: "",
waterSourcesPosition: "",
system: {
alarm: false,
spray: false,
broadcast: false,
smoke: false,
other: {
listdata: [{
name: '消防水源',
data: [
{ name: '消防水池数量', velue: '' },
{ name: '消防水池位置', velue: '' },
{ name: '总容量(平方米)', velue: '' },
{ name: '补给方式', velue: '' },
{ name: '室外其他水源', velue: '' },
{ name: '室外其他水源位置', velue: '' }
]
},
hydrantsNumber: "",
hydrantsPosition: "",
pumpNumber: "",
pumpRange: "",
pumpFlow: "",
pumpAdapter: "",
SprayPumpNumber: "",
SprayPumpRange: "",
SprayPumpFlow: "",
SprayPumpAdapter: "",
elevator: "",
stairs: "",
Export: "",
indoorHydrant: "",
standardIndoorHydrant: ""
{
name: '消防栓泵',
data: [
{ name: '数量', velue: '' },
{ name: '扬程（m）', velue: '' },
{ name: '流量(L/S)', velue: '' },
{ name: '水泵接合器数量', velue: '' },
{ name: '水泵接合器位置', velue: '' }
]
},
{
name: '喷淋泵',
data: [
{ name: '数量', velue: '' },
{ name: '扬程（m）', velue: '' },
{ name: '流量(L/S)', velue: '' },
{ name: '水泵接合器数量', velue: '' },
{ name: '水泵接合器位置', velue: '' },
]
},
{
name: '消防电梯',
data: [
{ name: '数量', velue: '' },
{ name: '位置', velue: '' },
]
},
{
name: '疏散电梯',
data: [
{ name: '数量', velue: '' },
{ name: '位置', velue: '' },
]
},
{
name: '安全出口',
data: [
{ name: '数量', velue: '' },
{ name: '位置', velue: '' },
]
},
{
name: '标准层室内消火栓',
data: [
{ name: '数量', velue: '' },
{ name: '位置', velue: '' },
]
}
],
radiodata: [{
name: '自动报警系统',
isHave: null
},
{
name: '自动喷水系统',
isHave: null
},
{
name: '应急广播系统',
isHave: null
},
{
name: '放排烟系统',
isHave: null
}
]
},
KeyParts: [
key: [
{
keyparts: "",
keypartsposition: "",
buildingstructure: "",
useNature: "",
danger: ""
buwei: '',
data: [
{ name: '重点部位名称', value: '' },
{ name: '所在位置', value: '' },
{ name: '建筑结构', value: '' },
{ name: '使用性质', value: '' },
{ name: '主要危险性', value: '' }
]
},
{
keyparts: "",
keypartsposition: "",
buildingstructure: "",
useNature: "",
danger: ""
buwei: '',
data: [
{ name: '重点部位名称', value: '' },
{ name: '所在位置', value: '' },
{ name: '建筑结构', value: '' },
{ name: '使用性质', value: '' },
{ name: '主要危险性', value: '' }
]
}
],
tips: ""
ewai: {
kongzhishiweizhi: '',
shineishuliang: '',
shiwaishuliang: '',
shiwaiweizhi: '',
},
zhongdiantishi: ''
}
validateForm!: FormGroup;
id = ""
@ -376,14 +439,16 @@ export class UnitDetailsComponent implements OnInit {
}
}
// console.log('数字化预案详情', this.planData)
let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
if (JSON.stringify(kongzhishi.data) != "{}") {
this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
}
let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") {
this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
}
this.kongzhishiweizhi = obj.company.datas.facilities.controlPosition
this.shiwaixiaohuoshuanweizhi = obj.company.datas.facilities.fireFightingFacilities.shiwaifenbu
// let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
// if (JSON.stringify(kongzhishi.data) != "{}") {
// this.kongzhishiweizhi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
// }
// let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
// if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") {
// this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
// }
// console.log('消防控制室详情', this.kongzhishi)
// console.log('室外消火栓详情', this.shiwaixiaohuoshuan)
}).catch((err) => {
@ -517,7 +582,6 @@ export class UnitDetailsComponent implements OnInit {
//初始化地图
markerPosition2
labelGis() {
console.log('初始化地图')
this.map = new AMap.Map('container', {
zoom: 12
})
@ -540,9 +604,9 @@ export class UnitDetailsComponent implements OnInit {
if (this.isMapLabel) {//如果已经标注单位坐标
console.log('已标注单位位置')
this.map.setCenter([this.datas.basicInfo.positionCoordinates.x, this.datas.basicInfo.positionCoordinates.y]);
this.map.setCenter([this.olddata.location.x, this.olddata.location.y]);
this.oldPositionMarker = new AMap.Marker({
position: [this.datas.basicInfo.positionCoordinates.x, this.datas.basicInfo.positionCoordinates.y],
position: [this.olddata.location.x, this.olddata.location.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36)
})
@ -1407,9 +1471,6 @@ export class UnitDetailsComponent implements OnInit {
let num4 = (num + num2 + num3 - 1) / 64
this.integrity = Math.floor(num4 * 100) / 100
console.log(num, num2, num3, num4);
this.datas.basicInfo.positionCoordinates = {
x: this.markerPosition.x, y: this.markerPosition.y
}
let body = {
id: this.id,
usci: this.validateForm.value.code,
@ -1422,12 +1483,16 @@ export class UnitDetailsComponent implements OnInit {
directorPhone: this.validateForm.value.principalPhone,
securityAdministratorName: this.validateForm.value.adminName,
securityAdministratorPhone: this.validateForm.value.adminPhone,
imageFile: this.imageUrl,
companyName: this.datas.basicInfo.name,
address: this.datas.basicInfo.addr,
useNature: this.datas.basicInfo.nature,
address: this.datas.basicInfo.address,
useNature: this.datas.basicInfo.xingzhi,
data: JSON.stringify(this.datas),
integrity: this.integrity,
imageFile: this.imageUrl,
data: JSON.stringify(this.datas)
location: {
x: this.markerPosition.x,
y: this.markerPosition.y
}
}
this.http.patch('/api/Companies/' + this.id, body).subscribe(data => {
this.message.create('success', '保存成功！');
@ -1437,8 +1502,6 @@ export class UnitDetailsComponent implements OnInit {
BuildingTypes
getBuildingTypes() {
this.http.get('/api/BuildingTypes').subscribe((data: any) => {
console.log(data);
this.BuildingTypes = data
})
}
@ -1448,13 +1511,20 @@ export class UnitDetailsComponent implements OnInit {
this.http.get('/api/Companies/' + this.id).subscribe((data: any) => {
console.log('当前单位信息', data);
this.olddata = data
if (data.data) {
if (data.data && data.data != "{}") {
this.datas = JSON.parse(data.data)
if (!this.datas.ewai) {
this.datas.ewai = {
kongzhishiweizhi: "",
shineishuliang: "",
shiwaishuliang: "",
shiwaiweizhi: ""
}
}
}
this.datas.basicInfo.name = data.companyName
this.datas.basicInfo.addr = data.address
// this.datas.basicInfo.phone = data.directorPhone
this.datas.basicInfo.nature = data.useNature
this.datas.basicInfo.address = data.address
this.datas.basicInfo.xingzhi = data.useNature
this.integrity = data.integrity
this.imageUrl = data.imageFile
console.log('当前单位信息2', this.datas);
@ -1470,9 +1540,9 @@ export class UnitDetailsComponent implements OnInit {
adminName: data.securityAdministratorName,
adminPhone: data.securityAdministratorPhone,
})
if (this.datas.basicInfo.positionCoordinates && (this.datas.basicInfo.positionCoordinates.x != 0 && this.datas.basicInfo.positionCoordinates.y != 0)) {//已标注
if (this.olddata.location && (this.olddata.location.x != 0 && this.olddata.location.y != 0)) {//已标注
this.isMapLabel = true
this.markerPosition = this.datas.basicInfo.positionCoordinates
this.markerPosition = this.olddata.location
} else {//未标注
this.isMapLabel = false
}
@ -1539,6 +1609,19 @@ export class UnitDetailsComponent implements OnInit {
iwindow.close();
}
download(type) {
type == 2 ? $("#tablebox").wordExport('演练卡') : $("#tablebox2").wordExport('数字化预案');
if (type == 1) {
$("#tablebox4").wordExport('基本信息')
} else if (type == 2) {
$("#tablebox").wordExport('演练卡')
} else if (type == 3) {
$("#tablebox2").wordExport('数字化预案');
}
}
xxx(text) {
if (!text) {
return ''
}
}
}

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

@ -54,13 +54,13 @@ export class UnitComponent implements OnInit {
this.nodes = [...this.toTree.toTree(data.items)]
this.searchValue.or = JSON.parse(sessionStorage.getItem('userData')).organizationId
//回显
let unitPagesData = JSON.parse(sessionStorage.getItem('unitPagesData')) || null
if (unitPagesData) {
this.searchValue = unitPagesData.searchValue
this.PageNumber = unitPagesData.PageNumber
}
this.getCompanies()
})
}
@ -85,11 +85,12 @@ export class UnitComponent implements OnInit {
totalCount
getCompanies() {
let OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
this.nzLoading = true
let params = {
CompanyName: this.searchValue.unit,
BuildingTypeId: this.searchValue.uniytype,
OrganizationId: this.searchValue.or,
OrganizationId: this.searchValue.or ? this.searchValue.or : OrganizationId,
CompanyLevel: this.searchValue.property,
PageNumber: this.PageNumber,
PageSize: this.PageSize
@ -98,7 +99,7 @@ export class UnitComponent implements OnInit {
params: params
}).subscribe((data: any) => {
this.nzLoading = false
console.log(data);
// console.log(data);
this.totalCount = data.totalCount
this.listOfData = data.items
this.listOfData = [...this.listOfData]

1
src/app/home/nav/nav.component.ts
Unescape View File

@ -75,6 +75,7 @@ export class NavComponent implements OnInit {
}
signOut() {
sessionStorage.clear()
this.router.navigate(['/login'])
}
ngOnDestroy(): void {

8
src/app/home/task/station-task-execution/task-details/task-details.component.html
Unescape View File

@ -1160,8 +1160,8 @@
<td colspan="17"
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:1pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:330.8pt">
<p style="margin:0pt; text-align:center">
<span style="font-family:宋体; font-size:9pt" *ngIf="kongzhishi.data">
{{kongzhishi.data.addres}}
<span style="font-family:宋体; font-size:9pt">
{{kongzhishiweizhi}}
</span>
</p>
</td>
@ -1322,8 +1322,8 @@
<td colspan="8"
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:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:172.05pt">
<p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0">
<span style="font-family:宋体; font-size:9pt" *ngIf="shiwaixiaohuoshuan.data">
{{shiwaixiaohuoshuan.data.addres}}
<span style="font-family:宋体; font-size:9pt">
{{shiwaixiaohuoshuanweizhi}}
</span>
</p>
</td>

21
src/app/home/task/station-task-execution/task-details/task-details.component.ts
Unescape View File

@ -245,7 +245,8 @@ export class TaskDetailsPagesComponent implements OnInit {
addres: ''
}
}
kongzhishiweizhi = ''
shiwaixiaohuoshuanweizhi = ''
company: string
@ -295,14 +296,16 @@ export class TaskDetailsPagesComponent implements OnInit {
}
}
console.log('数字化预案详情', this.planData)
let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
if (JSON.stringify(kongzhishi.data) != "{}") {
this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
}
let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") {
this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
}
this.kongzhishiweizhi = obj.company.datas.facilities.controlPosition
this.shiwaixiaohuoshuanweizhi = obj.company.datas.facilities.fireFightingFacilities.shiwaifenbu
// let kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
// if (JSON.stringify(kongzhishi.data) != "{}") {
// this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
// }
// let shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
// if (JSON.stringify(shiwaixiaohuoshuan.data) != "{}") {
// this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
// }
// console.log('消防控制室详情', this.kongzhishi)
// console.log('室外消火栓详情', this.shiwaixiaohuoshuan)
})

Write Preview
Loading…
Cancel
Save