From 32a0d7d4b1b235e4a49f07268ee3e303595d0cfd Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 1 Sep 2022 16:53:36 +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

---
 .../platform/common/controller/mapLogistic.ts |  7 +--
 src/api/platform/common/entity/mapLogistic.ts | 20 ++++----
 .../platform/common/entity/mapTaskPreset.ts   |  1 +
 .../AMap/src/AMapDesigner/index.vue           | 51 +++++++++++++++----
 src/components/AMap/src/amap.data.tsx         | 20 --------
 .../AMap/src/components/MapPointModal.vue     |  7 +--
 .../AMap/src/components/MapTaskModal.vue      |  5 +-
 src/enums/amapEnum.ts                         | 19 +++----
 .../common/mapLogistic/MapLogisticModal.vue   | 30 ++++-------
 src/views/common/mapLogistic/index.vue        |  2 +-
 10 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/src/api/platform/common/controller/mapLogistic.ts b/src/api/platform/common/controller/mapLogistic.ts
index 1107161..db3fc5f 100644
--- a/src/api/platform/common/controller/mapLogistic.ts
+++ b/src/api/platform/common/controller/mapLogistic.ts
@@ -9,16 +9,13 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   list = '/common_proxy/common/mapLogistic/list',
   get = '/common_proxy/common/mapLogistic',
-  add = '/common_proxy/common/mapLogistic/save',
-  edit = '/common_proxy/common/mapLogistic/update',
+  saveOrUpdate = '/common_proxy/common/mapLogistic/saveOrUpdate',
   del = '/common_proxy/common/mapLogistic/remove'
 }
 
 export const listMapLogistic = (params?: Partial<MapLogisticParams>) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true });
 
-export const addMapLogistic = (params: Partial<MapLogistic>) => defHttp.post({ url: Api.add, data: params });
-
-export const editMapLogistic = (params: Partial<MapLogistic>) => defHttp.put({ url: Api.edit, data: params });
+export const saveOrUpdateMapLogistic = (params: Partial<MapLogistic>) => defHttp.post({ url: Api.saveOrUpdate, data: params });
 
 export const getMapLogistic = (id: string) => defHttp.get<MapLogistic>({ url: `${Api.get}/${id}` });
 
diff --git a/src/api/platform/common/entity/mapLogistic.ts b/src/api/platform/common/entity/mapLogistic.ts
index 4790e3b..a23da50 100644
--- a/src/api/platform/common/entity/mapLogistic.ts
+++ b/src/api/platform/common/entity/mapLogistic.ts
@@ -11,22 +11,24 @@ import type { CommonEntity, Page } from '/@/api/common/data/entity';
 
 export type MapLogisticParams = Page & MapLogistic;
 
-export interface MapLogistic extends CommonEntity {
-    id: string;
+export interface MapLogistic extends Partial<CommonEntity> {
+    id?: string;
     name: string;
     courierUserId: string;
     courierUserName: string;
-    courierLng: number;
-    courierLat: number;
+    courierLng: Nullable<number>;
+    courierLat: Nullable<number>;
     sendOrderId: string;
     sendOrderName: string;
-    sendOrderLng: number;
-    sendOrderLat: number;
-    fileId: string;
+    sendOrderLng: Nullable<number>;
+    sendOrderLat: Nullable<number>;
+    fileId: string | string[];
     estimateTime: string;
     requireTime: string;
-    batchCode: string;
-    version: string;
+    batchCode?: string;
+    version?: string;
+    mapTask: Recordable[];
+    mapLogisticPoint: Recordable[];
 }
 
 export type MapLogisticResult = R<MapLogistic[]>;
diff --git a/src/api/platform/common/entity/mapTaskPreset.ts b/src/api/platform/common/entity/mapTaskPreset.ts
index a53a1ab..117c9e3 100644
--- a/src/api/platform/common/entity/mapTaskPreset.ts
+++ b/src/api/platform/common/entity/mapTaskPreset.ts
@@ -23,6 +23,7 @@ export interface MapTaskPreset extends CommonEntity {
     destinationPresetLng: number;
     destinationPresetLat: number;
     courierUserId: string;
+    key: string;
     fileId: string;
     estimateTime: string;
     requireTime: string;
diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 65ff78c..e74e44d 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -69,8 +69,20 @@
 </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 { operatePanelColumns, MapData, MapPointType } from '../amap.data';
+  import {
+    reactive,
+    watchEffect,
+    getCurrentInstance,
+    onBeforeMount,
+    onUnmounted,
+    ref,
+    PropType,
+    watch,
+    toRefs,
+    nextTick,
+    toRaw
+  } from 'vue';
+  import { operatePanelColumns, MapPointType } from '../amap.data';
   import hospital from '/@/assets/images/hospital.svg';
   import medicalKit from '/@/assets/images/medical-kit.svg';
   import hospitalTwinkle from '/@/assets/images/hospital-twinkle.gif';
@@ -93,6 +105,8 @@
   import { listMapTaskPreset } from '/@/api/platform/common/controller/mapTaskPreset';
   import { defaultMapData } from '/@/enums/amapEnum';
   import Toolbar from '../components/Toolbar.vue';
+  import { saveOrUpdateMapLogistic } from '/@/api/platform/common/controller/mapLogistic';
+  import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
 
   /** 类型规范统一声明定义区域 */
   interface MapState {
@@ -107,13 +121,13 @@
       amapKey: string;
       options: Recordable;
     };
-    mapData: MapData;
+    mapData: MapLogistic;
     rulesRef: Recordable;
   }
 
   const mapProps = defineProps({
     options: {
-      type: [Object, String] as PropType<MapData | string>,
+      type: [Object, String] as PropType<MapLogistic | string>,
       default: () => ({})
     },
     sidebarControl: propTypes.bool.def(true),
@@ -138,6 +152,7 @@
   let scanCourierUserCircleRange;
   let driving;
 
+  const emit = defineEmits(['success']);
   const userStore = useUserStore();
   const instance = getCurrentInstance();
   const { createMessage } = useMessage();
@@ -614,6 +629,7 @@
         lat: hospital.mapLat,
         sort: undefined,
         type: '0',
+        key: item.key,
         hospitalId: hospital.value,
         hospitalName: hospital.label
       });
@@ -622,6 +638,7 @@
         lat: org.mapLat,
         sort: undefined,
         type: '1',
+        key: item.key,
         hospitalId: org.value,
         hospitalName: org.label
       });
@@ -634,6 +651,7 @@
           lat: item.orginPresetLat,
           sort: undefined,
           type: '0',
+          key: item.key,
           hospitalId: item.orginPresetId,
           hospitalName: item.orginPresetName
         });
@@ -642,6 +660,7 @@
           lat: item.destinationPresetLat,
           sort: undefined,
           type: '0',
+          key: item.key,
           hospitalId: item.destinationPresetId,
           hospitalName: item.destinationPresetName
         });
@@ -661,8 +680,20 @@
   }
 
   /** 处理地图保存并发布 */
-  function handleMapSave() {
-
+  async function handleMapSave() {
+    await formElRef.value.validate();
+    const mapData = toRaw(mapState.mapData);
+    mapData.fileId = (mapData.fileId as [] || []).join(',');
+    mapData.mapTask.forEach(item => {
+      item.fileId = (item.fileId as [] || []).join(',');
+      if (~~item.taskType == 1) {
+        item?.mapTaskPreset?.forEach(childItem => {
+          childItem.fileId = (childItem.fileId as [] || [])?.join(',');
+        });
+      }
+    });
+    await saveOrUpdateMapLogistic(toRaw(mapState.mapData));
+    emit('success');
   }
 
   /** 处理地图重置 */
@@ -676,11 +707,11 @@
       formElRef.value?.clearValidate();
       // 清除地图数据
       mapState.mapData.courierUserName = '';
-      mapState.mapData.courierLng = undefined;
-      mapState.mapData.courierLat = undefined;
+      mapState.mapData.courierLng = null;
+      mapState.mapData.courierLat = null;
       mapState.mapData.sendOrderName = '';
-      mapState.mapData.sendOrderLng = undefined;
-      mapState.mapData.sendOrderLat = undefined;
+      mapState.mapData.sendOrderLng = null;
+      mapState.mapData.sendOrderLat = null;
       mapState.mapData.mapTask = [];
       mapState.mapData.mapLogisticPoint = [];
       setTableData([]);
diff --git a/src/components/AMap/src/amap.data.tsx b/src/components/AMap/src/amap.data.tsx
index 2dee0bd..b5070f5 100644
--- a/src/components/AMap/src/amap.data.tsx
+++ b/src/components/AMap/src/amap.data.tsx
@@ -22,26 +22,6 @@ export type MapPointType = {
   mapNotify?: boolean;
 };
 
-export interface MapData {
-  name: string;
-  courierUserId: string;
-  courierUserName: string;
-  courierLng: number | undefined;
-  courierLat: number | undefined;
-  sendOrderId: string;
-  sendOrderName: string;
-  sendOrderLng: number | undefined;
-  sendOrderLat: number | undefined;
-  fileId: string[];
-  estimateTime: string;
-  requireTime: string;
-  /** 地图任务数据 */
-  mapTask: Recordable[];
-  /** 地图预览点数据 */
-  mapLogisticPoint: Recordable[];
-  [key: string]: any;
-}
-
 /** 操作面板表格列 */
 export const operatePanelColumns: BasicColumn[] = [
   {
diff --git a/src/components/AMap/src/components/MapPointModal.vue b/src/components/AMap/src/components/MapPointModal.vue
index bda1f42..57edfd3 100644
--- a/src/components/AMap/src/components/MapPointModal.vue
+++ b/src/components/AMap/src/components/MapPointModal.vue
@@ -24,15 +24,16 @@
   import { AMapDesigner } from '/@/components/AMap';
   import Sortable from 'sortablejs';
   import { VxeGridProps } from 'vxe-table';
-  import { MapData, mapPointColumns } from '../amap.data';
+  import { mapPointColumns } from '../amap.data';
   import { defaultMapData } from '/@/enums/amapEnum';
   import { add, cloneDeep } from 'lodash-es';
+  import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
     sortable: Nullable<object>;
     gridOptions: VxeGridProps;
-    mapData: MapData;
+    mapData: MapLogistic;
   }
 
   /** 通用变量统一声明区域 */
@@ -81,7 +82,7 @@
       // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
       // 处理重新排序
-      state.mapData.mapLogisticPoint.forEach((item, index)=> { item.sort = add(index, 1); });
+      state.mapData.mapLogisticPoint?.forEach((item, index)=> { item.sort = add(index, 1); });
       // 处理提交完成之后逻辑
       closeModal();
       emit('success', state.mapData.mapLogisticPoint);
diff --git a/src/components/AMap/src/components/MapTaskModal.vue b/src/components/AMap/src/components/MapTaskModal.vue
index db33deb..8cb76e9 100644
--- a/src/components/AMap/src/components/MapTaskModal.vue
+++ b/src/components/AMap/src/components/MapTaskModal.vue
@@ -61,18 +61,19 @@
   import { reactive, toRaw } from 'vue';
   import {BasicModal, ModalProps, useModal, useModalInner} from '/@/components/Modal';
   import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table';
-  import { taskColumns, taskPresetColumns, MapData } from '../amap.data';
+  import { taskColumns, taskPresetColumns } from '../amap.data';
   import TaskPresetModal from './MapTaskPresetModal.vue';
   import { buildUUID } from '/@/utils/uuid';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { cloneDeep } from 'lodash-es';
   import { defaultMapData } from '/@/enums/amapEnum';
+  import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
 
   /** 类型规范统一声明定义区域 */
   interface WindowState {
     taskOrdinaryCurrentEditRowRef: Nullable<Recordable>;
     taskPresetCurrentEditRowRef: Nullable<Recordable>;
-    mapData: MapData;
+    mapData: MapLogistic;
   }
 
   /** 通用变量统一声明区域 */
diff --git a/src/enums/amapEnum.ts b/src/enums/amapEnum.ts
index a2be2c4..f84a74b 100644
--- a/src/enums/amapEnum.ts
+++ b/src/enums/amapEnum.ts
@@ -5,29 +5,24 @@
  * @create: 2022/4/9
  */
 
-import { MapData } from '/@/components/AMap/src/amap.data';
+import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
 import { cloneDeep } from 'lodash-es';
 
-export const defaultMapData: ()=> MapData = ()=> cloneDeep({
+export const defaultMapData: ()=> MapLogistic = ()=> cloneDeep({
   name: '',
   courierUserId: '',
   courierUserName: '',
-  courierLng: undefined,
-  courierLat: undefined,
+  courierLng: null,
+  courierLat: null,
   sendOrderId: '',
   sendOrderName: '',
-  sendOrderLng: undefined,
-  sendOrderLat: undefined,
+  sendOrderLng: null,
+  sendOrderLat: null,
   fileId: [],
   estimateTime: '',
   requireTime: '',
   /** 地图任务数据 */
-  mapTask: [{
-    id: '001',
-    name: '宇宙任务',
-    taskType: '0',
-    mapTaskPreset: []
-  }],
+  mapTask: [],
   /** 地图预览点数据 */
   mapLogisticPoint: [],
 });
diff --git a/src/views/common/mapLogistic/MapLogisticModal.vue b/src/views/common/mapLogistic/MapLogisticModal.vue
index dbd83e4..5d0f3d6 100644
--- a/src/views/common/mapLogistic/MapLogisticModal.vue
+++ b/src/views/common/mapLogistic/MapLogisticModal.vue
@@ -5,7 +5,7 @@
               :showCancelBtn="false"
               @register="registerModal"
   >
-    <AMapDesigner/>
+    <AMapDesigner @success="handleSubmit"/>
   </BasicModal>
 </template>
 <script lang="ts" setup>
@@ -15,34 +15,26 @@
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-  import { ref, unref } from 'vue';
   import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
   import { AMapDesigner } from '/@/components/AMap';
 
   /** 通用变量统一声明区域 */
-  const tag = ref<Nullable<string>>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
 
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
-    // 处理清除脏数据
-
-    // 处理设置数据
-    tag.value = data._tag;
-    const deptId = data.record?.deptId;
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async data => {
+    const mapId = data?.id;
     const props: Partial<ModalProps> = { confirmLoading: false, title: '地图设计器' };
-    // 采用tag标签区分操作
-    switch (unref(tag)) {
-      case 'add':
-
-
-        break;
-      case 'edit':
-
 
-        break;
-    }
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
   });
+
+
+  /** 处理弹出框提交 */
+  async function handleSubmit() {
+    closeModal();
+    emit('success');
+  }
+
 </script>
diff --git a/src/views/common/mapLogistic/index.vue b/src/views/common/mapLogistic/index.vue
index c353550..25b44e6 100644
--- a/src/views/common/mapLogistic/index.vue
+++ b/src/views/common/mapLogistic/index.vue
@@ -3,7 +3,7 @@
     <BasicTable @register="registerTable">
       <template #toolbar>
         <a-button type="primary"
-                  @click=""
+                  @click="() => {}"
         >预览</a-button>
         <a-button type="primary"
                   @click="handleAdd()"