Browse Source

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

master
wangxiang 3 years ago
parent
commit
815ce088fb
  1. 4
      src/components/AMap/src/AMapDesigner/index.vue
  2. 4
      src/components/AMap/src/amap.data.tsx
  3. 13
      src/components/AMap/src/components/MapPointModal.vue

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

@ -715,7 +715,7 @@
isArray(mapData.fileId) && (mapData.fileId = mapData.fileId.join(',')); isArray(mapData.fileId) && (mapData.fileId = mapData.fileId.join(','));
mapData.mapTask.forEach(item => { mapData.mapTask.forEach(item => {
const hospital = item.hospitalId && mapState.hospitalList.find(e => e.value == item.hospitalId), 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; item.courierUserId = mapData.courierUserId;
hospital && Object.assign(item,{ hospital && Object.assign(item,{
hospitalName: hospital.label, hospitalName: hospital.label,
@ -731,7 +731,7 @@
if (~~item.taskType == 1) { if (~~item.taskType == 1) {
item?.mapTaskPreset?.forEach(childItem => { item?.mapTaskPreset?.forEach(childItem => {
const childHospital = childItem.orginPresetId && mapState.hospitalList.find(e => e.value == childItem.orginPresetId), 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,{ childHospital && Object.assign(childItem,{
orginPresetName: childHospital.label, orginPresetName: childHospital.label,
orginPresetLat: childHospital.mapLat, orginPresetLat: childHospital.mapLat,

4
src/components/AMap/src/amap.data.tsx

@ -1,9 +1,9 @@
import { BasicColumn } from '/@/components/Table'; import { BasicColumn } from '/@/components/Table';
import { listOrg } from '/@/api/platform/common/controller/org';
import { commonUpload } from '/@/api/platform/core/controller/upload'; import { commonUpload } from '/@/api/platform/core/controller/upload';
import { h } from 'vue'; import { h } from 'vue';
import { Tag } from 'ant-design-vue'; import { Tag } from 'ant-design-vue';
import { VxeTableDefines } from 'vxe-table/types/table'; import { VxeTableDefines } from 'vxe-table/types/table';
import Icon from '/@/components/Icon/index';
/** /**
* @program: kicc-ui * @program: kicc-ui
@ -215,7 +215,7 @@ export const mapPointColumns: VxeTableDefines.ColumnOptions[] = [
header ({ column }) { header ({ column }) {
return [ return [
<vxe-tooltip content="按住后可以上下拖动排序!"> <vxe-tooltip content="按住后可以上下拖动排序!">
<i class="vxe-icon--question"/> <Icon icon="fa6-solid:signature"/>
</vxe-tooltip> </vxe-tooltip>
]; ];
} }

13
src/components/AMap/src/components/MapPointModal.vue

@ -33,6 +33,7 @@
import { add, cloneDeep, concat } from 'lodash-es'; import { add, cloneDeep, concat } from 'lodash-es';
import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic'; import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic';
import { VxeTableDefines } from 'vxe-table/types/table'; import { VxeTableDefines } from 'vxe-table/types/table';
import Icon from '/@/components/Icon/index';
/** 类型规范统一声明定义区域 */ /** 类型规范统一声明定义区域 */
interface WindowState { interface WindowState {
@ -74,14 +75,14 @@
default({row}) { default({row}) {
return [ return [
<span> <span>
<i class="vxe-icon-lock-fill"/> <Icon icon="fa6-solid:lock"/>
</span> </span>
]; ];
}, },
header({column}) { header({column}) {
return [ return [
<vxe-tooltip content="此处数据只能展示不能操作!"> <vxe-tooltip content="此处数据只能展示不能操作!">
<i class="vxe-icon-info-circle-fill"/> <Icon icon="fa6-solid:signature"/>
</vxe-tooltip> </vxe-tooltip>
]; ];
} }
@ -156,18 +157,18 @@
.rightTopLayout { .rightTopLayout {
position: absolute; position: absolute;
top: 70%; top: 0;
left: 50%; left: 50%;
right: 0; right: 0;
bottom: 0; bottom: 30%;
} }
.rightBottomLayout { .rightBottomLayout {
position: absolute; position: absolute;
top: 0; top: 70%;
left: 50%; left: 50%;
right: 0; right: 0;
bottom: 30%; bottom: 0;
} }
} }

Loading…
Cancel
Save