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 | 106 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 73 insertions(+), 33 deletions(-)
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 73793d1..825d984 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>
@@ -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>
@@ -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">
@@ -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">
@@ -593,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: '',
@@ -614,7 +649,7 @@
detailVisibleCopy: false,
statuses: [
- { label: '草稿', value: '0' },
+ // { label: '草稿', value: '0' },
{ label: '待审核', value: '1' },
{ label: '已驳回', value: '2' },
{ label: '已通过', value: '3' }
@@ -1005,14 +1040,16 @@
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 > (res.data.data + 30) ? this.safeHeight : (res.data.data + 30)
+ 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 valueHeight = _.round(backHeight - resultHeight, 2)
+
console.log('打印比较值', valueHeight)
- if (valueHeight < 0) {
- this.$confirm(`当前返航高度存在安全隐患，建议调整为${resultHeight}米以上后进行发布`, '提示', {
+ if (valueHeight > 0) {
+ this.$confirm(`当前返航高度存在安全隐患，建议调整为${valueHeight}米以上后进行发布`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -1665,4 +1702,7 @@
width: 100% !important;
}
}
+.flex-3 {
+ margin-right: 4px;
+}
</style>
--
Gitblit v1.9.3