From 2df37298dfd5b299a4c051cb544794b5241cc3a5 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 06 Dec 2025 11:06:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v9.0/9.0.1' into feature/v9.0/9.0.1
---
src/views/tickets/component/AddEditDetails.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/tickets/component/AddEditDetails.vue b/src/views/tickets/component/AddEditDetails.vue
index fec8e16..60ce8da 100644
--- a/src/views/tickets/component/AddEditDetails.vue
+++ b/src/views/tickets/component/AddEditDetails.vue
@@ -41,11 +41,13 @@
</el-col>
<el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
- <el-select v-model="formParams.file_id" placeholder="请选择航线" filterable @change="getFlyingNest"
- :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'">
+ <el-select v-if="txtTitle === '新建工单'" v-model="formParams.file_id" placeholder="请选择航线" filterable
+ @change="getFlyingNest">
<el-option v-for="item in lineList" :key="item.wayline_id" :label="item.name"
:value="item.wayline_id" />
</el-select>
+ <el-input v-else v-model="formParams.wayline_file_region_vo.name"
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -285,10 +287,11 @@
// initMapLine 方法
const initMapLine = async (infos = {}, cb = () => { }) => {
- const currentLine = lineList.value.find(item => item.wayline_id == formParams.value.file_id)
+ let currentLine = lineList.value.find(item => item.wayline_id == formParams.value.file_id)
-
- if (!currentLine) return
+ if (!currentLine) {
+ currentLine = formParams.value.wayline_file_region_vo
+ }
await nextTick()
if (mapContainerRef.value?.initAddEntity) {
@@ -438,7 +441,6 @@
formParams.value = {
...data
}
- console.log(formParams.value, '898789')
drone_sns.value = data.device_list
initMapLine(data.device_map_infos)
} else {
--
Gitblit v1.9.3