From ac04d6c2bdd933609818872e6e840ec5184e9634 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:28:55 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.1' into test
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 4
src/views/tickets/component/AddEditDetails.vue | 37 +++---
src/views/tickets/orderLogCopy.vue | 114 +++++++++---------
src/views/job/components/JobRelatedEvents.vue | 12 +-
src/views/layerManagement/components/leftList.vue | 34 ++--
src/views/device/airport.vue | 108 +++++++++++------
src/views/job/components/DeviceJobDetails.vue | 48 ++++----
7 files changed, 192 insertions(+), 165 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index e336b6c..7bead20 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -299,6 +299,7 @@
rollFirmVersion: '',
firmList: [],
rollFirmwareBox: false,
+ isUpdateDrone: {},
// 用于记录已经创建的websocket，防止重复创建
webSocketIdSet: new Set(),
// 用于保存多组websocket
@@ -410,6 +411,46 @@
],
},
{
+ label: '设备状态',
+ prop: 'mode_code',
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ labelWidth: 145,
+ searchSpan: 4,
+ search: true,
+ type: 'select',
+ dicData: [
+ { label: '在线', value: 0 },
+ { label: '离线', value: -1 },
+ { label: '远程调试', value: 2 },
+ { label: '现场调试', value: 1 },
+ { label: '固件升级中', value: 3 }
+ ],
+ slot: true,
+ width: 110,
+
+ rules: [
+ {
+ required: true,
+ message: '请输入机场状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '固件升级',
+ prop: 'firmware_status',
+ labelWidth: 145,
+ width: 100,
+ // hide: true,
+ viewDisabled: true,
+ addDisabled: true,
+ editDisplay: false, //编辑显示
+ addDisplay: false,
+ viewDisplay: false,
+ },
+ {
label: '4G增强',
prop: 'link_workmode',
labelWidth: 145,
@@ -503,46 +544,7 @@
labelWidth: 145,
width: 110,
},
- {
- label: '设备状态',
- prop: 'mode_code',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- labelWidth: 145,
- searchSpan: 4,
- search: true,
- type: 'select',
- dicData: [
- { label: '在线', value: 0 },
- { label: '离线', value: -1 },
- { label: '远程调试', value: 2 },
- { label: '现场调试', value: 1 },
- { label: '固件升级中', value: 3 }
- ],
- slot: true,
- width: 110,
-
- rules: [
- {
- required: true,
- message: '请输入机场状态',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '固件升级',
- prop: 'firmware_status',
- labelWidth: 145,
- width: 100,
- // hide: true,
- viewDisabled: true,
- addDisabled: true,
- editDisplay: false, //编辑显示
- addDisplay: false,
- viewDisplay: false,
- },
+
{
label: '设备SN',
prop: 'device_sn',
@@ -876,6 +878,9 @@
return
}
console.log(loadData.data.output.progress.percent, '6666')
+ // if(loadData.data.output.progress.percent < 10) {
+ // this.onLoad(this.page)
+ // }
this.data.forEach((e, index) => {
if ((e.device_sn == loadData.data.sn || e.child_sn == loadData.data.sn) && loadData.data.output.status == 'in_progress') {
e.firmware_progress = loadData.data.output.progress.percent
@@ -1008,6 +1013,7 @@
},
// 版本回退点击事件
rollFirmware(row) {
+ console.log(this.data,row, '打印看看值')
if (row.status == 0) {
this.$message({
type: 'warning',
@@ -1027,6 +1033,7 @@
}
var that = this
this.rollFirmwareBox = true
+ this.isUpdateDrone = row
const param = {
device_name: row.device_name,
}
@@ -1132,6 +1139,7 @@
// 需要改变的版本号和无人机版本号如果是一致，进行单独的机场升级/回滚操作
}
}
+
ota(that.firmwareInfo.workspaceId, arr).then(res => {
that.firmwareVersion = ''
that.firmwareInfo = {}
@@ -1140,7 +1148,24 @@
type: 'success',
message: '操作成功!',
})
- this.onLoad(this.page)
+ // 此处需分是无人机升级还是机巢升级版本
+ console.log('看看是无人机更新还是机场更新',that.isUpdateDrone)
+ if(that.isUpdateDrone.domain == 3) {
+ this.onLoad(this.page)
+ } else {
+ console.log(111)
+ this.data.map(item => {
+ if(item.workspace_id === that.isUpdateDrone.workspace_id) {
+ item.firmware_status = 2
+ item.mode_code = 3
+ item.children[0].mode_code = 0
+ item.children[0].firmware_status = 4
+ this.connectWebSocket(item)
+ console.log('无人机更新中',item)
+ }
+ })
+ }
+ // 获取保存的 resolve 函数===== 此处需要更新子集塞入父级
// done()
})
},
@@ -1461,6 +1486,7 @@
...item,
firmware_progress: 0
}));
+ console.log('2222',this.data)
this.loading = false
this.selectionClear()
})
diff --git a/src/views/job/components/DeviceJobDetails.vue b/src/views/job/components/DeviceJobDetails.vue
index 41fc0a3..7bcd21b 100644
--- a/src/views/job/components/DeviceJobDetails.vue
+++ b/src/views/job/components/DeviceJobDetails.vue
@@ -236,9 +236,9 @@
// 任务成果
const total = ref(0)
const achievementList = ref([])
-const props = defineProps(['wayLineJodInfoId', 'waylineJobId', 'batchNo','jobId'])
-const wayLineJodInfoId = computed(() => props.wayLineJodInfoId)
-provide('wayLineJodInfoId', wayLineJodInfoId)
+const props = defineProps(['wayLineJobInfoId', 'waylineJobId', 'batchNo','jobId'])
+const wayLineJobInfoId = computed(() => props.wayLineJobInfoId)
+provide('wayLineJobInfoId', wayLineJobInfoId)
// 可见数量
const visibleCount = computed(() =>
showAll.value ? achievementList.value.length : Math.min(5, achievementList.value.length)
@@ -275,27 +275,27 @@
const flightEvents = ref([])
const jobTimes = ref([])
const getDetails = () => {
- const params = {
- wayLineJobInfoId: props.wayLineJodInfoId,
- waylineJobId: props.waylineJobId,
- batchNo: props.batchNo
- }
- getJobDetails(params).then(res => {
- detailsData.value = res.data.data
- jobTimes.value = res.data.data.job_times
- infoList.value.forEach(item => {
- if (item.name === '任务频次') {
- const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
- item.value = rep_rule_type + ' -- ' + rep_rule_val
- } else {
- item.value = detailsData.value?.[item.field] || '--'
- }
- if (item.name === '飞行事件') {
- const { action_modes = [] } = detailsData?.value || {}
- flightEvents.value = action_modes.flatMap(({ actionActuatorFunc }) =>
- droneEventList.filter(({ value }) => actionActuatorFunc === value)
- )
- }
+ const params = {
+ wayLineJobInfoId: props.wayLineJobInfoId,
+ waylineJobId: props.waylineJobId,
+ batchNo: props.batchNo
+ }
+ getJobDetails(params).then(res => {
+ detailsData.value = res.data.data
+ jobTimes.value = res.data.data.job_times
+ infoList.value.forEach(item => {
+ if (item.name === '任务频次') {
+ const { rep_rule_type = '',final_cycle_frequency = '' } = detailsData?.value || {}
+ item.value = rep_rule_type ? final_cycle_frequency : '1次'
+ } else {
+ item.value = detailsData.value?.[item.field] || '--'
+ }
+ if (item.name === '飞行事件') {
+ const { action_modes = [] } = detailsData?.value || {}
+ flightEvents.value = action_modes.flatMap(({ actionActuatorFunc }) =>
+ droneEventList.filter(({ value }) => actionActuatorFunc === value)
+ )
+ }
if (item.name === '自定义识别区') {
item.value = res.data.data.enable_custom_area ? '是': '否'
}
diff --git a/src/views/job/components/JobRelatedEvents.vue b/src/views/job/components/JobRelatedEvents.vue
index 0a2e0d6..6f977ca 100644
--- a/src/views/job/components/JobRelatedEvents.vue
+++ b/src/views/job/components/JobRelatedEvents.vue
@@ -106,7 +106,7 @@
const loading = ref(false)
const list = ref()
const params = ref({
- way_line_jod_info_id: null,
+ way_line_job_info_id: null,
event_name: '',
ai_types: [], // 算法类型
start_date: null,
@@ -133,11 +133,11 @@
},
});
}
-const wayLineJodInfoId = inject('wayLineJodInfoId')
+const wayLineJobInfoId = inject('wayLineJobInfoId')
const getList = () => {
- if (!wayLineJodInfoId.value) return
- params.value.way_line_jod_info_id = wayLineJodInfoId.value
+ if (!wayLineJobInfoId.value) return
+ params.value.way_line_job_info_id = wayLineJobInfoId.value
params.value.batchNo = props.batchNo
loading.value = true
getDeviceEventList(params.value, sizeParams.value).then(res => {
@@ -268,7 +268,7 @@
display: flex;
justify-content: space-between;
font-size: 14px;
-
+
.btn {
width: 80px;
height: 32px;
@@ -277,7 +277,7 @@
display: flex;
justify-content: center;
align-items: center;
-
+
img {
width: 14px;
height: 14px;
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 2cd9618..e79c353 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -100,10 +100,10 @@
<!-- <CurrentTaskDetails
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
- :wayLineJodInfoId="rowData.id"
+ :wayLineJobInfoId="rowData.id"
/> -->
<!-- 历史任务详情 -->
- <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJodInfoId="rowData.id"
+ <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJobInfoId="rowData.id"
:batchNo="rowData.batch_no" :jobId="jobId"/>
<CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
@refresh="getJobList" />
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 533a188..4047f90 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -57,7 +57,7 @@
node-key="id"
default-expand-all
:expand-on-click-node="false"
- :check-on-click-node="false"
+ :check-on-click-node="false"
:filter-node-method="filterNode"
highlight-current
@check="handleCheck"
@@ -78,7 +78,7 @@
icon="el-icon-location"
@click.stop="handleLocation(node)"
:disabled="node.data.level === 2 && (!node.data.children || node.data.children.length === 0)"
- class="location-btn"
+ class="location-btn"
></el-button>
<el-button icon="el-icon-edit" link @click.stop="handleEdit(node)"></el-button>
<el-button icon="el-icon-delete" link @click.stop="handleDelete(node)"></el-button>
@@ -125,7 +125,7 @@
const gettreeDataApi = async () => {
try {
loading.value = true;
- const res = await treeDataApi();
+ const res = await treeDataApi({filterExpired:false});
treeAllData.value = res.data.data;
if(coverData.value.length===0){
checkedKeys.value = [];
@@ -197,7 +197,7 @@
checkedNodes.value = allFenceNodes;
coverData.value = allFenceNodes;
emit('update:coverData', coverData.value);
-
+
}
}
@@ -228,10 +228,10 @@
const childrenIds = folderChildren.map(child => child.id);
const newChildrenIds = childrenIds.filter(id => !currentCheckedKeys.includes(id));
const newChildrenNodes = folderChildren.filter(child => newChildrenIds.includes(child.id));
-
+
const newCheckedKeys = [...new Set([...currentCheckedKeys, ...newChildrenIds])];
const newCheckedNodes = [...currentCheckedNodes, ...newChildrenNodes];
-
+
treeRef.value.setCheckedKeys(newCheckedKeys);
checkedKeys.value = newCheckedKeys;
checkedNodes.value = newCheckedNodes;
@@ -265,10 +265,10 @@
coverData.value = [];
layerParams.value.editNest = true;
layerParams.value.decideWhetherToAddOrEdit = 2;
- if (props.activeName === '自定义识别区') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fenceType = 1; // 电子围栏类型标识
} else if (props.activeName === '自定义禁飞区') {
- layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
+ layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
}
emit('update:deitData', node.data);
}
@@ -397,10 +397,10 @@
() => props.resetCheck,
(newVal) => {
if (newVal !== undefined) {
- checkedKeys.value = [];
- checkedNodes.value = [];
- coverData.value = [];
- treeRef.value?.setCheckedKeys([]);
+ checkedKeys.value = [];
+ checkedNodes.value = [];
+ coverData.value = [];
+ treeRef.value?.setCheckedKeys([]);
}
},
{ immediate: true }
@@ -500,20 +500,20 @@
.tree-node-actions {
display: flex;
// gap: 8px;
-
+
button {
- padding: 0;
- color: #fff;
+ padding: 0;
+ color: #fff;
width: 17px;
height: 17px;
// color: #409eff;
// &:hover {
- // color: #409eff;
+ // color: #409eff;
// }
}
}
::v-deep(.location-btn.el-button.is-link.is-disabled) {
- color: #999 !important;
+ color: #999 !important;
}
}
</style>
diff --git a/src/views/tickets/component/AddEditDetails.vue b/src/views/tickets/component/AddEditDetails.vue
index e0c0330..740f228 100644
--- a/src/views/tickets/component/AddEditDetails.vue
+++ b/src/views/tickets/component/AddEditDetails.vue
@@ -47,10 +47,11 @@
</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">
@@ -92,12 +93,12 @@
<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="结束日期"
- :disabled-date="disabledDate" />
+ 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">
@@ -134,7 +135,7 @@
<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>
@@ -215,15 +216,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(['每天', '周一', '周二', '周三', '周四', '周五', '周六', '周末', '周天', '工作日'])
@@ -292,10 +293,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) {
@@ -445,7 +447,6 @@
formParams.value = {
...data
}
- console.log(formParams.value, '898789')
drone_sns.value = data.device_list
initMapLine(data.device_map_infos)
} else {
diff --git a/src/views/tickets/orderLogCopy.vue b/src/views/tickets/orderLogCopy.vue
index f3bb788..baed5a8 100644
--- a/src/views/tickets/orderLogCopy.vue
+++ b/src/views/tickets/orderLogCopy.vue
@@ -10,7 +10,7 @@
<el-col :span="4">
<el-form-item label="关键字:">
<el-input v-model="filters.key_word" placeholder="编号/名称/内容/姓名" clearable
- @keyup.enter="handleSearch" />
+ @keyup.enter="handleSearch" />
</el-form-item>
<!-- <div class="search-bar-box-item">-->
@@ -23,16 +23,16 @@
<el-col :span="8">
<el-form-item label="选择日期:">
<el-date-picker @change="handleSearch" v-model="filters.dateRange" type="daterange"
- range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
- :default-value="datePickerDefaultVal" />
+ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+ :default-value="datePickerDefaultVal" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="关联航线:">
<el-select @change="handleSearch" v-model="filters.file_id" placeholder="请选择关联航线" filterable
- clearable>
+ clearable>
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -40,7 +40,7 @@
<el-form-item label="关联算法:">
<el-select @change="handleSearch" v-model="filters.ai_types" placeholder="关联算法" clearable>
<el-option v-for="item in ai_types" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey" />
+ :value="item.dictKey" />
</el-select>
</el-form-item>
@@ -55,7 +55,7 @@
<el-col :span="4">
<el-form-item label="工单状态:">
<el-select @change="handleSearch" v-model="filters.status" placeholder="请选择工单状态" clearable
- :disabled="activeTab !== 'all'">
+ :disabled="activeTab !== 'all'">
<el-option v-for="item in statuses" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@@ -65,8 +65,8 @@
<el-col :span="8">
<el-form-item label="工单周期:">
<el-date-picker @change="handleSearch" v-model="filters.cycleDateRange" type="daterange"
- range-separator="至" start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期"
- :default-value="datePickerDefaultVal" />
+ range-separator="至" start-placeholder="工单周期开始日期" end-placeholder="工单周期结束日期"
+ :default-value="datePickerDefaultVal" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -79,7 +79,7 @@
<el-col :span="4">
<el-form-item label="执行时间:">
<el-time-picker @change="handleSearch" v-model="filters.deal_time" placeholder="请选择执行时间"
- prop="deal_time" value-format="HH:mm" :picker-options="{
+ prop="deal_time" value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</el-form-item>
@@ -95,8 +95,8 @@
<!-- 表格部分 -->
<avue-crud class="ztzf-public-general-avue-crud" :data="tableData" :option="option" v-model:page="page"
- ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
- @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
+ ref="crud" :table-loading="loading" @current-change="currentChange" @refresh-change="refreshChange"
+ @on-load="onLoad" @search-change="searchChange" @size-change="sizeChange" v-if="activeTab === tab.name">
<template #job_info_num="{ row }">
<el-tooltip-copy :content="row.job_info_num" :showCopyText="true" textAlign="left">
{{ row.job_info_num }}
@@ -111,7 +111,7 @@
<template #menu-left>
<el-button v-if="hasAddBtnPermission() && activeTab != 'WAIT_AUDIT'" type="primary" icon="el-icon-plus"
- @click="handleAdd">新建工单
+ @click="handleAdd">新建工单
</el-button>
<el-button type="success" plain icon="el-icon-download" @click="exportData">导出
</el-button>
@@ -121,7 +121,7 @@
<div class="menu-custom-box">
<template v-if="row.status == 1">
<el-button v-if="hasPaddingBtnPermission()" type="text" icon="el-icon-view"
- @click="handleCheckDetail(row)">审核
+ @click="handleCheckDetail(row)">审核
</el-button>
</template>
<!-- v-if="
@@ -131,7 +131,7 @@
<template v-if="row.status == 1">
<!--待审核状态-->
<el-button type="text" icon="el-icon-warning" v-if="hasRecallPaddingBtnPermission()"
- @click="orderLogRecall(row.id)">撤回
+ @click="orderLogRecall(row.id)">撤回
</el-button>
<!-- <el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button> -->
</template>
@@ -140,7 +140,7 @@
<el-button type="text" icon="el-icon-warning" @click="rejectDetail(row.id)">驳回原因
</el-button>
<el-button v-if="userInfo.user_id == row.create_user" type="text" icon="el-icon-view"
- @click="handleViewDetail(row)">编辑
+ @click="handleViewDetail(row)">编辑
</el-button>
<el-button v-else type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情
</el-button>
@@ -176,7 +176,7 @@
<!-- 新建工单对话框 -->
<el-dialog class="ztzf-dialog-mange" v-model="dialogVisible" title="新建工单" width="70%" :close-on-click-modal="false"
- @close="resetForm">
+ @close="resetForm">
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
@@ -188,7 +188,7 @@
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" filterable @change="getFlyingNestBy">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -203,7 +203,7 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="!device_sns.length">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
@@ -220,14 +220,14 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit></el-input>
+ show-word-limit></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<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" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -239,7 +239,7 @@
</div>
<div class="flex-1">
<el-time-picker style="width: 100px" v-model="form.deal_time" prop="deal_time" value-format="HH:mm"
- :picker-options="{
+ :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</div>
@@ -272,14 +272,14 @@
<!-- 工单详情对话框 -->
<el-dialog class="ztzf-dialog-mange" align-center v-model="detailVisible" :title="detailTitle" width="70%"
- :close-on-click-modal="false" @close="resetForm">
+ :close-on-click-modal="false" @close="resetForm">
<div class="event-title-center">{{ form.name }}</div>
<el-form :model="form" :rules="rules" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles" v-if="filters.status !== '0'">
<div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
- class="step-title">
+ class="step-title">
{{ record.status_str }}
</div>
</div>
@@ -311,16 +311,16 @@
<el-col :span="6">
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" @change="getFlyingNestBy" filterable
- :disabled="detailTitle === '工单详情'">
+ :disabled="detailTitle === '工单详情'">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
<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="500"></el-input-number>
+ :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -329,7 +329,7 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="detailTitle === '工单详情'">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
@@ -352,7 +352,7 @@
<el-col :span="6">
<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 === '工单详情'" />
+ end-placeholder="结束日期" :disabled-date="disabledDate" :disabled="detailTitle === '工单详情'" />
</el-form-item>
</el-col>
@@ -364,7 +364,7 @@
<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="{
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" :disabled="detailTitle === '工单详情'" />
</el-col>
@@ -374,7 +374,7 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="4" placeholder="请输入工单内容" maxlength="255"
- show-word-limit :disabled="detailTitle === '工单详情'"></el-input>
+ show-word-limit :disabled="detailTitle === '工单详情'"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -388,20 +388,20 @@
<template #footer>
<div class="dialog-footer">
<el-button type="danger" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)" icon="el-icon-position">发布
+ @click="submitForm(1)" icon="el-icon-position">发布
</el-button>
<el-button type="primary"
- v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)" @click="submitForm(0)"
- icon="el-icon-plus">保存
+ v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)" @click="submitForm(0)"
+ icon="el-icon-plus">保存
</el-button>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@click="submitForm(0)">保存</el-button> -->
<el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()"
- @click="orderLogPass(form.id)">通过
+ @click="orderLogPass(form.id)">通过
</el-button>
<el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)">驳回
+ @click="orderLogReject(form.id)">驳回
</el-button>
</div>
</template>
@@ -409,14 +409,14 @@
<!-- 工单详情 -->
<el-dialog class="ztzf-dialog-mange" align-center v-model="detailVisibleCopy" title="工单详情" width="70%"
- :close-on-click-modal="false" @close="resetForm">
+ :close-on-click-modal="false" @close="resetForm">
<div class="event-title-center">{{ form.name }}</div>
<el-form :model="form" ref="testform" label-width="100px">
<div class="custom-steps-container">
<!-- 标题行 -->
<div class="steps-titles" v-if="filters.status !== '0'">
<div v-for="(record, index) in form.record_list" :class="{ active: record.user_id >= 0 }" :key="index"
- class="step-title">
+ class="step-title">
{{ record.status_str }}
</div>
</div>
@@ -449,7 +449,7 @@
<el-form-item label="关联航线" prop="file_id">
<el-select v-model="form.file_id" placeholder="请选择航线" :disabled="true">
<el-option v-for="item in wayLineList" :key="item.wayline_id" :label="item.name"
- :value="item.wayline_id" />
+ :value="item.wayline_id" />
</el-select>
</el-form-item>
</el-col>
@@ -465,7 +465,7 @@
<el-form-item label="关联机巢" prop="device_sns">
<el-select v-model="form.device_sns" placeholder="请选择机巢" multiple :disabled="true">
<el-option v-for="item in device_sns" :key="item.device_sn" :label="item.nickname"
- :value="item.device_sn" />
+ :value="item.device_sn" />
</el-select>
</el-form-item>
</el-col>
@@ -488,7 +488,7 @@
<el-col :span="6">
<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" />
+ end-placeholder="结束日期" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="3">
@@ -499,7 +499,7 @@
<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="{
+ value-format="HH:mm" :picker-options="{
selectableRange: '00:00 - 23:59',
}" />
</el-col>
@@ -509,7 +509,7 @@
<el-col :span="12">
<el-form-item label="工单内容" prop="content">
<el-input type="textarea" v-model="form.content" rows="2" placeholder="请输入工单内容" maxlength="255"
- show-word-limit :readonly="true" :disabled="true"></el-input>
+ show-word-limit :readonly="true" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -524,16 +524,16 @@
<template #footer>
<div class="dialog-footer">
<el-button type="danger" v-if="form.status == 0 || (form.status == 2 && userInfo.user_id == form.create_user)"
- @click="submitForm(1)" icon="el-icon-position">发布
+ @click="submitForm(1)" icon="el-icon-position">发布
</el-button>
<!-- <el-button type="primary" v-if="form.status == 0 || userInfo.user_id == form.create_user"
@click="submitForm(0)">保存</el-button> -->
<el-button type="primary" v-if="form.status == 1 && hasPaddingBtnPermission()" @click="orderLogPass(form.id)"
- icon="el-icon-check">通过
+ icon="el-icon-check">通过
</el-button>
<el-button type="danger" v-if="form.status == 1 && hasRejectionBtnPermission()"
- @click="orderLogReject(form.id)" icon="el-icon-close">驳回
+ @click="orderLogReject(form.id)" icon="el-icon-close">驳回
</el-button>
<el-button @click="detailVisibleCopy = false" icon="el-icon-circle-close">取消</el-button>
</div>
@@ -993,17 +993,17 @@
return this.$message.warning('任务时间不能小于当前时间')
}
}
- let checkedList = this.device_sns.filter(item => this.form.device_sns.includes(item.device_sn));
+ let checkedList = this.device_sns.filter(item => this.form.device_sns.includes(item.device_sn))
const maxItem = checkedList.reduce((max, item) => {
- return item.drone_height > max.drone_height ? item : max;
- });
+ return item.drone_height > max.drone_height ? item : max
+ })
// 返航绝对高度
let backHeight = this.form.rth_altitude // + maxItem.drone_height
- console.log(backHeight,'backHeight')
+ 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})
+ 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 = this.safeHeight > (res.data.data + 30) ? this.safeHeight : (res.data.data + 30)
@@ -1200,10 +1200,10 @@
}
// 更新机巢列表
- this.device_sns = data.device_map_infos;// data.device_list;
+ this.device_sns = data.device_map_infos// data.device_list;
this.permission &&
- (this.permission.order_log_review || this.permission.order_log_recall) &&
- (data.status == 1 || data.status == 3 || (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
+ (this.permission.order_log_review || this.permission.order_log_recall) &&
+ (data.status == 1 || data.status == 3 || (data.status == 2 && this.userInfo.user_id !== this.form.create_user))
? (this.detailTitle = '工单详情')
: (this.detailTitle = '编辑工单')
@@ -1341,7 +1341,7 @@
if (this.$refs.MapContainer && this.$refs.MapContainer.initAddEntity) {
this.$refs.MapContainer.initAddEntity('polyline', {
url: `${import.meta.env.VITE_APP_AIRLINE_URL + currentLine.object_key
- }?_t=${new Date().getTime()}`,
+ }?_t=${new Date().getTime()}`,
type: currentLine.wayline_type,
cb,
infos
@@ -1362,7 +1362,7 @@
const currentLine = that.wayLineList.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
}
--
Gitblit v1.9.3