From 3d77eedfc843a2d51fb00259b017f1a8dff5c4cd Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 03 Feb 2026 11:38:24 +0800
Subject: [PATCH] feat: 过滤没有经纬度的机巢
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 28 +++++++++++++++-------------
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/inspectionRequestApi.js | 9 +++++++++
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 3 ++-
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
index 8830de9..105b3bc 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -29,7 +29,6 @@
</el-timeline-item>
</el-timeline>
</div>
-
</div>
<div class="detail-right">
@@ -251,7 +250,12 @@
import { computed, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import { fieldRules, flyVisual, getDictLabel } from '@ztzf/utils'
-import { gdPatrolTaskRepublish, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
+import {
+ gdPatrolTaskRepublish,
+ gdFlyerPageApi,
+ gdPatrolTaskAuditApi,
+ gdPatrolTaskDetailApi,
+} from './inspectionRequestApi'
import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
@@ -300,10 +304,10 @@
const getAirName = inject('getAirName')
const gdStatusObj = {
- '0': { reason: '拒绝原因', operationType: '2',title:'拒绝签收' },
+ '0': { reason: '拒绝原因', operationType: '2', title: '拒绝签收' },
'1': { reason: '拒绝原因' },
'2': { reason: '' },
- '3': { reason: '驳回原因', operationType: '5',title:'驳回' },
+ '3': { reason: '驳回原因', operationType: '5', title: '驳回' },
'4': { reason: '驳回原因' },
'5': { reason: '' },
'6': { reason: '拒绝原因' },
@@ -337,7 +341,7 @@
row: formData.value,
type: gdStatusObj[taskStatus.value].operationType,
formLabel: gdStatusObj[taskStatus.value].reason,
- title: gdStatusObj[taskStatus.value]?.title
+ title: gdStatusObj[taskStatus.value]?.title,
})
})
}
@@ -446,6 +450,7 @@
})
// 获取航线详情
function getAirDetails() {
+ console.log(formData.value)
queryAirById(formData.value.patrolRouteUrl).then(res => {
const list = res.data.data.airlineWaypoints
if (!list.length) return mapRef.value?.flyBoundary()
@@ -500,14 +505,11 @@
// 打开弹框
async function open({ mode = 'view', row } = {}) {
dialogMode.value = mode
- formData.value = { ...initForm(), ...row }
- ;['6', '7', '8'].includes(row.taskStatus) && getTaskResultList()
+ const res = await gdPatrolTaskDetailApi({ id: row.id })
+ formData.value = { ...initForm(), ...res.data.data }
+ ;['6', '7', '8'].includes(row.taskStatus) && await getTaskResultList()
loadList()
initMap()
-}
-
-const readyMap = () => {
- // mapRef.value?.flyBoundary()
getAirDetails()
}
@@ -565,11 +567,11 @@
margin-top: 2px;
}
-.processBox{
+.processBox {
display: flex;
flex-direction: column;
- .detail-left{
+ .detail-left {
height: 100%;
overflow: auto;
}
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/inspectionRequestApi.js b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/inspectionRequestApi.js
index 3d9a491..22a5b4a 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/inspectionRequestApi.js
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/inspectionRequestApi.js
@@ -9,6 +9,15 @@
})
}
+// 详情
+export const gdPatrolTaskDetailApi = params => {
+ return request({
+ url: `/drone-gd/workOrder/gdPatrolTask/detail`,
+ method: 'get',
+ params,
+ })
+}
+
// 新增
export const gdPatrolTaskSaveApi = data => {
return request({
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index 51a743a..e5aaf96 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -554,7 +554,8 @@
// 渲染
function renderingAllDevice(list) {
list.forEach(item => {
- const position = Cesium.Cartesian3.fromDegrees(item.longitude || 115.0, item.latitude || 27.11)
+ if (!item.longitude || !item.latitude) return
+ const position = Cesium.Cartesian3.fromDegrees(item.longitude, item.latitude)
viewer.entities.add({
position: position,
billboard: {
--
Gitblit v1.9.3