|
|
@ -230,13 +230,13 @@ 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]); |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
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) => { |
|
|
@ -325,7 +325,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
// 将 markers 添加到地图
|
|
|
|
// 将 markers 添加到地图
|
|
|
|
this.map.add(this.newPositionMarker); |
|
|
|
this.map.add(this.newPositionMarker); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.map.setCity('上海市'); |
|
|
|
this.map.setCity('株洲市'); |
|
|
|
} |
|
|
|
} |
|
|
|
//相关资料
|
|
|
|
//相关资料
|
|
|
|
data.relevantInfomationData ? this.AttachmentArr = JSON.parse(data.relevantInfomationData) : null |
|
|
|
data.relevantInfomationData ? this.AttachmentArr = JSON.parse(data.relevantInfomationData) : null |
|
|
@ -349,7 +349,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
}) |
|
|
|
}) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
this.map.setCity('上海市'); |
|
|
|
this.map.setCity('株洲市'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//寻找管辖单位
|
|
|
|
//寻找管辖单位
|
|
|
@ -384,8 +384,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(); |
|
|
@ -620,7 +619,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
// this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
|
|
|
|
// this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
|
|
|
|
// this.positionLngLat.x = 0
|
|
|
|
// this.positionLngLat.x = 0
|
|
|
|
// this.positionLngLat.y = 0
|
|
|
|
// this.positionLngLat.y = 0
|
|
|
|
// this.map.setCity('上海市');
|
|
|
|
// this.map.setCity('株洲市');
|
|
|
|
this.selectedFireForce.contentVerify = null |
|
|
|
this.selectedFireForce.contentVerify = null |
|
|
|
this.clearData() |
|
|
|
this.clearData() |
|
|
|
} |
|
|
|
} |
|
|
@ -811,7 +810,7 @@ export class FireForceComponent implements OnInit { |
|
|
|
this.map = new AMap.Map('container', { |
|
|
|
this.map = new AMap.Map('container', { |
|
|
|
zoom: 12 |
|
|
|
zoom: 12 |
|
|
|
}) |
|
|
|
}) |
|
|
|
this.map.setCity('上海市'); |
|
|
|
this.map.setCity('株洲市'); |
|
|
|
//输入提示
|
|
|
|
//输入提示
|
|
|
|
var autoOptions = { |
|
|
|
var autoOptions = { |
|
|
|
input: "tipinput" |
|
|
|
input: "tipinput" |
|
|
@ -989,7 +988,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 内置方法处理成功
|
|
|
|
}) |
|
|
|
}) |
|
|
|
}); |
|
|
|
}); |
|
|
@ -998,7 +998,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循环
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -1077,7 +1078,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 //文件进度数
|
|
|
|