🅰 创建地图ts实体类

src/api/platform/common/controller/mapLogistic.ts

@@ -8,7 +8,7 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   list = '/common_proxy/common/mapLogistic/list',
-  get = '/common_proxy/common/mapLogistic',
+  getMapDataByCourierUserId = '/common_proxy/common/mapLogistic/getMapDataByCourierUserId',
   saveOrUpdate = '/common_proxy/common/mapLogistic/saveOrUpdate',
   del = '/common_proxy/common/mapLogistic/remove'
 }
@@ -17,6 +17,6 @@ export const listMapLogistic = (params?: Partial<MapLogisticParams>) => defHttp.
 
 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}` });
+export const getMapDataByCourierUserId = (courierUserId: string) => defHttp.get<MapLogistic>({ url: `${Api.getMapDataByCourierUserId}/${courierUserId}` });
 
 export const delMapLogistic = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` });

src/api/platform/common/entity/mapLogistic.ts

@@ -8,6 +8,8 @@
 
 import type { R } from '/#/axios';
 import type { CommonEntity, Page } from '/@/api/common/data/entity';
+import type { MapTask } from './mapTask';
+import type { MapLogisticPoint } from './mapLogisticPoint';
 
 export type MapLogisticParams = Page & MapLogistic;
 
@@ -27,9 +29,9 @@ export interface MapLogistic extends Partial<CommonEntity> {
     estimateTime: string;
     requireTime: string;
     batchCode?: string;
-    version?: string;
+    version?: number;
-    mapTask: Recordable[];
+    mapTask: MapTask[];
-    mapLogisticPoint: Recordable[];
+    mapLogisticPoint: MapLogisticPoint[];
 }
 
 export type MapLogisticResult = R<MapLogistic[]>;

src/api/platform/common/entity/mapLogisticPoint.ts

@@ -0,0 +1,30 @@
+
+/**
+ * @program: kicc-ui
+ * @description: 地图物流任务标记点表实体类
+ * @author: entfrm开发团队-王翔
+ * @since: 2022/8/24
+ */
+
+import type { R } from '/#/axios';
+import type { CommonEntity, Page } from '/@/api/common/data/entity';
+
+export type MapLogisticPointParams = Page & MapLogisticPoint;
+
+export interface MapLogisticPoint extends CommonEntity {
+    id: string;
+    hospitalId: string;
+    hospitalName: string;
+    lng: number;
+    lat: number;
+    sort: number;
+    type: string;
+    taskType: string;
+    batchCode: string;
+    mapLogisticId: string;
+    mapTaskId: string;
+    key: string;
+    version: number;
+}
+
+export type MapLogisticPointResult = R<MapLogisticPoint[]>;

src/api/platform/common/entity/mapTask.ts

@@ -0,0 +1,39 @@
+
+/**
+ * @program: kicc-ui
+ * @description: 地图任务表实体类
+ * @author: entfrm开发团队-王翔
+ * @since: 2022/8/24
+ */
+
+import type { R } from '/#/axios';
+import type { CommonEntity, Page } from '/@/api/common/data/entity';
+import type { MapTaskPreset } from './mapTaskPreset';
+
+export type MapTaskParams = Page & MapTask;
+
+export interface MapTask extends CommonEntity {
+    id: string;
+    name: string;
+    sort: number;
+    taskType: string;
+    hospitalId: string;
+    hospitalName: string;
+    hospitalLng: number;
+    hospitalLat: number;
+    orgId: string;
+    orgName: string;
+    orgLng: number;
+    orgLat: number;
+    courierUserId: string;
+    fileId: string;
+    estimateTime: string;
+    requireTime: string;
+    batchCode: string;
+    mapLogisticId: string;
+    key: string;
+    version: number;
+    mapTaskPreset: MapTaskPreset[]
+}
+
+export type MapTaskResult = R<MapTask[]>;

src/api/platform/common/entity/mapTaskPreset.ts

@@ -14,6 +14,7 @@ export type MapTaskPresetParams = Page & MapTaskPreset;
 export interface MapTaskPreset extends CommonEntity {
     id: string;
     name: string;
+    sort: number;
     orginPresetId: string;
     orginPresetName: string;
     orginPresetLng: number;
@@ -30,7 +31,7 @@ export interface MapTaskPreset extends CommonEntity {
     batchCode: string;
     mapLogisticId: string;
     taskId: string;
-    version: string;
+    version: number;
 }
 
 export type MapTaskPresetResult = R<MapTaskPreset[]>;

src/views/common/mapLogistic/MapLogisticModal.vue

@@ -26,6 +26,12 @@
     const mapId = data?.id;
     const props: Partial<ModalProps> = { confirmLoading: false, title: '地图设计器' };
 
+
+
+    
+
+
+
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
   });