From 3ef4a31df601c1763b565411b33194d48d9e4eaa Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Fri, 29 Jan 2021 11:36:16 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E5=BA=95=E5=9B=BE=E9=99=90=E5=88=B610MB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools-building/collection-tools.component.ts  | 2 +-
 .../ui/collection-tools-plan/collection-tools.component.ts   | 2 +-
 src/app/ui/collection-tools-plan/leftFunctionalDomain.ts     | 2 +-
 src/app/ui/collection-tools/collection-tools.component.ts    | 5 +++--
 src/app/ui/collection-tools/leftFunctionalDomain.ts          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 4a50aa3..ddc4db5 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-building/collection-tools.component.ts
@@ -1934,7 +1934,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
     e.stopPropagation();
     let file = e.target.files[0] || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
-    let maxSize = 5 * 1024 * 1024 //5MB一个分片
+    let maxSize = 10 * 1024 * 1024 //5MB一个分片
 
     if (file && fileSize<=maxSize) { //上传文件<=5MB时
       let formData = new FormData()
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index f797fd0..833bfd9 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -1944,7 +1944,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     e.stopPropagation();
     let file = e.target.files[0] || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
-    let maxSize = 5 * 1024 * 1024 //5MB一个分片
+    let maxSize = 10 * 1024 * 1024 //5MB一个分片
 
     if (file && fileSize<=maxSize) { //上传文件<=5MB时
       let formData = new FormData()
diff --git a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
index b010e94..06d9f09 100644
--- a/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools-plan/leftFunctionalDomain.ts
@@ -28,7 +28,7 @@ export class leftFunctionalDomainComponentPlan implements OnInit {
   //选择文件
   selectFile (e) {
     if (e.target.files.length) {
-      let maxSize = 5*1024*1024 
+      let maxSize = 10*1024*1024 
       if (e.target.files[0].size <= maxSize) {
         this.file = e.target.files[0]
       } else {
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 3787df7..328b79e 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -1594,7 +1594,7 @@ export class CollectionToolsComponent implements OnInit {
   }
 
   sitePlanData:any = []; //总平面图 楼层/区域 数据
-  selectingSitePlan:any; //选中的 平面图 楼层/区域
+  selectingSitePlan:any = {id:null}; //选中的 平面图 楼层/区域
   selectSitePlanIndex:number; //选中的 平面图 楼层/区域 index
 
   //获取总平面图
@@ -1970,7 +1970,7 @@ export class CollectionToolsComponent implements OnInit {
     e.stopPropagation();
     let file = e.target.files[0] || null //获取上传的文件
     let fileSize = file.size || null //上传文件的总大小
-    let maxSize = 5 * 1024 * 1024 //5MB一个分片
+    let maxSize = 10 * 1024 * 1024 //5MB一个分片
 
     if (file && fileSize<=maxSize) { //上传文件<=5MB时
       let formData = new FormData()
@@ -2123,6 +2123,7 @@ export class CollectionToolsComponent implements OnInit {
   //获取所有处置节点
   getDisposalNode () {
     this.selectDisposalNode = ''
+    this.canvasData.selectPanelPoint = new DisposalNodeData();
     let params = {disasterId: this.allFirePlan[0].id || ''}
     this.http.get('/api/DisasterData/Markers',{params:params}).subscribe(data=>{ //灾情标签信息
       this.canvasData.allNodeMarkers = data
diff --git a/src/app/ui/collection-tools/leftFunctionalDomain.ts b/src/app/ui/collection-tools/leftFunctionalDomain.ts
index 9703cd8..c73da68 100644
--- a/src/app/ui/collection-tools/leftFunctionalDomain.ts
+++ b/src/app/ui/collection-tools/leftFunctionalDomain.ts
@@ -145,7 +145,7 @@ export class addBGCDisposalNodeComponent implements OnInit {
   //上传图片
   selectFile (e) {
     if (e.target.files.length) {
-      let maxSize = 5*1024*1024 
+      let maxSize = 10*1024*1024 
       if (e.target.files[0].size <= maxSize) {
         this.file = e.target.files[0]
       } else {