From e69847d7454f953ec03ca39f5d20bc5c42147538 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 13 Aug 2024 11:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8E=E6=8E=92=E7=8F=AD=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emergency_map/components/mapAssembly.vue       | 14 +++++++++++++-
 .../emergency_map/components/sysChat.vue           |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
index e980ac6..eb503fa 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
+++ b/src/views/emergen_cyrescue/emergency_map/components/mapAssembly.vue
@@ -14,7 +14,7 @@
         </div>
         <!-- 右侧面板 -->
         <div class="right">
-          <sysChat :chat-data="chatData" @orderMessage="handlerOrderMessage" @reFlush="initInfo()"/>
+          <sysChat :chat-data="chatData" @orderMessage="handlerOrderMessage" @reFlush="initInfo()" @endRescue="endRescue()"/>
         </div>
       </div>
       <div class="top_search">
@@ -610,6 +610,18 @@ export default {
         console.log(e)
         loading.close()
       })
+    },
+    endRescue() {
+      requestFN('/bi/emergency/endRescue', { ID: this.REPORT_ID })
+        .then((data) => {
+          this.$message({
+            message: '确认已收到指令',
+            type: 'success'
+          })
+          this.$router.push('/emergen_cyrescue/incident_management')
+        }).catch((error) => {
+          console.log(error)
+        })
     }
   }
 }
diff --git a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
index a58812b..0110b98 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
+++ b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
@@ -45,7 +45,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$router.push('/emergen_cyrescue/accid')
+        this.$emit('endRescue', '')
       }).catch(() => {
         this.$message({
           type: 'info',