Browse Source

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

master
wangxiang 3 years ago
parent
commit
82bc6daa3c
  1. 1
      src/components/AMap/src/AMapDesigner/index.vue
  2. 6
      src/components/AMap/src/components/MapTaskModal.vue

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

@ -744,6 +744,7 @@
/** 绘制地图导航路线 */ /** 绘制地图导航路线 */
function drawMapNavigate(points: MapLogisticPoint[] = []) { function drawMapNavigate(points: MapLogisticPoint[] = []) {
debugger
points = points.filter(item => item.lng && item.lat); points = points.filter(item => item.lng && item.lat);
if (points.length > 0 && mapState.mapData.courierLng && mapState.mapData.courierLat) { if (points.length > 0 && mapState.mapData.courierLng && mapState.mapData.courierLat) {
const lngLats = points.map(item => new AMap.LngLat(item.lng, item.lat)); const lngLats = points.map(item => new AMap.LngLat(item.lng, item.lat));

6
src/components/AMap/src/components/MapTaskModal.vue

@ -123,7 +123,7 @@
options: state.options.hospitalList, options: state.options.hospitalList,
disabled: !~~state.mapData.sendOrderTaskType && record.sort == 1 disabled: !~~state.mapData.sendOrderTaskType && record.sort == 1
}), }),
editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value editValueMap: value => value ? state.options.hospitalList?.find(item => item.value == value)?.label || value : t('component.aMapDesigner.taskPositionTip')
}, },
{ {
title: '医检', title: '医检',
@ -134,7 +134,7 @@
style: { width:'100%' }, style: { width:'100%' },
options: state.options.orgList options: state.options.orgList
}, },
editValueMap: value => state.options.orgList?.find(item => item.value == value)?.label || value editValueMap: value => value ? state.options.orgList?.find(item => item.value == value)?.label || value : t('component.aMapDesigner.taskPositionTip')
}, },
], ],
taskPresetUpdateColumns: BasicColumn[] = [ taskPresetUpdateColumns: BasicColumn[] = [
@ -158,7 +158,7 @@
options: state.options.hospitalList, options: state.options.hospitalList,
disabled: ~~state.mapData.sendOrderTaskType && record.sort == 1 disabled: ~~state.mapData.sendOrderTaskType && record.sort == 1
}), }),
editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value editValueMap: value => value ? state.options.hospitalList?.find(item => item.value == value)?.label || value : t('component.aMapDesigner.taskPositionTip')
}, },
]; ];
const mapTask = cloneDeep(state.mapData?.mapTask || []); const mapTask = cloneDeep(state.mapData?.mapTask || []);

Loading…
Cancel
Save