diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue index 817bb26..15ca14e 100644 --- a/src/views/components/SyMixMap.vue +++ b/src/views/components/SyMixMap.vue @@ -137,16 +137,16 @@ export default { }, traceList: { handler(val) { - console.log('地图traceList >>>>> ', val) + console.log('地图traceList-watch >>>>> ', val) if (val) { setTimeout(() => { this.handleAddLayerBefore({ type: 'polyline', positions: val, - iconName: 'pos_track.svg', + iconName: '', uid: 'track' }); - }, 100); + }, 500); } }, immediate: true, @@ -389,6 +389,7 @@ export default { } else if (type === 'polyline') { // 添加线 let positionsStr = positions?.map((item) => item.join(',')).join(';') + graphicItem = new sycim.Polyline(positionsStr) graphicItem.setStyle({ canEdit: false, diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue b/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue index a64d376..18a8648 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue @@ -21,7 +21,7 @@
子项起止时间:
- {{ detailData.startDate + " ~ " + detailData.endDate }} + {{ detailData.startDate + " ~ " + (detailData.endDate || "-/-/-") }}
@@ -51,18 +51,13 @@
巡查时长:
- {{ - dayjs(detailData.endDate).diff( - dayjs(detailData.startDate), - "hour" - ) - }}/小时 + {{ calcHours(detailData.startDate, detailData.endDate) }}/小时
巡查开始时间/结束时间:
- {{ detailData.startDate + " ~ " + detailData.endDate }} + {{ detailData.startDate + " ~ " + (detailData.endDate || "-/-/-") }}
@@ -289,11 +284,18 @@ export default { }).then((res) => { this.traceList = res.records?.map((v) => { - return [v.longitude, v.altitude]; + return [v.longitude, v.latitude]; }) || []; }); }); }, + calcHours(start, end) { + if (start && end) { + return dayjs(end).diff(dayjs(start), "hour"); + } + return "-"; + }, + // 树转换 transformArr(treeList) { // 递归设置路径