From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/tickets/component/AddEditDetails.vue | 215 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 140 insertions(+), 75 deletions(-)
diff --git a/src/views/tickets/component/AddEditDetails.vue b/src/views/tickets/component/AddEditDetails.vue
index 89c8ed7..60ce8da 100644
--- a/src/views/tickets/component/AddEditDetails.vue
+++ b/src/views/tickets/component/AddEditDetails.vue
@@ -1,22 +1,15 @@
<template>
- <el-dialog
- class="ztzf-dialog-mange"
- modal-class="add-edit-details"
- v-model="isShowAddEditDetails"
- :title="txtTitle"
- width="70%"
- :close-on-click-modal="false"
- :destroy-on-close="true"
- @close="cancel"
- :before-close="handleBeforeClose"
- >
+ <el-dialog class="ztzf-dialog-mange" modal-class="add-edit-details" v-model="isShowAddEditDetails" :title="txtTitle"
+ width="70%" :close-on-click-modal="false" :destroy-on-close="true" @close="cancel"
+ :before-close="handleBeforeClose">
<div class="add-edit-details">
- <div class="process" v-if="txtTitle !=='新建工单'">
+ <div class="process" v-if="txtTitle !== '新建工单'">
<div class="order_title">{{ formParams.name }}</div>
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles">
- <div class="step-title" v-for="(record, index) in formParams.record_list" :class="{ active: record.user_id >= 0 }" :key="index">
+ <div class="step-title" v-for="(record, index) in formParams.record_list"
+ :class="{ active: record.user_id >= 0 }" :key="index">
{{ record.status_str }}
</div>
</div>
@@ -42,44 +35,54 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工单名称" prop="name">
- <el-input v-model="formParams.name" placeholder="请输入工单名称" maxlength="100" show-word-limit :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"></el-input>
+ <el-input v-model="formParams.name" placeholder="请输入工单名称" maxlength="100" show-word-limit
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input>
</el-form-item>
</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" />
+ :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">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number v-model="formParams.rth_altitude" :min="50" :max="500" :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"></el-input-number>
+ <el-input-number v-model="formParams.rth_altitude" :min="50" :max="500"
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="关联机巢" prop="device_sns">
- <el-select v-model="formParams.device_sns" placeholder="请选择机巢" multiple :disabled="(txtTitle === '审核工单' || txtTitle === '工单详情')">
- <el-option v-for="item in drone_sns" :key="item.device_sn" :label="item.nickname" :value="item.device_sn" />
+ <el-select v-model="formParams.device_sns" placeholder="请选择机巢" multiple
+ :disabled="(txtTitle === '工单审核' || txtTitle === '工单详情')">
+ <el-option v-for="item in drone_sns" :key="item.device_sn" :label="item.nickname"
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="关联算法" prop="ai_types">
- <el-select v-model="formParams.ai_types" placeholder="请选择关联算法" multiple :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'">
- <el-option v-for="item in aiTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+ <el-select v-model="formParams.ai_types" placeholder="请选择关联算法" multiple
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'">
+ <el-option v-for="item in aiTypeList" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
- <el-col :span="12" v-if="txtTitle === '新建工单'">
+ <el-col :span="12" v-if="txtTitle === '新建工单'">
<el-form-item label="工单内容" prop="content">
- <el-input type="textarea" v-model="formParams.content" rows="4" placeholder="请输入工单内容" maxlength="255" show-word-limit :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"></el-input>
+ <el-input type="textarea" v-model="formParams.content" rows="4" placeholder="请输入工单内容" maxlength="255"
+ show-word-limit :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
@@ -91,35 +94,29 @@
<el-col :span="7">
<el-form-item label="周期频次" prop="date_range">
- <el-date-picker :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"
- v-model="formParams.date_range"
- type="daterange"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
+ <el-date-picker :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'" v-model="formParams.date_range"
+ type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
:disabled-date="disabledDate" />
</el-form-item>
</el-col>
<el-col :span="2">
- <el-select v-model="formParams.rep_fre_type" placeholder="请选择频次" :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'">
+ <el-select v-model="formParams.rep_fre_type" placeholder="请选择频次"
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'">
<el-option v-for="item in weeks" :key="item" :label="item" :value="item" />
</el-select>
</el-col>
<el-col :span="3">
- <el-time-picker :style="{ width: pxToRem(140) }"
- v-model="formParams.deal_time"
- :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"
- prop="deal_time"
- value-format="HH:mm"
- :picker-options="{ selectableRange: '00:00 - 23:59'}" />
+ <el-time-picker :style="{ width: pxToRem(140) }" v-model="formParams.deal_time"
+ :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'" prop="deal_time" value-format="HH:mm"
+ :picker-options="{ selectableRange: '00:00 - 23:59' }" />
</el-col>
</el-row>
- <el-row :gutter="20" v-if="txtTitle === '审核工单' || txtTitle === '工单详情' || txtTitle === '工单编辑'">
+ <el-row :gutter="20" v-if="txtTitle === '工单审核' || txtTitle === '工单详情' || txtTitle === '工单编辑'">
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="formParams.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit :disabled="txtTitle === '审核工单' || txtTitle === '工单详情'"></el-input>
+ show-word-limit :disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -134,19 +131,17 @@
<template #footer v-if="txtTitle === '新建工单'">
<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="cancel" icon="el-icon-circle-close">取消</el-button>
</div>
</template>
<template #footer v-if="txtTitle === '工单审核'">
<div class="dialog-footer">
- <el-button type="primary"
- v-if="formParams.status == 1 && permission.order_log_review"
- @click="orderPass(formParams.id)">通过
+ <el-button type="primary" v-if="formParams.status == 1 && permission.orderLogpass"
+ @click="orderPass(formParams.id)">通过
</el-button>
- <el-button type="danger"
- v-if="formParams.status == 1 && permission.rejection_btn"
- @click="orderReject(formParams.id)">驳回
+ <el-button type="danger" v-if="formParams.status == 1 && permission.rejection_btn"
+ @click="orderReject(formParams.id)">驳回
</el-button>
<el-button @click="cancel" icon="el-icon-circle-close">取消</el-button>
</div>
@@ -154,8 +149,8 @@
<template #footer v-if="txtTitle === '工单编辑'">
<div class="dialog-footer">
<el-button type="danger"
- v-if="formParams.status == 0 || (formParams.status == 2 && userInfo.user_id === formParams.create_user)"
- @click="submitForm(1)" icon="el-icon-position">发布
+ v-if="formParams.status == 0 || (formParams.status == 2 && userInfo.user_id === formParams.create_user)"
+ @click="submitForm(1)" icon="el-icon-position">发布
</el-button>
<el-button @click="cancel" icon="el-icon-circle-close">取消</el-button>
</div>
@@ -165,7 +160,7 @@
<script setup>
import { pxToRem, pxToRemNum } from '@/utils/rem'
-import { ref, shallowRef, onMounted, computed } from 'vue';
+import { ref, shallowRef, onMounted, computed } from 'vue'
import { newGetWorkspacesPage } from '@/api/resource/wayline'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getFlyingNestBy } from '@/api/device/device'
@@ -174,22 +169,34 @@
orderLogDetails,
orderLogPass,
orderLogReject,
- orderLogRecall
-} from '@/api/tickets/orderLog';
+ orderLogRecall, getWaylineMaxTerrainHeight
+} from '@/api/tickets/orderLog'
import dayjs from 'dayjs'
import 'dayjs/locale/zh-cn' // 导入中文语言包
import _ from 'lodash'
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus'
import weekday from 'dayjs/plugin/weekday'
dayjs.extend(weekday)
dayjs.locale('zh-cn')
import { useStore } from 'vuex'
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(['refresh'])
const store = useStore()
const userInfo = computed(() => store.state.user.userInfo)
-const permission = computed(() => store.state.user.permission);
+const permission = computed(() => store.state.user.permission)
+
+// safeHeight 计算属性
+const safeHeight = computed(() => {
+ const height = store.state.common.safeHeight
+ return Number(height) || 0 // 确保是数字类型
+})
+
+// positionsArr 计算属性
+const positionsArr = computed(() => {
+ const arr = store.state.common.positionsArr
+ return arr || [] // 确保是数组类型
+})
const txtTitle = inject('txtTitle')
const rowObj = inject('rowObj')
@@ -203,15 +210,15 @@
{ required: true, message: '请输入工单名称', trigger: 'blur' },
{ max: 100, message: '工单名称不能超过100个字', trigger: 'blur' }
],
- file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
- device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
- content: [
+ file_id: [{ required: true, message: '需要选择航线', trigger: 'change' }],
+ device_sns: [{ required: true, message: '请选择机巢', trigger: 'change' }],
+ content: [
{ required: true, message: '请输入工单内容', trigger: 'blur' },
{ max: 255, message: '工单内容不能超过255个字', trigger: 'blur' }
],
- date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
- rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
- deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }]
+ date_range: [{ required: true, message: '请选择时间不能为空', trigger: 'blur' }],
+ rep_fre_type: [{ required: true, message: '请选择周期', trigger: 'blur' }],
+ deal_time: [{ required: true, message: '请选择执行时间', trigger: 'blur' }]
})
//周期
const weeks = ref(['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'])
@@ -256,7 +263,7 @@
initMapLine({}, polygon => {
const currentLine = lineList.value.find(item => item.wayline_id === waylineId)
const params = {
- type: ['2', '4', '5'].includes(currentLine.wayline_type) ? 2 : 0,
+ type: ['2', '4', '5', '7', '8', '9', '10'].includes(currentLine.wayline_type) ? 2 : 0,
wayline_id: waylineId,
polygon
}
@@ -279,11 +286,12 @@
// }
// initMapLine 方法
-const initMapLine = async (infos = {}, cb = () => {}) => {
- const currentLine = lineList.value.find(item => item.wayline_id == formParams.value.file_id)
+const initMapLine = async (infos = {}, cb = () => { }) => {
+ 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) {
@@ -304,7 +312,27 @@
).padStart(2, '0')} 00:00:00`
}
-function submitForm(status) {
+async function returnHeight () {
+ let checkedList = drone_sns.value.filter(item => formParams.value.device_sns.includes(item.device_sn))
+ const maxItem = checkedList.reduce((max, item) => {
+ return item.drone_height > max.drone_height ? item : max
+ })
+ // 返航绝对高度
+ let backHeight = formParams.value.rth_altitude // + maxItem.drone_height
+ console.log(backHeight, 'backHeight')
+ // 安全起飞高度
+ let positions = positionsArr.value
+ 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
+ await getWaylineMaxTerrainHeight(positions).then(res => {
+ resultHeight = safeHeight.value > (res.data.data + 30) ? safeHeight.value : (res.data.data + 30)
+ })
+ let valueHeight = _.round(backHeight - resultHeight, 2)
+ return _.round(backHeight - resultHeight, 2)
+}
+
+function submitForm (status) {
orderFormRef.value?.validate(async (valid, fields) => {
if (valid) {
console.log('表单验证通过')
@@ -317,8 +345,33 @@
const now = new Date()
if (selectedDate === dayjs().format('YYYY-MM-DD') && selectedTime < now) {
- return ElMessage({message: '任务时间不能小于当前时间', type: 'warning'})
+ return ElMessage({ message: '任务时间不能小于当前时间', type: 'warning' })
}
+ }
+ let checkedList = drone_sns.value.filter(item => formParams.value.device_sns.includes(item.device_sn))
+ const maxItem = checkedList.reduce((max, item) => {
+ return item.drone_height > max.drone_height ? item : max
+ })
+ // 返航绝对高度
+ let backHeight = formParams.value.rth_altitude // + maxItem.drone_height
+ console.log(backHeight, 'backHeight')
+ // 安全起飞高度
+ let positions = positionsArr.value
+ 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 = (safeHeight.value + maxItem.drone_height) > (res.data.data + 30) ? (safeHeight.value + maxItem.drone_height) : (res.data.data + 30)
+ console.log(resultHeight, maxItem.drone_height, '999')
+ valueHeight = (resultHeight - maxItem.drone_height) > backHeight ? _.round(resultHeight - maxItem.drone_height) : 0
+ })
+ if (valueHeight > 0) {
+ await ElMessageBox.confirm(`当前返航高度存在安全隐患，建议调整为${valueHeight}米以上后进行发布`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
}
const submitData = {
...formParams.value,
@@ -327,9 +380,9 @@
}
await saveUpdateOrderLog(submitData)
if (txtTitle === '新建工单') {
- ElMessage({message: '工单创建成功', type: 'success'})
+ ElMessage({ message: '工单创建成功', type: 'success' })
} else {
- ElMessage({message: '工单发布成功', type: 'success'})
+ ElMessage({ message: '工单发布成功', type: 'success' })
}
cancel()
} else {
@@ -338,7 +391,7 @@
})
}
// 审核通过
-function orderPass(id) {
+function orderPass (id) {
orderLogPass(id).then(res => {
ElMessage.success('审核通过')
cancel()
@@ -370,30 +423,39 @@
}
}
+const initMapPosition = async () => {
+ await nextTick()
+
+ if (mapContainerRef.value?.initAddEntity) {
+ mapContainerRef.value.initAddEntity('initPosition')
+ }
+}
+
// 监听txtTitle
watch(isShowAddEditDetails, async (newVal, oldVal) => {
console.log('txtTitle 发生变化:', newVal, oldVal)
- formParams.value = {}
+ formParams.value = { rth_altitude: 120 }
if (txtTitle.value === '工单审核' || txtTitle.value === '工单详情' || txtTitle.value === '工单编辑') {
const response = await orderLogDetails(rowObj.value.id)
const data = response.data.data
formParams.value = {
...data
}
- console.log(formParams.value, '898789')
drone_sns.value = data.device_list
initMapLine(data.device_map_infos)
+ } else {
+ initMapPosition()
}
}, {
immediate: true // 立即执行一次
})
-function handleBeforeClose() {
+function handleBeforeClose () {
cancel()
}
-function cancel() {
+function cancel () {
formParams.value = {}
isShowAddEditDetails.value = false
- emit('refresh');
+ emit('refresh')
}
// onMounted(async () => {
@@ -416,6 +478,7 @@
.week_pc_one {
flex: 1;
+
.week-r {
margin-right: 4px;
}
@@ -424,6 +487,7 @@
width: 100% !important;
}
}
+
.process {
.order_title {
height: 30px;
@@ -433,6 +497,7 @@
font-weight: bold;
color: #333;
}
+
.custom-steps-container {
width: 100%;
margin: 7px 0;
@@ -476,7 +541,7 @@
.step-description {
font-size: 14px;
color: #666;
- line-height: 1.5;
+ line-height: 2.2;
}
}
}
--
Gitblit v1.9.3