Browse Source

🚑 交接点没有地图数据也能展示处理

master
wangxiang 3 years ago
parent
commit
649c7efb13
  1. 10
      src/components/AMap/src/AMapDesigner/index.vue
  2. 1
      src/components/AMap/src/components/MapPointModal.vue

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

@ -481,10 +481,12 @@
function complete () { function complete () {
if (map) { if (map) {
map.on('complete', () => { map.on('complete', () => {
mapState.loading = false;
mapState.first = true;
setMapDataJson(mapProps.options); setMapDataJson(mapProps.options);
handleSetCourierUserList(); handleSetCourierUserList();
nextTick(() => {
mapState.loading = false;
mapState.first = true;
});
}); });
} }
} }
@ -509,7 +511,7 @@
}); });
watch([() => mapState.mapData.sendOrderId, () => mapState.mapData.sendOrderTaskType], watch([() => mapState.mapData.sendOrderId, () => mapState.mapData.sendOrderTaskType],
([sendOrderIdValue,sendOrderTaskTypeValue], [sendOrderIdOldValue, sendOrderTaskTypeOldValue]) => { ([sendOrderIdValue,sendOrderTaskTypeValue], [sendOrderIdOldValue, sendOrderTaskTypeOldValue]) => {
if (!sendOrderIdValue || !sendOrderTaskTypeValue) return; if (!sendOrderIdValue || !sendOrderTaskTypeValue || !mapState.first) return false;
if (isEmpty(mapState.mapData.mapTask)) { if (isEmpty(mapState.mapData.mapTask)) {
mapState.mapData.mapTask.push({ mapState.mapData.mapTask.push({
name: '系统创建:发单任务', name: '系统创建:发单任务',
@ -706,6 +708,7 @@
} }
}); });
setTableData(mapState.mapData.mapTask); setTableData(mapState.mapData.mapTask);
console.log(1111111111);
drawMapNavigate(concat(mapState.mapData.mapLogisticPoint, mapState.mapData.mapTaskPresetLogisticPoint)); drawMapNavigate(concat(mapState.mapData.mapLogisticPoint, mapState.mapData.mapTaskPresetLogisticPoint));
}); });
} }
@ -744,6 +747,7 @@
/** 绘制地图导航路线 */ /** 绘制地图导航路线 */
function drawMapNavigate(points: MapLogisticPoint[] = []) { function drawMapNavigate(points: MapLogisticPoint[] = []) {
console.log(222222222222);
if (isEmpty(points) && mapState.mapData.courierUserId && mapState.mapData.courierLng && mapState.mapData.courierLat) if (isEmpty(points) && mapState.mapData.courierUserId && mapState.mapData.courierLng && mapState.mapData.courierLat)
throw console.warn('检查到当前起点数据为空或标记点集合为空,请选择起点!'); throw console.warn('检查到当前起点数据为空或标记点集合为空,请选择起点!');
points = points.filter(item => item.lng && item.lat); points = points.filter(item => item.lng && item.lat);

1
src/components/AMap/src/components/MapPointModal.vue

@ -95,7 +95,6 @@
onEnd: ({ newIndex, oldIndex }) => { onEnd: ({ newIndex, oldIndex }) => {
const currRow = state.mapData.mapLogisticPoint?.splice(oldIndex!, 1)[0]; const currRow = state.mapData.mapLogisticPoint?.splice(oldIndex!, 1)[0];
state.mapData.mapLogisticPoint?.splice(newIndex!, 0, currRow); state.mapData.mapLogisticPoint?.splice(newIndex!, 0, currRow);
AMapDesignerEl.value?.drawMapNavigate(concat(state.mapData.mapLogisticPoint, state.mapData.mapTaskPresetLogisticPoint));
}, },
ghostClass: 'ghostGrid' ghostClass: 'ghostGrid'
}); });

Loading…
Cancel
Save