From 6f4c82ab32df0ebbc1e412729ce81c5c8c45fe1f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 31 Aug 2022 23:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AMap/src/AMapDesigner/index.vue           | 44 +++++++++++--------
 src/views/common/mapLogistic/index.vue        |  2 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 04c402a..bf03bde 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -69,7 +69,7 @@
 </template>
 <script lang="ts" setup>
   import AMapLoader from '@amap/amap-jsapi-loader';
-  import { reactive, watchEffect, getCurrentInstance, onBeforeMount, onUnmounted, ref, PropType, watch, toRefs, nextTick } from 'vue';
+  import { reactive, watchEffect, getCurrentInstance, onBeforeMount, onUnmounted, ref, PropType, watch, toRefs, nextTick, onMounted } from 'vue';
   import { operatePanelColumns, MapData, MapPointType } from '../amap.data';
   import hospital from '/@/assets/images/hospital.svg';
   import medicalKit from '/@/assets/images/medical-kit.svg';
@@ -189,12 +189,10 @@
   const AForm = Form;
   const AFormItem = Form.Item;
   const ASelect = Select;
-  const ATooltip = Tooltip;
   const formElRef = ref();
   const [registerTable, { setTableData }] = useTable({
     title: '任务列表',
     rowKey: 'id',
-    dataSource: mapState.mapData?.mapTask,
     columns: operatePanelColumns,
     resizeHeightOffset: 100,
     showTableSetting: true,
@@ -428,21 +426,6 @@
         panel: instance.refs.mapPanel
       });
 
-      // 加载地图数据,并且绘制路线
-      if (!isEmpty(mapState.mapData.mapLogisticPoint)) {
-        const lngLatData = mapState.mapData.mapLogisticPoint.map(item => new AMap.LngLat(item.lng, item.lat));
-        const destination = lngLatData.pop();
-        destination && driving.search(new AMap.LngLat(mapState.mapData.courierLng, mapState.mapData.courierLat), destination, {
-          waypoints: lngLatData
-        }, function(status, result) {
-          if (status === 'complete') {
-            console.log('绘制地图路线完成');
-          } else {
-            console.error('获取地图数据失败：' + result);
-          }
-        });
-      }
-
       // 加载完毕
       complete();
     }).catch(error => {
@@ -452,6 +435,26 @@
 
   });
 
+  onMounted(() => {
+    // 加载地图设计器默认配置
+    mapState.mapData = defaultMapData();
+    setTableData(mapState.mapData.mapTask);
+    // 加载地图数据,并且绘制路线
+    if (!isEmpty(mapState.mapData.mapLogisticPoint)) {
+      const lngLatData = mapState.mapData.mapLogisticPoint.map(item => new AMap.LngLat(item.lng, item.lat));
+      const destination = lngLatData.pop();
+      destination && driving.search(new AMap.LngLat(mapState.mapData.courierLng, mapState.mapData.courierLat), destination, {
+        waypoints: lngLatData
+      }, function(status, result) {
+        if (status === 'complete') {
+          console.log('绘制地图路线完成');
+        } else {
+          console.error('获取地图数据失败：' + result);
+        }
+      });
+    }
+  });
+
   onUnmounted(() => {
     if (map) {
       // 销毁地图实例
@@ -572,7 +575,10 @@
       }
     }
     handleMapReset();
-    mapState.mapData = cloneDeep(merge(defaultMapData(), options));
+    nextTick(() => {
+      mapState.mapData = cloneDeep(merge(defaultMapData(), options));
+      setTableData(mapState.mapData.mapTask);
+    });
   }
 
   /** 获取部件表单数据 */
diff --git a/src/views/common/mapLogistic/index.vue b/src/views/common/mapLogistic/index.vue
index a513f78..c353550 100644
--- a/src/views/common/mapLogistic/index.vue
+++ b/src/views/common/mapLogistic/index.vue
@@ -39,7 +39,7 @@
   import { columns, searchFormSchema } from './mapLogistic.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import AmapTaskModal from './MapLogisticModal.vue';
-  import { listMapLogistic, delMapLogistic } from '/@/api/platform/common/controller/mapLogistic'
+  import { listMapLogistic, delMapLogistic } from '/@/api/platform/common/controller/mapLogistic';
 
   const { createConfirm, createMessage } = useMessage();
   const [registerModal, { openModal }] = useModal();