|
|
@@ -348,9 +348,11 @@ export default {
|
|
|
{ start: [116.66325, 39.9171], end: [116.6833, 39.9171], color: "#13C373", trunkId: 'trunk_6', trunkName: '张台路与湖亦路路口' },
|
|
|
],
|
|
|
"勤务路线": [
|
|
|
- { start: [116.6445, 39.8980], end: [116.6850, 39.8980], color: "#BC301D", dutyState: 'pending' },
|
|
|
- { start: [116.6850, 39.8980], end: [116.7250, 39.8980], color: "#BC301D", dutyState: 'active', progress: 0.45 },
|
|
|
- { start: [116.7250, 39.8980], end: [116.7650, 39.8980], color: "#BC301D", dutyState: 'done' }
|
|
|
+ { start: [116.6445, 39.8980], end: [116.6850, 39.8980], color: "#BC301D", dutyState: 'pending', taskId: 1 },
|
|
|
+ { start: [116.6850, 39.8980], end: [116.7250, 39.8980], color: "#BC301D", dutyState: 'active', progress: 0.45, taskId: 3 },
|
|
|
+ { start: [116.7250, 39.8980], end: [116.7650, 39.8980], color: "#BC301D", dutyState: 'done', taskId: 2 },
|
|
|
+ { start: [116.6445, 39.9080], end: [116.7050, 39.9080], color: "#BC301D", dutyState: 'done', taskId: 4 },
|
|
|
+ { start: [116.6445, 39.8880], end: [116.7050, 39.8880], color: "#BC301D", dutyState: 'pending', taskId: 5 }
|
|
|
]
|
|
|
};
|
|
|
|
|
|
@@ -551,7 +553,9 @@ export default {
|
|
|
const allSegments = this.extractMainStraightSegments(basePath);
|
|
|
const segments = configName === '干线协调'
|
|
|
? allSegments.slice(0, 1)
|
|
|
- : allSegments;
|
|
|
+ : configName === '勤务路线'
|
|
|
+ ? [basePath]
|
|
|
+ : allSegments;
|
|
|
const overlays = [];
|
|
|
|
|
|
segments.forEach((rawSegmentPath, segmentIdx) => {
|
|
|
@@ -663,8 +667,8 @@ export default {
|
|
|
|
|
|
const isPastDot = dotDist <= splitDist;
|
|
|
const dotConfig = isPastDot
|
|
|
- ? { ...config, color: '#5A5A5A', id: `MOCK-D-${lineIdx}-${segmentIdx}-${idx}`, road: `勤务路线路口-${lineIdx}-${segmentIdx}-${idx}` }
|
|
|
- : { ...config, id: `MOCK-D-${lineIdx}-${segmentIdx}-${idx}`, road: `勤务路线路口-${lineIdx}-${segmentIdx}-${idx}` };
|
|
|
+ ? { ...config, color: '#5A5A5A', id: `MOCK-D-${lineIdx}-${segmentIdx}-${idx}`, road: `勤务路线路口-${lineIdx}-${segmentIdx}-${idx}`, taskId: line.taskId }
|
|
|
+ : { ...config, id: `MOCK-D-${lineIdx}-${segmentIdx}-${idx}`, road: `勤务路线路口-${lineIdx}-${segmentIdx}-${idx}`, taskId: line.taskId };
|
|
|
const dotType = isPastDot && markerType === 'normal' ? 'passed' : markerType;
|
|
|
const marker = this.createTrafficLightMarker([lng, lat], dotConfig, dotType);
|
|
|
if (marker) overlays.push(marker);
|