From e5d5e9cc77eda9f7a500b1adc6e610c9749dd7c9 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 14 Nov 2025 19:10:29 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.1' into test
---
src/views/tickets/orderLog.vue | 21 ++++++++++++++++++---
src/views/device/airport.vue | 2 ++
src/views/job/components/DeviceJobDetails.vue | 4 ++++
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 191f2fe..31f1282 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -721,6 +721,7 @@
prop: 'login_time',
type: 'date',
viewDisplay: true, //查看显示
+ editDisabled: true,
labelWidth: 145,
overHidden: true,
format: 'YYYY-MM-DD HH:mm:ss',
@@ -754,6 +755,7 @@
type: 'date',
hide: true,
viewDisplay: true, //查看显示
+ editDisabled: true,
overHidden: true,
labelWidth: 145,
width: 160,
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index d32dadd..cfc623e 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -189,6 +189,7 @@
{ name: '任务时间', value: '', field: 'cycle_time_value' },
{ name: '关联算法', value: '', field: 'ai_type_str' },
{ name: '任务描述', value: '', field: 'remark' },
+ { name: '自定义识别区', value: '', field: 'enable_custom_area' },
// { name: '任务执行次数', value: '', field: 'job_num' },
])
// 机巢状态
@@ -272,6 +273,9 @@
droneEventList.filter(({ value }) => actionActuatorFunc === value)
)
}
+ if (item.name === '自定义识别区') {
+ item.value = res.data.data.enable_custom_area ? '是': '否'
+ }
getJobsAllFiles({
wayLineJobId: detailsData.value.way_lines.map(item => item.job_id).join(','),
resultTypes: [0, 2, 4, 5],
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 512ec11..081072f 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -207,11 +207,16 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联算法" prop="ai_types">
<el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple>
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="自定义识别区" prop="enable_custom_area" class="safe-height">
+ <el-checkbox v-model="form.enable_custom_area"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@@ -333,11 +338,16 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联算法" prop="ai_types">
<el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="自定义识别区" prop="enable_custom_area" class="safe-height">
+ <el-checkbox v-model="form.enable_custom_area"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@@ -469,13 +479,18 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="关联算法" prop="ai_types">
<el-select v-model="form.ai_types" placeholder="请选择关联算法" multiple :disabled="true">
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="自定义识别区" prop="enable_custom_area" class="safe-height">
+ <el-checkbox v-model="form.enable_custom_area"></el-checkbox>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row :gutter="20">
--
Gitblit v1.9.3