From 5dc1eb8074f52b2fdc03216b62ae4e2d82acbe0f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 03 Nov 2025 08:45:21 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v7.0/7.0.4' into 图层管理
---
src/views/tickets/orderLog.vue | 5
src/views/device/airport.vue | 290 ++++++++++++++++++++++++++++++----------------------------
2 files changed, 153 insertions(+), 142 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index adfc18d..3ba55ec 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -232,8 +232,8 @@
import FirmwareManage from './components/firmwareManage.vue'
import DevicePerShare from './components/devicePerShare.vue'
import DockControlPanel from './components/DockControlPanel.vue'
-import { getWebsocketUrl } from '@/utils/websocket/config';
-import ConnectWebSocket from '@/utils/websocket';
+import { getWebsocketUrl } from '@/utils/websocket/config'
+import ConnectWebSocket from '@/utils/websocket'
import warnSvg from '@/assets/images/warn.svg'
export default {
@@ -381,6 +381,148 @@
labelWidth: 145,
width: 120,
},
+
+ {
+ label: '设备名称',
+ prop: 'nickname',
+ labelWidth: 145,
+ width: 160,
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ editDisplay: true, //编辑显示
+ rules: [
+ {
+ required: true,
+ message: '请输入设备名称',
+ trigger: 'blur',
+ },
+ ],
+ },
+
+ {
+ label: '4G增强',
+ prop: 'link_workmode',
+ labelWidth: 145,
+ width: 160,
+ overHidden: true,
+ editDisplay: false, //编辑显示
+ viewDisplay: false,
+ align: 'center',
+ formatter: (row, column, cellValue) => {
+ const statusMap = {
+ 0: '关',
+ 1: '开',
+ }
+ return statusMap[cellValue] || '/'
+ }
+ },
+
+ {
+ label: '负载设备',
+ prop: 'payload_str',
+ labelWidth: 145,
+ width: 160,
+ overHidden: true,
+ editDisplay: false, //编辑显示
+
+ },
+
+ {
+ label: '流量剩余(GB)',
+ prop: 'traffic_remaining',
+ labelWidth: 145,
+ width: 120,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入流量剩余',
+ // trigger: 'blur',
+ // },
+ // ],
+ },
+
+ {
+ label: '流量到期时间',
+ prop: 'traffic_expire_time',
+ labelWidth: 145,
+ width: 120,
+ type: 'date',
+ format: 'YYYY-MM-DD',
+ editDisplay: false, //编辑显示
+ },
+
+ {
+ label: '设备状态',
+ prop: 'cnstatus',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ labelWidth: 145,
+ },
+ {
+ label: '设备状态',
+ prop: 'status',
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ labelWidth: 100,
+ hide: true,
+ // searchSpan: 4,
+ // search: true,
+ slot: true,
+ width: 100,
+
+ rules: [
+ {
+ required: true,
+ message: '请输入在线状态',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '设备状态',
+ prop: 'cnmode_code',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: true,
+ 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: '设备SN',
prop: 'device_sn',
@@ -430,50 +572,7 @@
},
],
},
- {
- label: '设备名称',
- prop: 'nickname',
- labelWidth: 145,
- width: 160,
- searchSpan: 4,
- search: true,
- overHidden: true,
- editDisplay: true, //编辑显示
- rules: [
- {
- required: true,
- message: '请输入设备名称',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '4G增强',
- prop: 'link_workmode',
- labelWidth: 145,
- width: 160,
- overHidden: true,
- editDisplay: false, //编辑显示
- viewDisplay: false,
- align: 'center',
- formatter: (row, column, cellValue) => {
- const statusMap = {
- 0: '关',
- 1: '开',
- }
- return statusMap[cellValue] || '/'
- }
- },
- {
- label: '负载设备',
- prop: 'payload_str',
- labelWidth: 145,
- width: 160,
- overHidden: true,
- editDisplay: false, //编辑显示
-
- },
{
// hide: true,
label: '保险有效期',
@@ -510,30 +609,8 @@
// },
// ],
// },
- {
- label: '流量剩余(GB)',
- prop: 'traffic_remaining',
- labelWidth: 145,
- width: 120,
- // editDisabled: true,
- editDisplay: false, //编辑显示
- // rules: [
- // {
- // required: true,
- // message: '请输入流量剩余',
- // trigger: 'blur',
- // },
- // ],
- },
- {
- label: '流量到期时间',
- prop: 'traffic_expire_time',
- labelWidth: 145,
- width: 120,
- type: 'date',
- format: 'YYYY-MM-DD',
- editDisplay: false, //编辑显示
- },
+
+
{
label: '固件版本',
prop: 'firmware_version',
@@ -681,74 +758,6 @@
labelWidth: 145,
width: 160,
format: 'YYYY-MM-DD HH:mm:ss',
- },
- {
- label: '设备状态',
- prop: 'cnstatus',
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- labelWidth: 145,
- },
- {
- label: '设备状态',
- prop: 'status',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- labelWidth: 100,
- hide: true,
- // searchSpan: 4,
- // search: true,
- slot: true,
- width: 100,
-
- rules: [
- {
- required: true,
- message: '请输入在线状态',
- trigger: 'blur',
- },
- ],
- },
- {
- label: '设备状态',
- prop: 'cnmode_code',
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: true,
- 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',
- },
- ],
},
],
},
@@ -1575,9 +1584,8 @@
right: 30px;
}
-.force-center-dialog .el-dialog {
+.force-center-dialog .el-dialog {}
-}
.zx-cancel {
.txt-contain {
display: flex;
@@ -1586,10 +1594,12 @@
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
+
img {
width: 20px;
height: 20px;
}
+
.name {
color: #0E8BFF;
margin-left: 6px;
@@ -1597,6 +1607,7 @@
}
}
+
.delete-txt {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
@@ -1607,5 +1618,4 @@
margin-bottom: 20px;
}
}
-
</style>
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 312767f..18bc903 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -1327,7 +1327,8 @@
return this.$message.warning('任务时间不能小于当前时间');
}
}
- const maxItem = this.form.device_map_infos.reduce((max, item) => {
+ 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;
});
console.log(maxItem.drone_height, '高度');
@@ -1526,7 +1527,7 @@
};
// 更新机巢列表
- this.device_sns = 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 ||
--
Gitblit v1.9.3