diff --git a/src/components/AMap/src/AMapDesigner/index.vue b/src/components/AMap/src/AMapDesigner/index.vue
index 7972dcf..7f7f9bf 100644
--- a/src/components/AMap/src/AMapDesigner/index.vue
+++ b/src/components/AMap/src/AMapDesigner/index.vue
@@ -715,7 +715,7 @@
isArray(mapData.fileId) && (mapData.fileId = mapData.fileId.join(','));
mapData.mapTask.forEach(item => {
const hospital = item.hospitalId && mapState.hospitalList.find(e => e.value == item.hospitalId),
- org = item.orgId && mapState.orgList.find(e => e.value == item.orgId);
+ org = item.orgId && mapState.orgList.find(e => e.value == item.orgId);
item.courierUserId = mapData.courierUserId;
hospital && Object.assign(item,{
hospitalName: hospital.label,
@@ -731,7 +731,7 @@
if (~~item.taskType == 1) {
item?.mapTaskPreset?.forEach(childItem => {
const childHospital = childItem.orginPresetId && mapState.hospitalList.find(e => e.value == childItem.orginPresetId),
- childOrg = childItem.destinationPresetId && mapState.orgList.find(e => e.value == childItem.destinationPresetId);
+ childOrg = childItem.destinationPresetId && mapState.orgList.find(e => e.value == childItem.destinationPresetId);
childHospital && Object.assign(childItem,{
orginPresetName: childHospital.label,
orginPresetLat: childHospital.mapLat,
diff --git a/src/components/AMap/src/amap.data.tsx b/src/components/AMap/src/amap.data.tsx
index 8a7cf27..181d8ea 100644
--- a/src/components/AMap/src/amap.data.tsx
+++ b/src/components/AMap/src/amap.data.tsx
@@ -1,9 +1,9 @@
import { BasicColumn } from '/@/components/Table';
-import { listOrg } from '/@/api/platform/common/controller/org';
import { commonUpload } from '/@/api/platform/core/controller/upload';
import { h } from 'vue';
import { Tag } from 'ant-design-vue';
import { VxeTableDefines } from 'vxe-table/types/table';
+import Icon from '/@/components/Icon/index';
/**
* @program: kicc-ui
@@ -215,7 +215,7 @@ export const mapPointColumns: VxeTableDefines.ColumnOptions[] = [
header ({ column }) {
return [
-
+
];
}
diff --git a/src/components/AMap/src/components/MapPointModal.vue b/src/components/AMap/src/components/MapPointModal.vue
index 81b1593..313d576 100644
--- a/src/components/AMap/src/components/MapPointModal.vue
+++ b/src/components/AMap/src/components/MapPointModal.vue
@@ -33,6 +33,7 @@
import { add, cloneDeep, concat } from 'lodash-es';
import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
import { VxeTableDefines } from 'vxe-table/types/table';
+ import Icon from '/@/components/Icon/index';
/** 类型规范统一声明定义区域 */
interface WindowState {
@@ -74,14 +75,14 @@
default({row}) {
return [
-
+
];
},
header({column}) {
return [
-
+
];
}
@@ -156,18 +157,18 @@
.rightTopLayout {
position: absolute;
- top: 70%;
+ top: 0;
left: 50%;
right: 0;
- bottom: 0;
+ bottom: 30%;
}
.rightBottomLayout {
position: absolute;
- top: 0;
+ top: 70%;
left: 50%;
right: 0;
- bottom: 30%;
+ bottom: 0;
}
}