From e4439e5d0a2cba9983f013bd044fe4e22c7b7077 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 11 Feb 2026 16:35:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
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 16cb40e..6b9b69d 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
@@ -21,7 +21,6 @@
clearable
filterable
:disabled="dialogMode !== 'add'"
- @change="handleWorkOrderChange"
>
<el-option v-for="item in workOrderList" :key="item.id" :label="item.workOrderName" :value="item.id" />
</el-select>
@@ -68,7 +67,11 @@
</div>
<!-- 子任务表格表单 -->
- <div class="task-table-section" v-if="selectedWorkOrderId">
+ <div
+ class="task-table-section"
+ :class="{ 'disabled-section': !selectedWorkOrderId }"
+ @click="handleTaskSectionClick"
+ >
<div class="detail-title" :style="{ marginTop: pxToRem(10) }">添加子任务</div>
<div class="task-table-container">
<el-table :data="taskList">
@@ -117,7 +120,7 @@
任务执行时间
</template>
<template v-slot="{ row }">
-<!-- gd-date-picker-popper-->
+ <!-- gd-date-picker-popper-->
<el-date-picker
class="gd-date-picker"
popper-class=""
@@ -231,7 +234,7 @@
import { computed, ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import { Plus, Delete } from '@element-plus/icons-vue'
-import { getDictLabel } from '@ztzf/utils'
+import { geomAnalysis, getDictLabel } from '@ztzf/utils'
import { gdPatrolTaskSaveApi, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
@@ -267,7 +270,7 @@
const routeOptions = inject('routeOptions')
// 子任务列表
-const taskList = ref([initTaskRow(), initTaskRow(), initTaskRow(), initTaskRow(), initTaskRow()])
+const taskList = ref([initTaskRow()])
// 处理工单选择变化
function handleWorkOrderChange(val) {
@@ -320,6 +323,13 @@
}
}
+// 处理任务区域点击事件（未选择工单时提示）
+function handleTaskSectionClick() {
+ if (!selectedWorkOrderId.value) {
+ ElMessage.warning('请先选择工单')
+ }
+}
+
// 获取工单列表
async function getWorkOrderList() {
const res = await gdWorkOrderPageApi({ size: 999, workOrderStatus: dialogMode.value === 'add' ? '20' : '' })
@@ -334,12 +344,26 @@
await getFlyerList(index, skilledTaskType)
}
+import * as turf from '@turf/turf'
+
+function getPolygonCenter(rawData) {
+ const coordinates = [rawData.map(p => [p.longitude, p.latitude])];
+ const polygon = turf.polygon(coordinates);
+ const center = turf.centroid(polygon);
+ const [centerLon, centerLat] = center.geometry.coordinates;
+ return {longitude: centerLon, latitude: centerLat};
+}
+
+
// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
+ const obj = getPolygonCenter(geomAnalysis(selectedWorkOrder.value.geom))
const res = await gdFlyerPageApi({
size: 999,
current: 1,
skilledTaskType,
+ longitude: obj.longitude || '',
+ latitude: obj.latitude || '',
})
flyerListMap.value[index] = res?.data?.data?.records ?? []
}
@@ -466,8 +490,22 @@
color: #f56c6c;
margin-right: 4px;
}
+:deep(.el-table__header th) {
+ font-weight: normal !important;
+}
.grayText {
color: #9f9f9f !important;
}
+
+// 禁用区域样式 - 使用 pointer-events: none 禁用所有子元素的点击
+.disabled-section {
+ .task-table-container {
+ * {
+ pointer-events: none;
+ }
+ }
+ opacity: 0.6;
+ cursor: not-allowed;
+}
</style>
--
Gitblit v1.9.3