From ab8c3561168c81987aa2153b0c41cf1d65307443 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 1 Sep 2022 06:04:44 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=9C=B0=E5=9B=BE=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AMap/src/AMapDesigner/index.vue       | 5 +++--
 src/components/AMap/src/components/MapPointModal.vue | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index eb73435..845a021 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -75,7 +75,7 @@
   import medicalKit from '/@/assets/images/medical-kit.svg';
   import hospitalTwinkle from '/@/assets/images/hospital-twinkle.gif';
   import redFlag from '/@/assets/images/redFlag.svg';
-  import { Form, Select, Tooltip } from 'ant-design-vue';
+  import { Form, Select } from 'ant-design-vue';
   import { BasicTable, useTable } from '/@/components/Table';
   import { useModal } from '/@/components/Modal';
   import MapTaskModal from '../components/MapTaskModal.vue';
@@ -85,7 +85,7 @@
   import { listUser } from '/@/api/platform/system/controller/user';
   import { listOrg } from '/@/api/platform/common/controller/org';
   import { useUserStore } from '/@/store/modules/user';
-  import { split, divide, subtract, merge, isEmpty, cloneDeep } from 'lodash-es';
+  import { split, divide, subtract, merge, isEmpty, cloneDeep, add } from 'lodash-es';
   import componentSetting from '/@/settings/componentSetting';
   import { BasicUpload } from '/@/components/Upload';
   import { commonUpload } from '/@/api/platform/core/controller/upload';
@@ -634,6 +634,7 @@
         });
       });
     });
+    pointData.forEach((item, index)=> { item.sort = add(index, 1); });
     mapState.mapData.mapLogisticPoint = pointData;
     drawMapNavigate(pointData);
   }
diff --git a/src/components/AMap/src/components/MapPointModal.vue b/src/components/AMap/src/components/MapPointModal.vue
index 10ebcb5..bda1f42 100644
--- a/src/components/AMap/src/components/MapPointModal.vue
+++ b/src/components/AMap/src/components/MapPointModal.vue
@@ -26,7 +26,7 @@
   import { VxeGridProps } from 'vxe-table';
   import { MapData, mapPointColumns } from '../amap.data';
   import { defaultMapData } from '/@/enums/amapEnum';
-  import { cloneDeep } from 'lodash-es';
+  import { add, cloneDeep } from 'lodash-es';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
@@ -81,10 +81,10 @@
       // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
       // 处理重新排序
-      const mapLogisticPoint = state.mapData.mapLogisticPoint.map((item, index)=> ({ sort: index, ...item }));
+      state.mapData.mapLogisticPoint.forEach((item, index)=> { item.sort = add(index, 1); });
       // 处理提交完成之后逻辑
       closeModal();
-      emit('success', mapLogisticPoint);
+      emit('success', state.mapData.mapLogisticPoint);
     } finally {
       setModalProps({ confirmLoading: false });
     }