From f82dfc25cab5b60d38c6722af5479df72bf191cc Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 28 Feb 2026 11:10:58 +0800
Subject: [PATCH] feat: 根据工单范围进行过滤航线
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 22 ++++++++++
applications/task-work-order/src/api/zkxt/index.js | 2
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 14 -------
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue | 47 +++++++++++++++--------
4 files changed, 53 insertions(+), 32 deletions(-)
diff --git a/applications/task-work-order/src/api/zkxt/index.js b/applications/task-work-order/src/api/zkxt/index.js
index d776f99..1b2f91b 100644
--- a/applications/task-work-order/src/api/zkxt/index.js
+++ b/applications/task-work-order/src/api/zkxt/index.js
@@ -39,7 +39,7 @@
// 获取航线列表
export const airlineListApi = (data) => {
return request({
- url: `/webservice/webservice/airline/queryList`,
+ url: `/webservice/webservice/airline/getAirlineByScope`,
method: 'post',
data: data,
})
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index 6b9b69d..16684d8 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -144,6 +144,8 @@
v-model="row.patrolRouteUrl"
placeholder="请选择"
:disabled="dialogReadonly"
+ :loading="routeLoading"
+ no-data-text="暂无航线"
>
<el-option v-for="item in routeOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
@@ -267,7 +269,8 @@
// 下拉选项
const flyerListMap = ref({}) // 飞手列表，按行索引存储
const deviceList = ref([]) // 设备列表
-const routeOptions = inject('routeOptions')
+const routeOptions = ref([]) // 航线选项（根据工单范围获取）
+const routeLoading = ref(false) // 航线加载中
// 子任务列表
const taskList = ref([initTaskRow()])
@@ -276,6 +279,8 @@
function handleWorkOrderChange(val) {
if (val) {
selectedWorkOrder.value = workOrderList.value.find(item => item.id === val)
+ // 根据工单范围获取航线列表
+ getAirListByGeom()
// 将工单类型赋值给所有子任务行
const workOrderType = selectedWorkOrder.value?.workOrderType
if (workOrderType) {
@@ -287,9 +292,24 @@
}
} else {
selectedWorkOrder.value = null
+ routeOptions.value = []
}
}
+// 根据工单geom范围获取航线列表
+function getAirListByGeom() {
+ const geom = selectedWorkOrder.value?.geom
+ if (!geom) return
+ const coordinates = geomAnalysis(geom)
+ if (!coordinates || !coordinates.length) return
+ routeLoading.value = true
+ airlineListApi(coordinates).then(res => {
+ routeOptions.value = res.data.data || []
+ }).finally(() => {
+ routeLoading.value = false
+ })
+}
+
// 添加任务行
function addTaskRow() {
const newTask = initTaskRow()
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 bf171b8..49947d0 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
@@ -249,21 +249,21 @@
<script setup>
import { computed, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
-import { fieldRules, flyVisual, getDictLabel } from '@ztzf/utils'
+import { fieldRules, flyVisual, getDictLabel, geomAnalysis } from '@ztzf/utils'
import {
gdPatrolTaskRepublish,
gdFlyerPageApi,
gdPatrolTaskAuditApi,
gdPatrolTaskDetailApi,
} from './inspectionRequestApi'
-import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
+import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderDetailApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
import { Check } from '@element-plus/icons-vue'
-import { queryAirById } from '@/api/zkxt'
+import { queryAirById, airlineListApi } from '@/api/zkxt'
import * as Cesium from 'cesium'
import { useStore } from 'vuex'
@@ -296,12 +296,14 @@
const taskStatus = computed(() => formData.value.taskStatus)
const refuseOrderDialogRef = ref(null)
-// 下拉选项
const flyerList = ref([])
const deviceList = ref([])
-const workOrderList = ref([])
-const routeOptions = inject('routeOptions')
-const getAirName = inject('getAirName')
+const workOrderDetail = ref(null) // 工单详情
+const routeOptions = ref([]) // 航线选项（根据工单范围获取）
+const getAirName = id => {
+ const item = routeOptions.value.find(item => item.id === id)
+ return item ? item.name : id
+}
const gdStatusObj = {
'0': { reason: '拒绝原因', operationType: '2', title: '拒绝签收' },
@@ -371,14 +373,8 @@
// 获取工单名称
function getWorkOrderName(id) {
- const item = workOrderList.value.find(item => item.id === id)
- return item ? item.workOrderName : id
-}
-
-// 获取工单列表
-async function getWorkOrderList() {
- const res = await gdWorkOrderPageApi({ size: 999 })
- workOrderList.value = res?.data?.data?.records ?? []
+ if (workOrderDetail.value?.id === id) return workOrderDetail.value.workOrderName
+ return id
}
// 获取飞手列表
@@ -507,10 +503,30 @@
dialogMode.value = mode
const res = await gdPatrolTaskDetailApi({ id: row.id })
formData.value = { ...initForm(), ...res.data.data }
+ // 获取工单详情并根据geom范围获取航线列表
+ await getWorkOrderDetail(formData.value.workOrderId)
;['6', '7', '8'].includes(row.taskStatus) && await getTaskResultList()
loadList()
initMap()
getAirDetails()
+}
+
+// 获取工单详情
+async function getWorkOrderDetail(workOrderId) {
+ if (!workOrderId) return
+ try {
+ const res = await gdWorkOrderDetailApi({ id: workOrderId })
+ workOrderDetail.value = res?.data?.data ?? null
+ // 根据工单geom范围获取航线列表
+ const geom = workOrderDetail.value?.geom
+ if (!geom) return
+ const coordinates = geomAnalysis(geom)
+ if (!coordinates || !coordinates.length) return
+ const airRes = await airlineListApi(coordinates)
+ routeOptions.value = airRes.data.data || []
+ } catch (e) {
+ console.error('获取工单详情或航线列表失败', e)
+ }
}
// 初始化地图实例
@@ -521,7 +537,6 @@
}
onMounted(() => {
- getWorkOrderList()
getFlyerList()
getDeviceList()
})
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index 5c7261d..8213663 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -98,7 +98,6 @@
import { gdPatrolTaskPageApi, gdPatrolTaskRemoveApi } from './inspectionRequestApi'
import ViewDiaLog from '@/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue'
import { useStore } from 'vuex'
-import { airlineListApi } from '@/api/zkxt'
const store = useStore()
const permission = computed(() => store.state.user.permission)
@@ -208,18 +207,6 @@
selectedIds.value = rows.map(item => item.id)
}
-const routeOptions = ref([])
-const getAirName = id => {
- const item = routeOptions.value.find(item => item.id === id)
- return item ? item.name : id
-}
-provide('routeOptions', routeOptions)
-provide('getAirName', getAirName)
-function getAirList () {
- airlineListApi({}).then(res => {
- routeOptions.value = res.data.data || []
- })
-}
// 获取字典
function getDictList () {
@@ -256,7 +243,6 @@
getTabTotals()
getList()
getDictList()
- getAirList()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3