From b4f08a561973b998036f6ffa9e843cfd5ee877be Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 03 Jun 2026 14:35:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 102 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 25 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 fca8cc3..24f51c2 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
@@ -5,10 +5,10 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
- width="75%"
+ width="90%"
:close-on-click-modal="false"
>
- <div class="gd-dialog-form">
+ <div>
<!-- 关联工单选择 -->
<div class="work-order-section">
<div class="detail-title" :style="{ marginBottom: 0, marginRight: pxToRem(10) }">选择工单</div>
@@ -33,7 +33,7 @@
<div class="info-item">
<span class="label">工单类型</span>
<span class="val" v-if="selectedWorkOrder">
- {{ getDictLabel(selectedWorkOrder.workOrderType, dictObj.workOrderType) }}
+ {{ getDictLabelXT(selectedWorkOrder.workOrderType, workOrderTypeXT) }}
</span>
<span class="val grayText" v-else>选择工单后自动带出</span>
</div>
@@ -78,7 +78,7 @@
<el-table-column width="50" label="">
<template v-slot="{ $index }">{{ $index + 1 }}</template>
</el-table-column>
- <el-table-column prop="patrolTaskName" min-width="120">
+ <el-table-column prop="patrolTaskName" min-width="100">
<template #header>
<span class="required-star">*</span>
巡查任务名称
@@ -92,7 +92,7 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolTaskType" min-width="140">
+ <el-table-column prop="patrolTaskType" min-width="100">
<template #header>
<span class="required-star">*</span>
巡查任务类型
@@ -106,15 +106,15 @@
@change="handlePatrolTaskTypeChange($index, $event)"
>
<el-option
- v-for="item in dictObj.workOrderType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
+ v-for="item in workOrderTypeXT"
+ :key="item.dictValue"
+ :label="item.dictLabel"
+ :value="item.dictValue"
/>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="executeTime" min-width="180">
+ <el-table-column prop="executeTime" width="200">
<template #header>
<span class="required-star">*</span>
任务执行时间
@@ -122,7 +122,7 @@
<template v-slot="{ row }">
<!-- gd-date-picker-popper-->
<el-date-picker
- :style="{width: pxToRem(160)}"
+ :style="{width: pxToRem(165)}"
class="gd-date-picker"
popper-class=""
v-model="row.executeTime"
@@ -133,7 +133,7 @@
/>
</template>
</el-table-column>
- <el-table-column prop="patrolRouteUrl" min-width="120">
+ <el-table-column prop="patrolRouteUrl" min-width="100">
<template #header>
<span class="required-star">*</span>
巡查任务航线
@@ -152,7 +152,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="recommendFlyerName" min-width="120">
+ <el-table-column prop="deviceFlyerId" min-width="100">
<template #header>
<span class="required-star">*</span>
推荐飞手
@@ -162,16 +162,17 @@
no-data-text="暂无推荐飞手"
class="gd-select"
popper-class="gd-select-popper"
- v-model="row.recommendFlyerName"
+ v-model="row.deviceFlyerId"
placeholder="请选择"
filterable
:disabled="dialogReadonly || !taskList[$index].patrolTaskType"
+
>
<el-option
v-for="item in flyerListMap[$index] || []"
- :key="item.id"
+ :key="item.flyerId"
:label="item.flyerName"
- :value="item.flyerName"
+ :value="item.flyerId"
>
<template #default>
<!-- 匹配区域=1 显示红星号 -->
@@ -182,7 +183,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="deviceId" min-width="120">
+ <el-table-column prop="deviceId" min-width="100">
<template #header>
<span class="required-star">*</span>
选择设备
@@ -200,7 +201,31 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taskDesc" label="巡查任务描述" min-width="120">
+ <el-table-column prop="algorithmIds" min-width="160">
+ <template #header>
+ 算法
+ </template>
+ <template v-slot="{ row }">
+ <el-tree-select
+ class="gd-select"
+ popper-class="gd-tree-select-popper"
+ v-model="row.algorithmIds"
+ :data="algorithmTreeData"
+ :props="{ label: 'name', children: 'children', value: 'id' }"
+ node-key="id"
+ multiple
+ collapse-tags
+ collapse-tags-tooltip
+ check-strictly
+ filterable
+ placeholder="请选择"
+ :disabled="dialogReadonly"
+ />
+ </template>
+ </el-table-column>
+
+
+ <el-table-column prop="taskDesc" label="巡查任务描述">
<template v-slot="{ row }">
<el-input class="gd-input" v-model="row.taskDesc" placeholder="请输入" :disabled="dialogReadonly" />
</template>
@@ -240,15 +265,16 @@
</template>
<script setup>
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref, onMounted, inject } from 'vue'
import { ElMessage } from 'element-plus'
import { Plus, Delete } from '@element-plus/icons-vue'
-import { geomAnalysis, getDictLabel } from '@ztzf/utils'
+import { geomAnalysis, getDictLabel, getDictLabelXT } from '@ztzf/utils'
+
import { gdPatrolTaskSaveApi, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
-import { airlineListApi } from '@/api/zkxt'
+import { airlineListApi, algorithmGroupedApi } from '@/api/zkxt'
// 初始化任务行
const initTaskRow = () => ({
@@ -256,8 +282,9 @@
patrolTaskType: '',
executeTime: '',
patrolRouteUrl: '',
- recommendFlyerName: '',
+ deviceFlyerId: '',
deviceId: null,
+ algorithmIds: [],
taskDesc: '',
})
const dictObj = inject('dictObj')
@@ -278,6 +305,27 @@
const deviceList = ref([]) // 设备列表
const routeOptions = ref([]) // 航线选项（根据工单范围获取）
const routeLoading = ref(false) // 航线加载中
+const algorithmTreeData = ref([]) // 算法树形数据
+const workOrderTypeXT = inject('workOrderTypeXT', ref([]))
+
+// 获取算法分组数据
+async function getAlgorithmList() {
+ try {
+ const res = await algorithmGroupedApi()
+ const list = res?.data?.data ?? []
+ algorithmTreeData.value = list.map(group => ({
+ id: 'group_' + group.type,
+ name: group.type,
+ disabled: true,
+ children: (group.algorithms || []).map(alg => ({
+ id: alg.id,
+ name: alg.name,
+ }))
+ }))
+ } catch (e) {
+ console.error('获取算法列表失败', e)
+ }
+}
// 子任务列表
const taskList = ref([initTaskRow()])
@@ -369,10 +417,12 @@
// 处理巡查任务类型变化
async function handlePatrolTaskTypeChange(index, skilledTaskType) {
// 清空该行已选择的飞手
- taskList.value[index].recommendFlyerName = ''
+ taskList.value[index].deviceFlyerId = ''
// 获取对应的飞手列表
await getFlyerList(index, skilledTaskType)
}
+
+
import * as turf from '@turf/turf'
@@ -416,7 +466,7 @@
// 判断一行是否已填写（至少填写了任务名称）
function isTaskRowFilled(task) {
- return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.recommendFlyerName || task.deviceId)
+ return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.deviceFlyerId || task.deviceId)
}
// 提交新增
@@ -453,7 +503,7 @@
ElMessage.warning(`第${i + 1}行: 请选择巡查任务航线`)
return
}
- if (!task.recommendFlyerName) {
+ if (!task.deviceFlyerId) {
ElMessage.warning(`第${i + 1}行: 请选择推荐飞手`)
return
}
@@ -485,6 +535,8 @@
async function open({ mode = 'add', row } = {}) {
dialogMode.value = mode
await getWorkOrderList()
+ getAlgorithmList()
+
if (dialogMode.value === 'add') {
selectedWorkOrderId.value = null
selectedWorkOrder.value = null
--
Gitblit v1.9.3