From b6fdb41ab8cbbe2843e6c5af6c7c57d4116796f1 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Sat, 17 Sep 2022 19:04:48 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E9=9B=86=E6=88=90SSE,=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E4=B9=B1=E7=A0=81=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/src/AMapDesigner/index.vue | 9 ++++++---
 src/settings/componentSetting.ts               | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 2fc03e9..0acfe4a 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -122,7 +122,7 @@
   import { isArray, isString } from '/@/utils/is';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDebounceFn } from '@vueuse/core';
-  import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource';
+  import { NativeEventSource, EventSourcePolyfill } from 'event-source-polyfill/src/eventsource';
   import { getAccessToken } from '/@/utils/auth';
 
   /** 类型规范统一声明定义区域 */
@@ -466,11 +466,12 @@
       orgMarkerCluster?.setData(orgPoints);
 
       // sse长轮询连接获取收样员gps位置
-      eventSource = new EventSourcePolyfill(mapDesigner.sseUrl, {
+      const EventSource = EventSourcePolyfill;
+      eventSource = new EventSource(mapDesigner.sseUrl, {
         headers: { Authorization: `Bearer ${getAccessToken()}` }
       });
 
-      eventSource.onopen =function (ev) {
+      eventSource.onopen = function (ev) {
         console.info(ev,'建立连接。。。');
       };
 
@@ -491,6 +492,7 @@
   });
 
   onUnmounted(() => {
+    console.log('结束');
     eventSource.close();
     if (map) {
       // 销毁地图实例
@@ -500,6 +502,7 @@
 
   /** 地图创建完成(动画关闭) */
   function complete () {
+    eventSource.close();
     if (map) {
       map.on('complete', () => {
         setMapDataJson(mapProps.options);
diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts
index 9017e4d..08284ee 100644
--- a/src/settings/componentSetting.ts
+++ b/src/settings/componentSetting.ts
@@ -5,7 +5,6 @@
  * @create: 2022/4/7
  */
 import type { SorterResult } from '../components/Table';
-import { getAccessToken } from '/@/utils/auth';
 import { buildUUID } from '/@/utils/uuid';
 import { useGlobSetting } from '/@/hooks/setting';
 const { apiUrl } = useGlobSetting();
@@ -56,6 +55,6 @@ export default {
     // 默认缩放
     defaultZoom: 17,
     // sse后端地址
-    sseUrl: `${apiUrl}/common_proxy/common/mapLogisticSse/subscribe?clientId=${buildUUID()}&accessToken=${getAccessToken()}`
+    sseUrl: `${apiUrl}/common_proxy/common/mapLogisticSse/subscribe?clientId=${buildUUID()}}`
   }
 };