From 7a52bbb0f30e2951ebf7eeb20fe3ae83d50b5acc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 03 Sep 2025 11:03:20 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into test
---
src/views/device/airport.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index ea0075e..50f948a 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -301,14 +301,15 @@
{
label: '设备类型',
prop: 'domain',
- editDisabled: true,
+ editDisabled: false,
editDisplay: false, //编辑显示
- viewDisplay: true, //查看显示
+ viewDisplay: false, //查看显示
search: false,
slot: true,
searchSpan: 4,
labelWidth: 130,
width: 120,
+ // formatter: (row) => row.domain == 3 ? '机巢' : '无人机'
// rules: [
// {
// required: true,
@@ -316,6 +317,16 @@
// trigger: 'blur',
// },
// ],
+ },
+ {
+ label: '设备类型',
+ prop: 'domainTxt',
+ editDisabled: true,
+ editDisplay: false, //编辑显示
+ viewDisplay: true, //查看显示
+ labelWidth: 130,
+ width: 120,
+ hide: true
},
{
label: '设备型号',
@@ -367,7 +378,7 @@
label: '设备名称',
prop: 'nickname',
labelWidth: 130,
- width: 100,
+ width: 160,
searchSpan: 4,
search: true,
overHidden: true,
@@ -388,7 +399,7 @@
editDisplay: false, //编辑显示
viewDisplay: false, //查看显示
labelWidth: 130,
- width: 100,
+ width: 200,
},
{
label: '设备位置',
@@ -470,7 +481,7 @@
label: '负载设备',
prop: 'payload_str',
labelWidth: 130,
- width: 100,
+ width: 160,
overHidden: true,
editDisabled: true,
// rules: [
@@ -617,10 +628,11 @@
{
- hide: true,
+ // hide: true,
label: '保险有效期',
prop: 'duration_of_insurance',
labelWidth: 130,
+ width: 160,
type: 'daterange',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -1333,7 +1345,8 @@
area_code: await this.getFullAreaCode(data.area_code),
area_name: this.form.area_name,
cnmode_code: this.getDockModeText(this.form.mode_code),
- domain: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
+ // domain: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
+ domainTxt: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
cnstatus: this.form.status === false ? '离线' : '在线',
duration_of_insurance: [data?.insure_start_time || '', data?.insure_expired_time || ''],
}
@@ -1376,6 +1389,7 @@
if (e.firmware_status == 4) {
this.connectWebSocket(e)
}
+ e.duration_of_insurance = [e.insure_start_time, e.insure_expired_time]
})
this.data = data.records
this.loading = false
--
Gitblit v1.9.3