Browse Source

🚀 地图设计器调整完毕

master
wangxiang 3 years ago
parent
commit
ab8c356116
  1. 5
      src/components/AMap/src/AMapDesigner/index.vue
  2. 6
      src/components/AMap/src/components/MapPointModal.vue

5
src/components/AMap/src/AMapDesigner/index.vue

@ -75,7 +75,7 @@
import medicalKit from '/@/assets/images/medical-kit.svg'; import medicalKit from '/@/assets/images/medical-kit.svg';
import hospitalTwinkle from '/@/assets/images/hospital-twinkle.gif'; import hospitalTwinkle from '/@/assets/images/hospital-twinkle.gif';
import redFlag from '/@/assets/images/redFlag.svg'; 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 { BasicTable, useTable } from '/@/components/Table';
import { useModal } from '/@/components/Modal'; import { useModal } from '/@/components/Modal';
import MapTaskModal from '../components/MapTaskModal.vue'; import MapTaskModal from '../components/MapTaskModal.vue';
@ -85,7 +85,7 @@
import { listUser } from '/@/api/platform/system/controller/user'; import { listUser } from '/@/api/platform/system/controller/user';
import { listOrg } from '/@/api/platform/common/controller/org'; import { listOrg } from '/@/api/platform/common/controller/org';
import { useUserStore } from '/@/store/modules/user'; 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 componentSetting from '/@/settings/componentSetting';
import { BasicUpload } from '/@/components/Upload'; import { BasicUpload } from '/@/components/Upload';
import { commonUpload } from '/@/api/platform/core/controller/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; mapState.mapData.mapLogisticPoint = pointData;
drawMapNavigate(pointData); drawMapNavigate(pointData);
} }

6
src/components/AMap/src/components/MapPointModal.vue

@ -26,7 +26,7 @@
import { VxeGridProps } from 'vxe-table'; import { VxeGridProps } from 'vxe-table';
import { MapData, mapPointColumns } from '../amap.data'; import { MapData, mapPointColumns } from '../amap.data';
import { defaultMapData } from '/@/enums/amapEnum'; import { defaultMapData } from '/@/enums/amapEnum';
import { cloneDeep } from 'lodash-es'; import { add, cloneDeep } from 'lodash-es';
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface WindowState { interface WindowState {
@ -81,10 +81,10 @@
// //
setModalProps({ confirmLoading: true }); 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(); closeModal();
emit('success', mapLogisticPoint); emit('success', state.mapData.mapLogisticPoint);
} finally { } finally {
setModalProps({ confirmLoading: false }); setModalProps({ confirmLoading: false });
} }

Loading…
Cancel
Save