From 5342774ca51f0275361c76f773b8a60d29938d68 Mon Sep 17 00:00:00 2001
From: zk <k12019@aliyun.com>
Date: Tue, 19 Dec 2023 12:41:15 +0800
Subject: [PATCH] update

---
 .env.production                               | 16 ++-------
 index.html                                    |  1 -
 package.json                                  |  1 +
 src/assets/mapUtils/map.ts                    | 35 ++++++++++++-------
 .../secondaryScreen/secondMap/secondMap.vue   | 15 ++++----
 src/main.ts                                   |  5 ++-
 tsconfig.json                                 |  3 ++
 typings.d.ts                                  |  4 +++
 vite.config.ts                                |  9 +++--
 9 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 typings.d.ts

diff --git a/.env.production b/.env.production
index 0a11606..609c948 100644
--- a/.env.production
+++ b/.env.production
@@ -1,18 +1,8 @@
 
 #后台地址
-#VITE_GLOB_API_URL=https://api.cqygjk.com
+VITE_GLOB_API_URL=https://api.cqygjk.com
 #应急求助-websocket
-#VITE_GLOB_API_YIN_JI=wss://api.cqygjk.com/health-watch/websocket/watchMonitor
+VITE_GLOB_API_YIN_JI=wss://api.cqygjk.com/health-watch/websocket/watchMonitor
 #健康监测工具报警-websocket
-#VITE_GLOB_API_JIAN_CE=wss://api.cqygjk.com/health-emergency/websocket/emergency
+VITE_GLOB_API_JIAN_CE=wss://api.cqygjk.com/health-emergency/websocket/emergency
 
-
-# 王昊地址
-#VITE_GLOB_API_URL=http://192.168.1.3
-#开发环境
-VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io
-
-#应急求助-websocket
-VITE_GLOB_API_YIN_JI=ws://cqyt.dev.yg.dt.io/health-watch/websocket/watchMonitor
-#健康监测工具报警-websocket
-VITE_GLOB_API_JIAN_CE=ws://cqyt.dev.yg.dt.io/health-emergency/websocket/emergency
diff --git a/index.html b/index.html
index 355de39..e186d28 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,6 @@
     </script>
     <!--    <script type="text/javascript"-->
     <!--            src="https://webapi.amap.com/maps?v=2.0&key=4bbcb216b889f2d612cbed05ae6979c8&plugin=AMap.Driving,AMap.ToolBar,AMap.Driving,AMap.GeoJSON,AMap.MarkerCluster"></script>-->
-    <script type="module" src="./public/amap.js"></script>
 </head>
 <style>
     html, body, #app {
diff --git a/package.json b/package.json
index f0b8ac2..3f6bfda 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "less": "^4.2.0",
     "typescript": "^5.0.2",
     "vite": "^4.4.5",
+    "vite-plugin-resolve-externals": "^0.2.2",
     "vue-tsc": "^1.8.5"
   }
 }
diff --git a/src/assets/mapUtils/map.ts b/src/assets/mapUtils/map.ts
index 5323cc9..22273cc 100644
--- a/src/assets/mapUtils/map.ts
+++ b/src/assets/mapUtils/map.ts
@@ -1,3 +1,4 @@
+import AMapLoader from '@amap/amap-jsapi-loader';
 import china from '/@/assets/lngLat/china.ts';
 import chinaInner from '/@/assets/lngLat/chinaInner.ts';
 import { createCircle, createIcon, typeToIcon } from '/@/assets/mapUtils/commonFun.ts';
@@ -11,6 +12,7 @@ export const defaultOption = {
     mapStyle: 'darkblue', //地图样式
 };
 export const mapPlugin = ['AMap.ToolBar', 'AMap.Driving', 'AMap.GeoJSON', 'AMap.MarkerCluster', 'AMap.PlaceSearch'];
+let AMap = null;
 export const Map = {
     map: null,
     overlayGroup: null, // 地图中marker
@@ -25,18 +27,27 @@ export const Map = {
      * @param option 地图配置
      */
     initMap({ el, option }: InitMap) {
-        const { zoom, center, mapStyle } = { ...defaultOption, ...option };
-        //基本地图加载
-        this.map = new AMap.Map(el, {
-            resizeEnable: true,
-            center: center,
-            zoom: zoom,
-            mapStyle: 'amap://styles/' + mapStyle,
-        });
-        // 异步同时加载多个插件
-        new AMap.plugin(mapPlugin, () => {
-            this.drawInnerLine();
-            this.drawOutLine();
+        AMapLoader.load({
+            key: '4bbcb216b889f2d612cbed05ae6979c8', // 申请好的Web端开发者Key，首次调用 load 时必填
+            // version: '1.4.15', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+            version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+            plugins: mapPlugin, // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        }).then((res) => {
+            AMap = res;
+            const { zoom, center, mapStyle } = { ...defaultOption, ...option };
+            //基本地图加载
+            this.map = new AMap.Map(el, {
+                resizeEnable: true,
+                center: center,
+                zoom: zoom,
+                mapStyle: 'amap://styles/darkblue',
+                version: '2.0',
+            });
+            // 异步同时加载多个插件
+            new AMap.plugin(mapPlugin, () => {
+                this.drawInnerLine();
+                this.drawOutLine();
+            });
         });
     } /**
      * @desc 中国外层边界线
diff --git a/src/components/secondaryScreen/secondMap/secondMap.vue b/src/components/secondaryScreen/secondMap/secondMap.vue
index 4655564..3b878a0 100644
--- a/src/components/secondaryScreen/secondMap/secondMap.vue
+++ b/src/components/secondaryScreen/secondMap/secondMap.vue
@@ -61,7 +61,6 @@
     const watchDialogRef = ref();
 
     function openWatchList(item) {
-        console.log('item', item);
         if (item.key == 'allotDeviceNum') {
             watchDialogRef.value.openModal(item.extData?.deptId);
         }
@@ -110,13 +109,13 @@
 
     const { detailLeft, detailRight, setDetail } = useAlarmDetail();
     onMounted(() => {
-        init();
-        //点击预警定位
-        $bus.on(earlyWarning, (params) => {
-            setDetail(params);
-            drawMarker(params);
-            setIsShowAlarm(true);
-        });
+        // init();
+        // //点击预警定位
+        // $bus.on(earlyWarning, (params) => {
+        //     setDetail(params);
+        //     drawMarker(params);
+        //     setIsShowAlarm(true);
+        // });
     });
 
     /**
diff --git a/src/main.ts b/src/main.ts
index 5dfc42f..db31b04 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,4 @@
-import {createApp} from 'vue';
+import { createApp } from 'vue';
 import App from './App.vue';
 import './assets/less/index.less';
 import router from './router';
@@ -6,8 +6,7 @@ import router from './router';
 import('ant-design-vue/dist/antd.less');
 import registerGlobComp from './assets/ts/antd.ts';
 import directiveMethods from './assets/ts/directive';
-import {setupStore} from './store/index.ts';
-
+import { setupStore } from './store/index.ts';
 
 const app = createApp(App);
 // 注册自定义事件
diff --git a/tsconfig.json b/tsconfig.json
index 19f3315..4c07379 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,6 +8,9 @@
       "DOM",
       "DOM.Iterable"
     ],
+    "types": [
+      "vite/client"
+    ],
     "skipLibCheck": true,
     "baseUrl": ".",
     /* 配置文件路径识别 */
diff --git a/typings.d.ts b/typings.d.ts
new file mode 100644
index 0000000..560e05a
--- /dev/null
+++ b/typings.d.ts
@@ -0,0 +1,4 @@
+declare interface Window {
+    AMap: any;
+    initAMap: any;
+}
\ No newline at end of file
diff --git a/vite.config.ts b/vite.config.ts
index c2b87d3..6446fad 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,8 @@
-import {defineConfig} from 'vite';
+import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
-import {resolve} from 'path';
+import { resolve } from 'path';
+
+import resolveExternalsPlugin from 'vite-plugin-resolve-externals';
 
 function pathResolve(dir: string) {
     return resolve(process.cwd(), '.', dir);
@@ -10,6 +12,9 @@ function pathResolve(dir: string) {
 export default defineConfig({
     plugins: [
         vue(),
+        resolveExternalsPlugin({
+            AMap: 'AMap',
+        }),
     ],
     css: {
         preprocessorOptions: {