|
@@ -2175,9 +2175,9 @@ export default {
|
|
|
},
|
|
|
table1: {
|
|
|
reportUnit: null,
|
|
|
- reportTimeY: null,
|
|
|
- reportTimeM: null,
|
|
|
- reportTimeD: null,
|
|
|
+ reportTimeY: new Date().getFullYear(),
|
|
|
+ reportTimeM: new Date().getMonth() + 1,
|
|
|
+ reportTimeD: new Date().getDate(),
|
|
|
forestFireLossTotal: null,
|
|
|
fireLossTotal: null,
|
|
|
forestArea: null,
|
|
@@ -2218,11 +2218,11 @@ export default {
|
|
|
fireSource: null,
|
|
|
fireType: null,
|
|
|
fireLevel: null,
|
|
|
- areaTotal: null,
|
|
|
+ areaTotal: 0,
|
|
|
forestLossAreaTotal: null,
|
|
|
originalForestArea: null,
|
|
|
artificialForestArea: null,
|
|
|
- peopleTotal: null,
|
|
|
+ peopleTotal: 0,
|
|
|
blazesTeamNumber: null,
|
|
|
policeNumber: null,
|
|
|
armyNumber: null,
|
|
@@ -2231,9 +2231,9 @@ export default {
|
|
|
secondTool: null,
|
|
|
waterGun: null,
|
|
|
elseThings: null,
|
|
|
- forestComposition: null,
|
|
|
- forestToken: null,
|
|
|
- porosities: null,
|
|
|
+ forestComposition: "无",
|
|
|
+ forestToken: "无",
|
|
|
+ porosities: "无",
|
|
|
weather: null,
|
|
|
temperature: null,
|
|
|
fireInsuranceLevel: null,
|
|
@@ -3756,10 +3756,10 @@ export default {
|
|
|
// imageTofile是给截图范围内的父级元素自定义的ref名称
|
|
|
// let canvasBox = this.$refs.imageTofile
|
|
|
let canvasBox = document.getElementById("forestWarmSuperMap");
|
|
|
- let toolbar = document.getElementById("toolbar");
|
|
|
- if (toolbar != null) {
|
|
|
- canvasBox.removeChild(toolbar);
|
|
|
- }
|
|
|
+ // let toolbar = document.getElementById("toolbar");
|
|
|
+ // if (toolbar != null) {
|
|
|
+ // canvasBox.removeChild(toolbar);
|
|
|
+ // }
|
|
|
// 获取父级的宽高
|
|
|
const width = parseInt(window.getComputedStyle(canvasBox).width);
|
|
|
const height = parseInt(window.getComputedStyle(canvasBox).height);
|
|
@@ -3781,7 +3781,7 @@ export default {
|
|
|
let dataBase64 = canvas.toDataURL("image/png");
|
|
|
this.uploadBase64(dataBase64);
|
|
|
});
|
|
|
- canvasBox.appendChild(toolbar);
|
|
|
+ // canvasBox.appendChild(toolbar);
|
|
|
},
|
|
|
uploadBase64(dataBase64) {
|
|
|
//事件详情截图直接上传日志
|