From c7e9b3d0dbb522c56be7832623c09f3cbaa48aa4 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 1 Apr 2024 10:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E3=80=81=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E3=80=81=E8=B7=AF=E6=AE=B5=E3=80=81=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/components/mapRightContent.vue  | 136 ++++++++++--------
 1 file changed, 74 insertions(+), 62 deletions(-)

diff --git a/src/views/bigScreen/components/mapRightContent.vue b/src/views/bigScreen/components/mapRightContent.vue
index 3086b90..e6efd20 100644
--- a/src/views/bigScreen/components/mapRightContent.vue
+++ b/src/views/bigScreen/components/mapRightContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 11:09:57
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-08 10:15:01
+ * @LastEditTime: 2024-04-01 10:14:26
 -->
 <template>
   <div class="right-box">
@@ -159,72 +159,84 @@ export default {
         }
       })
     },
-    getWangge(newWange){
-      let data = newWange.map((item)=>{
-        let data = {
-          startTime: this.getCurrentTime(),
-          endTime: this.getCurrentTime(1),
-          gridld: item.id
-        }
-        statgrid(data).then(res=>{
-          this.$set(item,'total',res.data.total);
-          item.total = res.data.total;
-          item.handled = res.data.handled;
-          item.unhandled = res.data.unhandled;
+    async getWangge(newWange){
+      try {
+        let wagearr = [...newWange]
+        let promises = wagearr.map(async (item)=>{
+          let data = {
+            startTime: this.getCurrentTime(),
+            // startTime: '2024-01-01',
+            endTime: this.getCurrentTime(1),
+            // endTime: '2024-04-01',
+            gridId: item.id
+          }
+          const result = await statgrid(data);
+          item.total = result.data.total;
+          item.handled = result.data.handled;
+          item.unhandled = result.data.unhandled;
+          return item;
         })
-        return item;
-      })
-      this.wanggeArray = data;
-      // let grids = []
-      // newWange.map((item)=>{
-      //   grids.push(item.id);
-      // })
-      // let data = {
-      //   startTime: this.getCurrentTime(),
-      //   endTime: this.getCurrentTime(1),
-      //   gridld: grids.join(",")
-      // }
-      // statgrid(data).then(res=>{
-      //   this.$set(item,'total',res.data.total);
-      //   item.total = res.data.total;
-      //   item.handled = res.data.handled;
-      //   item.unhandled = res.data.unhandled;
-      //   console.log(res,"网格数据");
-      // })
+        const combinedData = await Promise.all(promises);
+        this.wanggeArray = combinedData;
+      } catch {
+
+      }
     },
-    getquyu(newQuyu){
-      let data = newQuyu.map((item)=>{
-        let data = {
-          startTime: this.getCurrentTime(),
-          endTime: this.getCurrentTime(1),
-          gridld: item.id
-        }
-        statroad(data).then(res=>{
-          this.$set(item,'total',res.data.total);
-          item.total = res.data.total;
-          item.handled = res.data.handled;
-          item.unhandled = res.data.unhandled;
+    async getquyu(newQuyu){
+      try {
+        let quyuarr = [...newQuyu]
+        let promises = quyuarr.map(async(item)=>{
+          let data = {
+            startTime: this.getCurrentTime(),
+            endTime: this.getCurrentTime(1),
+            gridId: item.id
+          }
+          // setTimeout(async()=>{
+            const result = await statroad(data);
+            item.total = result.data.total;
+            item.handled = result.data.handled;
+            item.unhandled = result.data.unhandled;
+          // },500)
+          // statroad(data).then(res=>{
+          //   this.$set(item,'total',res.data.total);
+          //   item.total = res.data.total;
+          //   item.handled = res.data.handled;
+          //   item.unhandled = res.data.unhandled;
+          // })
+          return item;
         })
-        return item;
-      })
-      this.quyuArray = data;
+        const combinedData = await Promise.all(promises);
+        this.quyuArray = combinedData;
+      } catch (error) {
+        
+      }
     },
-    getLuduan(newLuduan){
-      let data = newLuduan.map((item)=>{
-        let data = {
-          startTime: this.getCurrentTime(),
-          endTime: this.getCurrentTime(1),
-          gridld: item.id
-        }
-        statregion(data).then(res=>{
-          this.$set(item,'total',res.data.total);
-          item.total = res.data.total;
-          item.handled = res.data.handled;
-          item.unhandled = res.data.unhandled;
+    async getLuduan(newLuduan){
+      try {
+        let promises = newLuduan.map(async (item)=>{
+          let data = {
+            startTime: this.getCurrentTime(),
+            endTime: this.getCurrentTime(1),
+            gridId: item.id
+          }
+          const result = await statregion(data);
+          item.total = result.data.total;
+          item.handled = result.data.handled;
+          item.unhandled = result.data.unhandled;
+          // statregion(data).then(res=>{
+          //   this.$set(item,'total',res.data.total);
+          //   item.total = res.data.total;
+          //   item.handled = res.data.handled;
+          //   item.unhandled = res.data.unhandled;
+          // })
+          return item;
         })
-        return item;
-      })
-      this.luduanArray = data;
+        const combinedData = await Promise.all(promises);
+        this.luduanArray = combinedData;
+      } catch (error) {
+        
+      }
+      
     },
     getCurrentTime(id) {
       const currentDate = new Date();