|
|
|
@ -1,6 +1,6 @@ |
|
|
|
import { FlatTreeControl } from '@angular/cdk/tree'; |
|
|
|
import { FlatTreeControl } from '@angular/cdk/tree'; |
|
|
|
import { HttpClient } from '@angular/common/http'; |
|
|
|
import { HttpClient } from '@angular/common/http'; |
|
|
|
import { Inject, Renderer2 } from '@angular/core'; |
|
|
|
import { Inject, Renderer2, ViewChild } from '@angular/core'; |
|
|
|
import { ElementRef } from '@angular/core'; |
|
|
|
import { ElementRef } from '@angular/core'; |
|
|
|
import { Component, OnInit } from '@angular/core'; |
|
|
|
import { Component, OnInit } from '@angular/core'; |
|
|
|
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; |
|
|
|
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; |
|
|
|
@ -12,7 +12,9 @@ import { Console } from 'console'; |
|
|
|
import { TreeService } from 'src/app/http-interceptors/tree.service'; |
|
|
|
import { TreeService } from 'src/app/http-interceptors/tree.service'; |
|
|
|
import Viewer from 'viewerjs' |
|
|
|
import Viewer from 'viewerjs' |
|
|
|
declare var CryptoJS |
|
|
|
declare var CryptoJS |
|
|
|
|
|
|
|
import { ObjectsService } from "src/app/services/objects.service"; |
|
|
|
|
|
|
|
import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select' |
|
|
|
|
|
|
|
import { DateAdapter } from '@angular/material/core'; |
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'app-fire-force', |
|
|
|
selector: 'app-fire-force', |
|
|
|
templateUrl: './fire-force.component.html', |
|
|
|
templateUrl: './fire-force.component.html', |
|
|
|
@ -20,14 +22,24 @@ declare var CryptoJS |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class FireForceComponent implements OnInit { |
|
|
|
export class FireForceComponent implements OnInit { |
|
|
|
|
|
|
|
|
|
|
|
constructor(private tree: TreeService,public snackBar: MatSnackBar,private http:HttpClient,private elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { } |
|
|
|
@ViewChild('treeCarTypeSelected') treeCarTypeSelected:NzTreeSelectComponent |
|
|
|
|
|
|
|
@ViewChild('carDetailsTypeSelected') carDetailsTypeSelected:NzTreeSelectComponent |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
constructor(private tree: TreeService, public snackBar: MatSnackBar, private http: HttpClient, private elementRef: ElementRef, public renderer2: Renderer2, public dialog: MatDialog, private objectsSrv: ObjectsService) { } |
|
|
|
|
|
|
|
|
|
|
|
isCheckedOfSearchDiv: boolean = true//列表过滤滑块
|
|
|
|
isCheckedOfSearchDiv: boolean = true//列表过滤滑块
|
|
|
|
slideChange(e) { |
|
|
|
slideChange(e) { |
|
|
|
this.isCheckedOfSearchDiv = e.checked |
|
|
|
this.isCheckedOfSearchDiv = e.checked |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
searchForm: any = { |
|
|
|
searchForm: any = { |
|
|
|
name: '', |
|
|
|
name: '', |
|
|
|
|
|
|
|
integrityNum: '', |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
carSearchForm: any = { |
|
|
|
|
|
|
|
name: '', |
|
|
|
|
|
|
|
organization: '', |
|
|
|
|
|
|
|
carType: '', |
|
|
|
integrityNum: '' |
|
|
|
integrityNum: '' |
|
|
|
} |
|
|
|
} |
|
|
|
listIntegrityNum: any[] = [ |
|
|
|
listIntegrityNum: any[] = [ |
|
|
|
@ -46,6 +58,662 @@ export class FireForceComponent implements OnInit { |
|
|
|
{ id: 3, name: '中队(消防站)', isChecked: false }, |
|
|
|
{ id: 3, name: '中队(消防站)', isChecked: false }, |
|
|
|
{ id: 4, name: '其他消防队伍', isChecked: false } |
|
|
|
{ id: 4, name: '其他消防队伍', isChecked: false } |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
isCarCheckedOfSearchDiv: boolean = true//车辆列表过滤滑块
|
|
|
|
|
|
|
|
carslideChange(e) { |
|
|
|
|
|
|
|
this.isCarCheckedOfSearchDiv = e.checked |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
carsList: any = [ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//分页事件
|
|
|
|
|
|
|
|
carListChagePage(e) { |
|
|
|
|
|
|
|
this.carListPageNumber = e.pageIndex + 1 |
|
|
|
|
|
|
|
// this.getAllWaterData()
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
carDataLength: any //获取的数据一共多少条
|
|
|
|
|
|
|
|
carListPageNumber: any = 1 //当前第几页
|
|
|
|
|
|
|
|
getCarList() { |
|
|
|
|
|
|
|
let MinIntegrity = 0 |
|
|
|
|
|
|
|
let MaxIntegrity = 1.1 |
|
|
|
|
|
|
|
if (this.searchForm.integrityNum == '0') { |
|
|
|
|
|
|
|
MinIntegrity = 0 |
|
|
|
|
|
|
|
MaxIntegrity = 0.5 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '1') { |
|
|
|
|
|
|
|
MinIntegrity = 0.5 |
|
|
|
|
|
|
|
MaxIntegrity = 0.6 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '2') { |
|
|
|
|
|
|
|
MinIntegrity = 0.6 |
|
|
|
|
|
|
|
MaxIntegrity = 0.7 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '3') { |
|
|
|
|
|
|
|
MinIntegrity = 0.7 |
|
|
|
|
|
|
|
MaxIntegrity = 0.8 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '4') { |
|
|
|
|
|
|
|
MinIntegrity = 0.8 |
|
|
|
|
|
|
|
MaxIntegrity = 0.9 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '5') { |
|
|
|
|
|
|
|
MinIntegrity = 0.9 |
|
|
|
|
|
|
|
MaxIntegrity = 1.1 |
|
|
|
|
|
|
|
} else if (this.searchForm.integrityNum == '-1') { |
|
|
|
|
|
|
|
MinIntegrity = 0 |
|
|
|
|
|
|
|
MaxIntegrity = 1.1 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
let params: any = { |
|
|
|
|
|
|
|
Keyword: this.carSearchForm.name || '', |
|
|
|
|
|
|
|
OrganizationId: this.carSearchForm.organization || '', |
|
|
|
|
|
|
|
Category: this.treeCarTypeSelected && this.treeCarTypeSelected.getSelectedNodeList().length!=0 ? this.treeCarTypeSelected.getSelectedNodeList()[0].origin.title : '', |
|
|
|
|
|
|
|
MinIntegrity: MinIntegrity, |
|
|
|
|
|
|
|
MaxIntegrity: MaxIntegrity, |
|
|
|
|
|
|
|
PageSize: 16, |
|
|
|
|
|
|
|
PageNumber: this.carListPageNumber |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
console.log(params) |
|
|
|
|
|
|
|
// console.log(this.treeCarTypeSelected.getSelectedNodeList()[0].origin.title)
|
|
|
|
|
|
|
|
this.http.get('/api/FireFightingVehicles', { params: params }).subscribe((data: any) => { |
|
|
|
|
|
|
|
console.log('车辆列表', data) |
|
|
|
|
|
|
|
this.carDataLength = data.totalCount |
|
|
|
|
|
|
|
this.carsList = data.items |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//重置车辆列表
|
|
|
|
|
|
|
|
resetCarList() { |
|
|
|
|
|
|
|
this.carSearchForm = { |
|
|
|
|
|
|
|
name: '', |
|
|
|
|
|
|
|
organization: this.selectedFireForceId, |
|
|
|
|
|
|
|
carType: '', |
|
|
|
|
|
|
|
integrityNum: '' |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.getCarList() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
addFireForceCar() { |
|
|
|
|
|
|
|
let data = { |
|
|
|
|
|
|
|
organization: this.selectedFireForceId |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
const dialogRef = this.dialog.open(AddFireForceCar, { |
|
|
|
|
|
|
|
data: data, |
|
|
|
|
|
|
|
id: 'addCar' |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
dialogRef.afterClosed().subscribe( |
|
|
|
|
|
|
|
data => { |
|
|
|
|
|
|
|
this.resetCarList() |
|
|
|
|
|
|
|
this.getCarList() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//删除车辆
|
|
|
|
|
|
|
|
deleteCar(item, e) { |
|
|
|
|
|
|
|
e.stopPropagation() |
|
|
|
|
|
|
|
let isDelete = window.confirm(`确定要删除${item.name}车辆吗?`) |
|
|
|
|
|
|
|
if (isDelete) { |
|
|
|
|
|
|
|
this.http.delete(`/api/FireFightingVehicles/${item.id}`).subscribe(data => { |
|
|
|
|
|
|
|
let config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('删除成功', '确定', config); |
|
|
|
|
|
|
|
this.getCarList() |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//进入车辆详情页
|
|
|
|
|
|
|
|
carPageIndex: number = 0 |
|
|
|
|
|
|
|
carDetailsId: string |
|
|
|
|
|
|
|
carDetailsData: any |
|
|
|
|
|
|
|
openCarDetails(item) { |
|
|
|
|
|
|
|
console.log(item) |
|
|
|
|
|
|
|
this.carPageIndex = 1 |
|
|
|
|
|
|
|
this.carDetailsId = item.id |
|
|
|
|
|
|
|
this.carDetailsData = item |
|
|
|
|
|
|
|
//消防器材
|
|
|
|
|
|
|
|
item.equipmentData ? this.carData.fireEquipment = JSON.parse(item.equipmentData) : this.carData.fireEquipment.data[0].equipmentOr = item.organizationId |
|
|
|
|
|
|
|
//灭火剂
|
|
|
|
|
|
|
|
item.extinguishingAgentData ? this.carData.carExtinguishant = JSON.parse(item.extinguishingAgentData) : this.carData.carExtinguishant.data[0].extinguishantOr = item.organizationId |
|
|
|
|
|
|
|
//作战用行动
|
|
|
|
|
|
|
|
item.combatInformationData ? this.carData.fightInfo = JSON.parse(item.combatInformationData) : null |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.carData.basicInfo.carName = item.name |
|
|
|
|
|
|
|
this.carData.basicInfo.carOrganization = item.organizationId |
|
|
|
|
|
|
|
this.carData.basicInfo.carNumber = item.registrationNumber |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (let index = 0; index < this.carTypeList.length; index++) { |
|
|
|
|
|
|
|
const element = this.carTypeList[index]; |
|
|
|
|
|
|
|
if(element.title == item.category){ |
|
|
|
|
|
|
|
this.carData.basicInfo.carType = element.key |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(element.children && element.children.length != 0){ |
|
|
|
|
|
|
|
for (let i = 0; i < element.children.length; i++) { |
|
|
|
|
|
|
|
const item = element.children[i]; |
|
|
|
|
|
|
|
if(item.title == item.category){ |
|
|
|
|
|
|
|
this.carData.basicInfo.carType = item.key |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//返回车辆列表页
|
|
|
|
|
|
|
|
goback() { |
|
|
|
|
|
|
|
this.carPageIndex = 0 |
|
|
|
|
|
|
|
this.clearCarDetails() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//重置车辆详情
|
|
|
|
|
|
|
|
clearCarDetails() { |
|
|
|
|
|
|
|
this.carData = { |
|
|
|
|
|
|
|
basicInfo: { |
|
|
|
|
|
|
|
carType: '',//车辆类别
|
|
|
|
|
|
|
|
carName: '', |
|
|
|
|
|
|
|
carNumber: '', |
|
|
|
|
|
|
|
carOrganization: '' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
fightInfo: { |
|
|
|
|
|
|
|
pumpFlow: '',//水泵流量
|
|
|
|
|
|
|
|
fireGunFlow: '',//消防炮流量
|
|
|
|
|
|
|
|
pumpPressure: '',//水泵额定压力
|
|
|
|
|
|
|
|
waterCapacity: '',//载水量
|
|
|
|
|
|
|
|
carHeight: '',//车辆高度
|
|
|
|
|
|
|
|
carState: '',//车辆状态
|
|
|
|
|
|
|
|
remark: '',//备注
|
|
|
|
|
|
|
|
carPhoto: []//车辆照片
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
carExtinguishant: {//车载灭火剂
|
|
|
|
|
|
|
|
isExpand: null, |
|
|
|
|
|
|
|
data: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
extinguishantType: '',//灭火剂类型
|
|
|
|
|
|
|
|
extinguishantName: '',//灭火剂名称
|
|
|
|
|
|
|
|
extinguishantOr: '',//所属队站
|
|
|
|
|
|
|
|
mixingRatio: '',//混合比
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
fireEquipment: {//消防器材
|
|
|
|
|
|
|
|
isExpand: null, |
|
|
|
|
|
|
|
data: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
equipmentType: '',//器材类别
|
|
|
|
|
|
|
|
equipmentName: '',//器材名称
|
|
|
|
|
|
|
|
equipmentOr: '',//所属队站
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//消防车类型
|
|
|
|
|
|
|
|
carTypeList: any = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '灭火类消防车', |
|
|
|
|
|
|
|
key: '1', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '水罐车', key: '11', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '泡沫车', key: '12', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '高倍数泡沫车', key: '13', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '干粉车', key: '14', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '干粉泡沫联用车', key: '15', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '干粉水联用车', key: '16', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '干粉二氧化碳联用车', key: '17', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '涡喷车', key: '18', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '液氮车', key: '19', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '二氧化碳车', key: '110', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他灭火消防车', key: '111', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '举高类消防车', |
|
|
|
|
|
|
|
key: '2', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '高喷车', key: '21', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '曲臂登高车', key: '22', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '直臂登高车', key: '23', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他举高消防车', key: '24', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '专勤类消防车', |
|
|
|
|
|
|
|
key: '3', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '抢险救援车', key: '31', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '侦检车', key: '32', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '勘察车', key: '33', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '排烟车', key: '34', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '照明车', key: '35', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '宣传车', key: '36', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '排烟照明车', key: '37', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '通信指挥车', key: '38', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '有毒气体处置车', key: '39', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '防化消防车', key: '310', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '挖掘车', key: '311', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '铲车', key: '312', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '破拆车', key: '313', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他专勤消防车', key: '314', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '后援类消防车', |
|
|
|
|
|
|
|
key: '4', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '饮食保障车', key: '41', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '卫勤保障车', key: '42', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '排障车', key: '43', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '装备抢修车', key: '44', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '拖车车', key: '45', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '运兵车', key: '46', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '运输车', key: '47', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '运渣车', key: '48', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '吊车', key: '49', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '移动供气车', key: '410', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '移动供液车', key: '411', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '油料供给车', key: '412', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '远程供水车(水泵)', key: '413', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '远程供水车(水带铺设)', key: '414', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '宿营车', key: '415', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '发电车', key: '416', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '淋浴车', key: '417', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他后援消防车', key: '418', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '机场消防车', |
|
|
|
|
|
|
|
key: '5', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '机场快速调动消防车', key: '51', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '机场主力泡沫消防车', key: '52', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他机场消防车', key: '53', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '防爆消防车', key: '54', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '轨道消防车(GD)', key: '55', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '消防摩托车', |
|
|
|
|
|
|
|
key: '6', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '灭火消防摩托车', key: '61', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '抢险救援摩托车', key: '62', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他消防摩托车', key: '63', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '联动类车辆', |
|
|
|
|
|
|
|
key: '7', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ title: '急救车', key: '71', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '警用指挥车', key: '72', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '警用巡逻车', key: '73', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '警用摩托车', key: '74', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '电力抢修车', key: '75', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '水力抢修车', key: '76', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '燃气抢修车', key: '77', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '特种工程车', key: '78', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '环保监测车', key: '79', isLeaf: true }, |
|
|
|
|
|
|
|
{ title: '其他联动车辆', key: '710', isLeaf: true } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
title: '其他消防车辆', |
|
|
|
|
|
|
|
key: '8', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
//灭火剂分类
|
|
|
|
|
|
|
|
extinguishantTypeList: any = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1', |
|
|
|
|
|
|
|
title: '泡沫灭火剂', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1-1', |
|
|
|
|
|
|
|
title: '蛋白类泡沫灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1-2', |
|
|
|
|
|
|
|
title: '合成类泡沫灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1-3', |
|
|
|
|
|
|
|
title: '压缩空气泡沫灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1-4', |
|
|
|
|
|
|
|
title: '化学泡沫灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1-5', |
|
|
|
|
|
|
|
title: '其他类泡沫灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2', |
|
|
|
|
|
|
|
title: '水泵灭火剂', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-1', |
|
|
|
|
|
|
|
title: '强化水', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-2', |
|
|
|
|
|
|
|
title: '乳化水', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-3', |
|
|
|
|
|
|
|
title: '润湿水', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-4', |
|
|
|
|
|
|
|
title: '粘性水', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-5', |
|
|
|
|
|
|
|
title: 'SD系列水泵灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-6', |
|
|
|
|
|
|
|
title: '微胞囊类水泵灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2-7', |
|
|
|
|
|
|
|
title: '其他水泵灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3', |
|
|
|
|
|
|
|
title: '干粉灭火剂', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3-1', |
|
|
|
|
|
|
|
title: '普通干粉灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3-2', |
|
|
|
|
|
|
|
title: '超细干粉灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3-3', |
|
|
|
|
|
|
|
title: '金属火灾干粉灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3-4', |
|
|
|
|
|
|
|
title: '其他干粉灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4', |
|
|
|
|
|
|
|
title: '气体灭火剂', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4-1', |
|
|
|
|
|
|
|
title: '卤代烷烃灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4-2', |
|
|
|
|
|
|
|
title: '二氧化碳灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4-3', |
|
|
|
|
|
|
|
title: '惰性气体灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4-4', |
|
|
|
|
|
|
|
title: '其他气体灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '5', |
|
|
|
|
|
|
|
title: '其他灭火剂', |
|
|
|
|
|
|
|
children: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '5-1', |
|
|
|
|
|
|
|
title: '液氮', isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '5-2', |
|
|
|
|
|
|
|
title: '火碱', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '5-3', |
|
|
|
|
|
|
|
title: '其他灭火剂', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
//消防器材分类
|
|
|
|
|
|
|
|
fireEquipmentTypeList: any = [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '1', |
|
|
|
|
|
|
|
title: '消防人员防护装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '2', |
|
|
|
|
|
|
|
title: '灭火器材装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '3', |
|
|
|
|
|
|
|
title: '抢险救援装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '4', |
|
|
|
|
|
|
|
title: '消防通讯指挥装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '5', |
|
|
|
|
|
|
|
title: '特种消防装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '6', |
|
|
|
|
|
|
|
title: '防火检查与火灾调查装备', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
key: '7', |
|
|
|
|
|
|
|
title: '其他类消防装备器材', |
|
|
|
|
|
|
|
isLeaf: true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
expandOrKeys = []; |
|
|
|
|
|
|
|
expandCarTypeKeys = []; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onChangeCarType($event: string): void { |
|
|
|
|
|
|
|
console.log(this.treeCarTypeSelected.getSelectedNodeList()[0].origin.title); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
carDetailsTypeChange($event: string): void { |
|
|
|
|
|
|
|
console.log(this.carDetailsTypeSelected.getSelectedNodeList()[0].origin.title); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
onChange($event: string): void { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
searchCarList() { |
|
|
|
|
|
|
|
this.getCarList() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//车辆详细信息
|
|
|
|
|
|
|
|
carData: any = { |
|
|
|
|
|
|
|
basicInfo: { |
|
|
|
|
|
|
|
carType: '',//车辆类别
|
|
|
|
|
|
|
|
carName: '', |
|
|
|
|
|
|
|
carNumber: '', |
|
|
|
|
|
|
|
carOrganization: '' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
fightInfo: { |
|
|
|
|
|
|
|
pumpFlow: '',//水泵流量
|
|
|
|
|
|
|
|
fireGunFlow: '',//消防炮流量
|
|
|
|
|
|
|
|
pumpPressure: '',//水泵额定压力
|
|
|
|
|
|
|
|
waterCapacity: '',//载水量
|
|
|
|
|
|
|
|
carHeight: '',//车辆高度
|
|
|
|
|
|
|
|
carState: '',//车辆状态
|
|
|
|
|
|
|
|
remark: '',//备注
|
|
|
|
|
|
|
|
carPhoto: []//车辆照片
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
carExtinguishant: {//车载灭火剂
|
|
|
|
|
|
|
|
isExpand: null, |
|
|
|
|
|
|
|
data: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
extinguishantType: '',//灭火剂类型
|
|
|
|
|
|
|
|
extinguishantName: '',//灭火剂名称
|
|
|
|
|
|
|
|
extinguishantOr: '',//所属队站
|
|
|
|
|
|
|
|
mixingRatio: '',//混合比
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
fireEquipment: {//消防器材
|
|
|
|
|
|
|
|
isExpand: null, |
|
|
|
|
|
|
|
data: [ |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
equipmentType: '',//器材类别
|
|
|
|
|
|
|
|
equipmentName: '',//器材名称
|
|
|
|
|
|
|
|
equipmentOr: '',//所属队站
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//车辆详情新增按钮
|
|
|
|
|
|
|
|
addCarDetailsItem(type) { |
|
|
|
|
|
|
|
if (type == 'carExtinguishant') { |
|
|
|
|
|
|
|
this.carData.carExtinguishant.data.push({ |
|
|
|
|
|
|
|
extinguishantType: '',//灭火剂类型
|
|
|
|
|
|
|
|
extinguishantName: '',//灭火剂名称
|
|
|
|
|
|
|
|
extinguishantOr: this.carDetailsData.organizationId,//所属队站
|
|
|
|
|
|
|
|
mixingRatio: '',//混合比
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} else if (type == 'fireEquipment') { |
|
|
|
|
|
|
|
this.carData.fireEquipment.data.push({ |
|
|
|
|
|
|
|
equipmentType: '',//器材类别
|
|
|
|
|
|
|
|
equipmentName: '',//器材名称
|
|
|
|
|
|
|
|
equipmentOr: this.carDetailsData.organizationId,//所属队站
|
|
|
|
|
|
|
|
capacity: '',//车载量
|
|
|
|
|
|
|
|
manufacturer: '',//成产厂家
|
|
|
|
|
|
|
|
remark: ''//备注
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
deleteCarDetailsItem(arr, index) { |
|
|
|
|
|
|
|
let isDelete = window.confirm('确定要删除该分组吗？') |
|
|
|
|
|
|
|
if (isDelete) { |
|
|
|
|
|
|
|
arr.splice(index, 1) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//上传车辆照片
|
|
|
|
|
|
|
|
uploadCarImg(e) { |
|
|
|
|
|
|
|
// this.file = e.target.files[0] || null //上传的文件
|
|
|
|
|
|
|
|
let file = e.target.files[0] || null //获取上传的文件
|
|
|
|
|
|
|
|
this.openFileSelect(file, 'FireForce/car/' + this.carDetailsId) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//设置文件路径并上传
|
|
|
|
|
|
|
|
postFilePath |
|
|
|
|
|
|
|
openFileSelect(file: File, extensionPath: string) { |
|
|
|
|
|
|
|
this.postFilePath = extensionPath; |
|
|
|
|
|
|
|
let fileSize = file.size || null //上传文件的总大小
|
|
|
|
|
|
|
|
let shardSize = 5 * 1024 * 1024 //5MB 超过5MB要分块上传
|
|
|
|
|
|
|
|
if (fileSize >= shardSize) // 超过5MB要分块上传
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
this.postFileByMul(file); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else //普通上传
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
this.postFile(file); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//上传文件
|
|
|
|
|
|
|
|
async postFile(file: File) { |
|
|
|
|
|
|
|
await new Promise((resolve, reject) => { |
|
|
|
|
|
|
|
this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => { |
|
|
|
|
|
|
|
let dataObj = data as any; |
|
|
|
|
|
|
|
let filePath: string = ObjectsService.baseUrl + dataObj.objectName; |
|
|
|
|
|
|
|
this.carData.fightInfo.carPhoto[0] = filePath |
|
|
|
|
|
|
|
resolve('success') |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 分块上传 |
|
|
|
|
|
|
|
* @param file
|
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
postFileByMul(file: File) { |
|
|
|
|
|
|
|
this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => { |
|
|
|
|
|
|
|
let dataObj = value as any; |
|
|
|
|
|
|
|
this.carData.fightInfo.carPhoto[0] = dataObj.filePath |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//保存车辆信息
|
|
|
|
|
|
|
|
saveCarData(invalid) { |
|
|
|
|
|
|
|
console.log(invalid) |
|
|
|
|
|
|
|
if (invalid) { |
|
|
|
|
|
|
|
let config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('还有必填项未填写！', '确定', config); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.carDetailsData.category = this.carDetailsTypeSelected.getSelectedNodeList()[0].origin.title |
|
|
|
|
|
|
|
this.carDetailsData.name = this.carData.basicInfo.carName |
|
|
|
|
|
|
|
this.carDetailsData.registrationNumber = this.carData.basicInfo.carNumber |
|
|
|
|
|
|
|
this.carDetailsData.organizationId = this.carData.basicInfo.carOrganization |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.carDetailsData.combatInformationData = JSON.stringify(this.carData.fightInfo) |
|
|
|
|
|
|
|
this.carDetailsData.equipmentData = JSON.stringify(this.carData.fireEquipment) |
|
|
|
|
|
|
|
this.carDetailsData.extinguishingAgentData = JSON.stringify(this.carData.carExtinguishant) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.carDetailsData.updatedTime = new Date() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log('putbody',this.carDetailsData) |
|
|
|
|
|
|
|
this.http.put(`/api/FireFightingVehicles/${this.carDetailsData.id}`,this.carDetailsData).subscribe(data=>{ |
|
|
|
|
|
|
|
let config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('保存成功', '确定', config); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//勾选力量类型checkbox在地图上显示marker
|
|
|
|
//勾选力量类型checkbox在地图上显示marker
|
|
|
|
checkBoxChange() { |
|
|
|
checkBoxChange() { |
|
|
|
let Levels = [] |
|
|
|
let Levels = [] |
|
|
|
@ -197,6 +865,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
} |
|
|
|
} |
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
this.getAllFireForce() |
|
|
|
this.getAllFireForce() |
|
|
|
|
|
|
|
this.getAllFireForce2() |
|
|
|
setTimeout(() => { |
|
|
|
setTimeout(() => { |
|
|
|
this.createMap() |
|
|
|
this.createMap() |
|
|
|
}, 0); |
|
|
|
}, 0); |
|
|
|
@ -236,13 +905,30 @@ export class FireForceComponent implements OnInit { |
|
|
|
} |
|
|
|
} |
|
|
|
this.http.get('/api/CustomFireForce', { params: params }).subscribe((data: any) => { |
|
|
|
this.http.get('/api/CustomFireForce', { params: params }).subscribe((data: any) => { |
|
|
|
this.allFireForceList = data |
|
|
|
this.allFireForceList = data |
|
|
|
this.dataSource.data = this.tree.toTree(data) |
|
|
|
this.dataSource.data = this.tree.toTree(data) |
|
|
|
this.treeControl.expand(this.treeControl.dataNodes[0]); |
|
|
|
this.treeControl.expand(this.treeControl.dataNodes[0]); |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
//获得当前点击队站的组织机构
|
|
|
|
|
|
|
|
clickOrganizationTree: any |
|
|
|
|
|
|
|
getAllFireForce2() { |
|
|
|
|
|
|
|
this.http.get('/api/CustomFireForce').subscribe((data: any) => { |
|
|
|
|
|
|
|
this.clickOrganizationTree = data |
|
|
|
|
|
|
|
this.clickOrganizationTree.forEach(item => { |
|
|
|
|
|
|
|
item.children = [] |
|
|
|
|
|
|
|
item.title = item.name |
|
|
|
|
|
|
|
item.key = item.id |
|
|
|
|
|
|
|
this.clickOrganizationTree.forEach(element => { |
|
|
|
|
|
|
|
if (element.parentId == item.id) { |
|
|
|
|
|
|
|
item.children.push(element) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
upDateAllFireForce = (): void => { |
|
|
|
upDateAllFireForce = (): void => { |
|
|
|
this.http.get('/api/CustomFireForce').subscribe((data: any) => { |
|
|
|
this.http.get('/api/CustomFireForce').subscribe((data: any) => { |
|
|
|
this.newdata = this.tree.toTree(data) |
|
|
|
this.newdata = this.tree.toTree(data) |
|
|
|
const nodes = this.treeControl.dataNodes; |
|
|
|
const nodes = this.treeControl.dataNodes; |
|
|
|
const expandNodes = []; |
|
|
|
const expandNodes = []; |
|
|
|
nodes.forEach((item) => { |
|
|
|
nodes.forEach((item) => { |
|
|
|
@ -290,13 +976,21 @@ export class FireForceComponent implements OnInit { |
|
|
|
name: '', |
|
|
|
name: '', |
|
|
|
code: '' |
|
|
|
code: '' |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
selectOrganizationTree: any = [] |
|
|
|
selectTreeNode(node) { |
|
|
|
selectTreeNode(node) { |
|
|
|
// console.log(node)
|
|
|
|
console.log(111222,node) |
|
|
|
this.isGisTopBox = false |
|
|
|
this.isGisTopBox = false |
|
|
|
if (this.selectedFireForceId != node.id) { |
|
|
|
if (this.selectedFireForceId != node.id) { |
|
|
|
|
|
|
|
|
|
|
|
this.clearData() |
|
|
|
this.clearData() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.carPageIndex = 0//回到车辆列表页
|
|
|
|
this.selectedFireForce = node |
|
|
|
this.selectedFireForce = node |
|
|
|
this.selectedFireForceId = node.id |
|
|
|
this.selectedFireForceId = node.id |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.resetCarList() |
|
|
|
|
|
|
|
this.clearCarDetails() |
|
|
|
|
|
|
|
this.getCarList() |
|
|
|
if (node.forceType != 0) {//如果是其他消防力量
|
|
|
|
if (node.forceType != 0) {//如果是其他消防力量
|
|
|
|
this.selectedFireForceLevel = 4 |
|
|
|
this.selectedFireForceLevel = 4 |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
@ -351,10 +1045,13 @@ export class FireForceComponent implements OnInit { |
|
|
|
if (node.forceType != 0) { |
|
|
|
if (node.forceType != 0) { |
|
|
|
this.otherpersonCountData = JSON.parse(data.personCountData) || this.otherpersonCountData |
|
|
|
this.otherpersonCountData = JSON.parse(data.personCountData) || this.otherpersonCountData |
|
|
|
this.othercontactData = JSON.parse(data.contactData) || this.othercontactData |
|
|
|
this.othercontactData = JSON.parse(data.contactData) || this.othercontactData |
|
|
|
|
|
|
|
console.log(8888,this.othercontactData) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}, err => { |
|
|
|
|
|
|
|
this.isMasklayer = false |
|
|
|
|
|
|
|
alert('获取信息错误！') |
|
|
|
}) |
|
|
|
}) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
this.map.setCity('上海市'); |
|
|
|
this.map.setCity('上海市'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -365,6 +1062,14 @@ export class FireForceComponent implements OnInit { |
|
|
|
this.superior.code = item.code |
|
|
|
this.superior.code = item.code |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
//找出点击的组织及其下属机构
|
|
|
|
|
|
|
|
this.carSearchForm.organization = node.id |
|
|
|
|
|
|
|
this.clickOrganizationTree.forEach(item => { |
|
|
|
|
|
|
|
if (item.id == node.id) { |
|
|
|
|
|
|
|
this.selectOrganizationTree[0] = item |
|
|
|
|
|
|
|
console.log('点击的组织机构', this.selectOrganizationTree) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//搜索
|
|
|
|
//搜索
|
|
|
|
@ -390,8 +1095,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
} |
|
|
|
} |
|
|
|
//js乘法
|
|
|
|
//js乘法
|
|
|
|
accMul(arg1, arg2, fix) { |
|
|
|
accMul(arg1, arg2, fix) { |
|
|
|
if(!parseInt(fix)==fix) |
|
|
|
if (!parseInt(fix) == fix) { |
|
|
|
{ |
|
|
|
|
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
var m = 0, s1 = arg1.toString(), s2 = arg2.toString(); |
|
|
|
var m = 0, s1 = arg1.toString(), s2 = arg2.toString(); |
|
|
|
@ -993,7 +1697,8 @@ export class FireForceComponent implements OnInit { |
|
|
|
this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { |
|
|
|
this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { |
|
|
|
let msg = { |
|
|
|
let msg = { |
|
|
|
"partNumber": data.partNumber || null, |
|
|
|
"partNumber": data.partNumber || null, |
|
|
|
"eTag": data.eTag || null} |
|
|
|
"eTag": data.eTag || null |
|
|
|
|
|
|
|
} |
|
|
|
resolve(msg) // 调用 promise 内置方法处理成功
|
|
|
|
resolve(msg) // 调用 promise 内置方法处理成功
|
|
|
|
}) |
|
|
|
}) |
|
|
|
}); |
|
|
|
}); |
|
|
|
@ -1002,7 +1707,8 @@ export class FireForceComponent implements OnInit { |
|
|
|
this.progressBarValue = this.accMul(Number((i / allSlice).toFixed(2)) * 100, 1, 0) |
|
|
|
this.progressBarValue = this.accMul(Number((i / allSlice).toFixed(2)) * 100, 1, 0) |
|
|
|
if (this.PartNumberETag.length === allSlice) { |
|
|
|
if (this.PartNumberETag.length === allSlice) { |
|
|
|
this.progressBarValue = 100 |
|
|
|
this.progressBarValue = 100 |
|
|
|
this.endUploading()} |
|
|
|
this.endUploading() |
|
|
|
|
|
|
|
} |
|
|
|
}//for循环
|
|
|
|
}//for循环
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
@ -1081,7 +1787,8 @@ export class FireForceComponent implements OnInit { |
|
|
|
|
|
|
|
|
|
|
|
let result = await new Promise((result, reject) => { |
|
|
|
let result = await new Promise((result, reject) => { |
|
|
|
this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { |
|
|
|
this.http.get(`/api/Objects/PlanPlatform/${e.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { |
|
|
|
result(data) })
|
|
|
|
result(data) |
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
}) |
|
|
|
allFile.push(result) |
|
|
|
allFile.push(result) |
|
|
|
// this.progressBarValue = Number((i/allSlice).toFixed(2))*100 //文件进度数
|
|
|
|
// this.progressBarValue = Number((i/allSlice).toFixed(2))*100 //文件进度数
|
|
|
|
@ -1204,6 +1911,51 @@ export class AddFireForce { |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//新增消防车辆弹出框
|
|
|
|
|
|
|
|
@Component({ |
|
|
|
|
|
|
|
selector: 'addwater', |
|
|
|
|
|
|
|
templateUrl: './addFireForceCar.html', |
|
|
|
|
|
|
|
styleUrls: ['./fire-force.component.scss'] |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
export class AddFireForceCar { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
constructor(private http: HttpClient, public dialogRef: MatDialogRef<AddFireForceCar>, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
addList: any = [ |
|
|
|
|
|
|
|
{ id: 4, name: '微型消防站' }, |
|
|
|
|
|
|
|
{ id: 5, name: '企业专职消防站' }, |
|
|
|
|
|
|
|
{ id: 6, name: '义务(志愿)消防站' } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
selectedFireForceTypeIndex: any = 4 |
|
|
|
|
|
|
|
selecteAddType(item, key) { |
|
|
|
|
|
|
|
this.selectedFireForceTypeIndex = item.id |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
carName: string |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onSubmit(value) { |
|
|
|
|
|
|
|
// console.log('organizationId', this.data.organization)
|
|
|
|
|
|
|
|
// console.log(value)
|
|
|
|
|
|
|
|
let body = { |
|
|
|
|
|
|
|
name: this.carName, |
|
|
|
|
|
|
|
organizationId: this.data.organization |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.http.post('/api/FireFightingVehicles', body).subscribe(data => { |
|
|
|
|
|
|
|
let config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('新增成功', '确定', config); |
|
|
|
|
|
|
|
this.dialogRef.close(data) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//查看图片大图和视频
|
|
|
|
//查看图片大图和视频
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'viewdetails', |
|
|
|
selector: 'viewdetails', |
|
|
|
|
