From f04f9d69cedbc72444bbe3bbefd36cd822b59c8b Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 25 Nov 2025 21:22:21 +0800
Subject: [PATCH] feat: 下载问题
---
src/views/tickets/orderLog.vue | 138 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 43 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 512ec11..825d984 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -194,7 +194,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number v-model="form.rth_altitude" :min="50" :max="300"></el-input-number>
+ <el-input-number v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -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>
@@ -224,15 +229,15 @@
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="5">
<div class="flex">
- <div class="flex-1">
+ <div class="flex-1 flex-3">
<el-select v-model="form.rep_fre_type" placeholder="请选择频次">
<el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
</el-select>
@@ -264,7 +269,7 @@
<template #footer>
<div class="dialog-footer">
<el-button type="danger" @click="submitForm(1)" icon="el-icon-position">发起</el-button>
- <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>
+ <!-- <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button> -->
<el-button @click="dialogVisible = false" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
@@ -320,7 +325,7 @@
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
<el-input-number :disabled="detailTitle === '工单详情'" v-model="form.rth_altitude" :min="50"
- :max="300"></el-input-number>
+ :max="500"></el-input-number>
</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" :disabled="detailTitle === '工单详情'"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@@ -349,25 +359,35 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
- <el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </el-col>
-
- <el-col :span="3">
- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"
- value-format="HH:mm" :picker-options="{
+ <el-col :span="5">
+ <div class="flex">
+ <div class="flex-1 flex-3">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="detailTitle === '工单详情'">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </div>
+ <div class="flex-1">
+ <el-time-picker v-model="form.deal_time" prop="deal_time"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" :disabled="detailTitle === '工单详情'" />
+ </div>
+ </div>
</el-col>
+
+ <!-- <el-col :span="3">-->
+ <!-- <el-time-picker class="timeStyle" :style="{ width: pxToRem(140) }" v-model="form.deal_time" prop="deal_time"-->
+ <!-- value-format="HH:mm" :picker-options="{-->
+ <!-- selectableRange: '00:00 - 23:59',-->
+ <!-- }" :disabled="detailTitle === '工单详情'" />-->
+ <!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -455,7 +475,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="300"></el-input-number>
+ <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -469,11 +489,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="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" :disabled="true"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@@ -485,24 +510,34 @@
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
<el-date-picker v-model="form.date_range" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
- <el-col :span="3">
- <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
- <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
- </el-select>
- </el-col>
-
- <el-col :span="3">
- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
- value-format="HH:mm" :picker-options="{
+ <el-col :span="5">
+ <div class="flex">
+ <div class="flex-1 flex-3">
+ <el-select v-model="form.rep_fre_type" placeholder="请选择频次" :disabled="true">
+ <el-option v-for="item in cycles" :key="item" :label="item" :value="item" />
+ </el-select>
+ </div>
+ <div class="flex-1">
+ <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
+ </div>
+ </div>
</el-col>
+
+ <!-- <el-col :span="3">-->
+ <!-- <el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" :disabled="true"-->
+ <!-- value-format="HH:mm" :picker-options="{-->
+ <!-- selectableRange: '00:00 - 23:59',-->
+ <!-- }" />-->
+ <!-- </el-col>-->
</el-row>
<el-row :gutter="20">
@@ -555,7 +590,8 @@
orderLogExport,
jobStatusNum,
userPublish,
- deleteOrderLog
+ deleteOrderLog,
+ getWaylineMaxTerrainHeight
} from '@/api/tickets/orderLog'
import { getTicketInfo } from '@/api/tickets/ticket'
import { getDictionaryByCode } from '@/api/system/dictbiz'
@@ -592,7 +628,7 @@
{ label: '待审核', name: 'WAIT_AUDIT', value: 1, count: 0 },
{ label: '已驳回', name: 'REJECTED', value: 2, count: 0 },
{ label: '已通过', name: 'PASS', value: 3, count: 0 },
- { label: '草稿', name: 'DRAFT', value: 0, count: 0 }
+ // { label: '草稿', name: 'DRAFT', value: 0, count: 0 }
],
filters: {
key_word: '',
@@ -613,7 +649,7 @@
detailVisibleCopy: false,
statuses: [
- { label: '草稿', value: '0' },
+ // { label: '草稿', value: '0' },
{ label: '待审核', value: '1' },
{ label: '已驳回', value: '2' },
{ label: '已通过', value: '3' }
@@ -810,9 +846,13 @@
return CircleClose
},
...mapGetters(['userInfo', 'permission']),
- lastHeight () {
- const height = this.$store.state.common.lastHeight
- return Number(height) || 0 // 确保是数字类型
+ safeHeight () {
+ const safeHeight = this.$store.state.common.safeHeight
+ return Number(safeHeight) || 0 // 确保是数字类型
+ },
+ positionsArr () {
+ const positionsArr = this.$store.state.common.positionsArr
+ return positionsArr || [] // 确保是数字类型
},
filteredTabs () {
// rejection_and_draft 权限控制“已驳回”和“草稿”tab
@@ -992,15 +1032,24 @@
const maxItem = checkedList.reduce((max, item) => {
return item.drone_height > max.drone_height ? item : max;
});
- console.log(maxItem.drone_height, '高度');
- console.log(this.lastHeight, '最后一点高度');
- let result = _.round((maxItem.drone_height + this.form.rth_altitude), 2);
+ // 返航绝对高度
+ let backHeight = this.form.rth_altitude // + maxItem.drone_height
+ console.log(backHeight,'backHeight')
+ // 安全起飞高度
+ let positions = this.positionsArr
+ positions.unshift({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height })
+ positions.push({latitude: maxItem.latitude, longitude: maxItem.longitude, height:maxItem.drone_height})
+ let resultHeight = 0
+ let valueHeight = 0
+ await getWaylineMaxTerrainHeight(positions).then(res => {
+ resultHeight = (this.safeHeight+maxItem.drone_height) > (res.data.data + 30) ? (this.safeHeight+maxItem.drone_height) : (res.data.data + 30)
+ valueHeight = (resultHeight - maxItem.drone_height) > backHeight ? _.round(resultHeight - maxItem.drone_height) : 0
+ })
- let resultHeight = this.lastHeight - maxItem.drone_height
- let resultH = _.round(resultHeight, 2)
+ console.log('打印比较值', valueHeight)
- if (this.lastHeight > result) {
- this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultH}米以上后进行发布`, '提示', {
+ if (valueHeight > 0) {
+ this.$confirm(`当前返航高度存在安全隐患，建议调整为${valueHeight}米以上后进行发布`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -1653,4 +1702,7 @@
width: 100% !important;
}
}
+.flex-3 {
+ margin-right: 4px;
+}
</style>
--
Gitblit v1.9.3