From 7f80e7e1f58f32fb5e3c91f51c1c1363341c059b Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 05 Sep 2025 17:05:55 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into test
---
src/views/device/airport.vue | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index 39312d4..f3178d6 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -285,7 +285,6 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- searchGutter: 30,
border: true,
index: true,
indexLabel: '序号',
@@ -311,7 +310,7 @@
search: false,
slot: true,
searchSpan: 4,
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
// formatter: (row) => row.domain == 3 ? '机巢' : '无人机'
// rules: [
@@ -328,7 +327,7 @@
// editDisabled: true,
editDisplay: false, //编辑显示
viewDisplay: true, //查看显示
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
hide: true
},
@@ -340,7 +339,7 @@
viewDisplay: true, //查看显示
search: false,
searchSpan: 4,
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
// rules: [
// {
@@ -353,7 +352,7 @@
{
label: '设备SN',
prop: 'device_sn',
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
overHidden: true,
searchSpan: 4,
@@ -370,7 +369,7 @@
// {
// label: '机巢编号',
// prop: 'machine_nest_sn',
- // labelWidth: 130,
+ // labelWidth: 145,
// editDisabled: true,
// rules: [
// {
@@ -387,14 +386,14 @@
overHidden: true,
editDisplay: false, //编辑显示
viewDisplay: false, //查看显示
- labelWidth: 130,
+ labelWidth: 145,
width: 200,
},
{
label: '设备位置',
prop: 'area_code',
type: 'cascader',
- labelWidth: 100,
+ labelWidth: 145,
searchSpan: 4,
hide: true,
search: true,
@@ -455,7 +454,7 @@
{
label: '设备名称',
prop: 'nickname',
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
searchSpan: 4,
search: true,
@@ -473,7 +472,7 @@
// {
// label: '设备位置',
// prop: 'address',
- // labelWidth: 130,
+ // labelWidth: 145,
// width: 100,
// overHidden: true,
// rules: [
@@ -488,7 +487,7 @@
{
label: '负载设备',
prop: 'payload_str',
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
overHidden: true,
editDisplay: false, //编辑显示
@@ -505,7 +504,7 @@
// hide: true,
label: '保险有效期',
prop: 'duration_of_insurance',
- labelWidth: 130,
+ labelWidth: 145,
width: 200,
type: 'daterange',
format: 'YYYY-MM-DD',
@@ -523,7 +522,7 @@
// {
// label: '保险有效期',
// prop: 'insureExpiredTime',
- // labelWidth: 130,
+ // labelWidth: 145,
// width: 110,
// rules: [
// {
@@ -536,7 +535,7 @@
{
label: '流量剩余',
prop: 'traffic_remaining',
- labelWidth: 130,
+ labelWidth: 145,
width: 100,
// editDisabled: true,
editDisplay: false, //编辑显示
@@ -551,7 +550,7 @@
{
label: '流量到期时间',
prop: 'traffic_expire_time',
- labelWidth: 130,
+ labelWidth: 145,
width: 120,
type: 'date',
format: 'YYYY-MM-DD',
@@ -568,7 +567,7 @@
{
label: '固件版本',
prop: 'firmware_version',
- labelWidth: 130,
+ labelWidth: 145,
width: 110,
editDisplay: false, //编辑显示
// editDisabled: true,
@@ -583,7 +582,7 @@
{
label: '固件升级',
prop: 'firmware_status',
- labelWidth: 130,
+ labelWidth: 145,
width: 100,
hide: true,
viewDisabled: true,
@@ -607,7 +606,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
width: 180,
rules: [
{
@@ -625,7 +624,7 @@
defaultExpandAll: true,
search: true,
searchSpan: 4,
- labelWidth: 130,
+ labelWidth: 145,
dicUrl: '/blade-system/dept/getTree',
props: {
label: 'name',
@@ -645,7 +644,7 @@
// addDisplay: false,
// editDisplay: false,
// type: 'date',
- // labelWidth: 130,
+ // labelWidth: 145,
// width: 160,
// format: 'YYYY-MM-DD HH:mm:ss',
// // valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -670,7 +669,7 @@
// editDisabled: true,
viewDisplay: false, //查看显示
addDisplay: true,
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
overHidden: true,
format: 'YYYY-MM-DD HH:mm:ss',
@@ -690,7 +689,7 @@
prop: 'login_time',
type: 'date',
viewDisplay: true, //查看显示
- labelWidth: 130,
+ labelWidth: 145,
overHidden: true,
format: 'YYYY-MM-DD HH:mm:ss',
},
@@ -704,7 +703,7 @@
viewDisplay: false, //查看显示
addDisplay: true,
overHidden: true,
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
format: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -724,7 +723,7 @@
hide: true,
viewDisplay: true, //查看显示
overHidden: true,
- labelWidth: 130,
+ labelWidth: 145,
width: 160,
format: 'YYYY-MM-DD HH:mm:ss',
},
@@ -735,7 +734,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
},
{
label: '设备状态',
@@ -765,7 +764,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: true,
- labelWidth: 130,
+ labelWidth: 145,
width: 110,
},
{
@@ -774,7 +773,7 @@
addDisplay: false,
editDisplay: false,
viewDisplay: false,
- labelWidth: 130,
+ labelWidth: 145,
searchSpan: 4,
search: true,
type: 'select',
@@ -1280,6 +1279,7 @@
insure_start_time: row.duration_of_insurance[0],
insure_expired_time: row.duration_of_insurance[1],
deptId: row.dept_id,
+ areaCode: row.area_code.split(',').pop(),
}
if (submitData.traffic_expire_time === '') {
delete submitData.traffic_expire_time
--
Gitblit v1.9.3