From e639d361fff683d5fbead361ec4ddba6a7374bf0 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 09 九月 2020 09:23:34 +0800
Subject: [PATCH] 同步处理批量添加摄像机结果,实时监控区域比例调整,解决线条虚化的问题

---
 src/components/LeftNav.vue |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 98e72a4..2ef7e0d 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -548,7 +548,7 @@
 
             let succeed = 0;
             let failed = 0;
-
+            let promiseArr = [];
             for (let item in sheetArray) {
               let camera = this.newCamera();
               camera.areaid = this.importAreaId;
@@ -556,26 +556,27 @@
               camera.rtsp = String(sheetArray[item].rtsp);
               camera.addr = String(sheetArray[item].addr);
 
-              createCamera(camera).then(rsp => {
-                if (rsp && rsp.success) {
+              promiseArr.push(createCamera(camera));
+            }
+            let _this = this;
+            Promise.allSettled(promiseArr).then(res=>{
+              res.forEach(item=>{
+                if(item.status === 'fulfilled'){
                   succeed++;
-                } else {
+                }else{
                   failed++;
                 }
-              }).catch(err => {
-                failed++;
-              })
-            }
-
-            let _this = this
-            setTimeout(() => {
-              this.menuLoading = false;
+              });
+              _this.menuLoading = false;
               _this.$message({
                 type: "success",
                 message: "鎿嶄綔瀹屾垚, 瀵煎叆鎴愬姛:" + succeed + "涓� 澶辫触:" + failed + "涓�"
               })
               _this.TreeDataPool.fetchTreeData();
-            }, 2000)
+            }).catch(e=>{
+              console.log(e)
+            });
+            
           }
         } catch (e) {
           this.menuLoading = false

--
Gitblit v1.8.0