From d46953fb97893833d027ee1aabf783d20e3207a1 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 27 Sep 2025 18:03:55 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.3' into prod
---
src/views/device/airport.vue | 97 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 75 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index ab0cb3a..b413ce9 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -306,7 +306,9 @@
searchGutter: 30,
tip: false,
searchShow: true,
- searchMenuSpan: 6,
+ // searchMenuSpan: 16,
+ searchMenuPosition: 'right',
+ searchMenuSpan: 8,
border: true,
index: true,
indexLabel: '序号',
@@ -363,13 +365,6 @@
searchSpan: 4,
labelWidth: 145,
width: 120,
- // rules: [
- // {
- // required: true,
- // message: '请输入设备型号',
- // trigger: 'blur',
- // },
- // ],
},
{
label: '设备SN',
@@ -380,27 +375,8 @@
searchSpan: 4,
// editDisabled: true,
editDisplay: false, //编辑显示
- // rules: [
- // {
- // required: true,
- // message: '请输入设备SN',
- // trigger: 'blur',
- // },
- // ],
},
- // {
- // label: '机巢编号',
- // prop: 'machine_nest_sn',
- // labelWidth: 145,
- // editDisabled: true,
- // rules: [
- // {
- // required: false,
- // message: '请输入机巢编号',
- // trigger: 'blur',
- // },
- // ],
- // },
+
{
label: '设备位置',// '行政区划',
prop: 'area_name',
@@ -490,21 +466,23 @@
},
],
},
-
- // {
- // label: '设备位置',
- // prop: 'address',
- // labelWidth: 145,
- // width: 100,
- // overHidden: 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: '负载设备',
@@ -513,14 +491,7 @@
width: 160,
overHidden: true,
editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入负载设备',
- // trigger: 'blur',
- // },
- // ],
+
},
{
// hide: true,
@@ -581,14 +552,6 @@
type: 'date',
format: 'YYYY-MM-DD',
editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入流量到期时间',
- // trigger: 'blur',
- // },
- // ],
},
{
label: '固件版本',
@@ -596,14 +559,6 @@
labelWidth: 145,
width: 110,
editDisplay: false, //编辑显示
- // editDisabled: true,
- // rules: [
- // {
- // required: true,
- // message: '请输入固件版本',
- // trigger: 'blur',
- // },
- // ],
},
{
label: '固件升级',
@@ -614,16 +569,8 @@
viewDisabled: true,
addDisabled: true,
editDisplay: false, //编辑显示
- // editDisabled: true,
addDisplay: false,
viewDisplay: false,
- // rules: [
- // {
- // required: true,
- // message: '请输入固件升级',
- // trigger: 'blur',
- // },
- // ],
},
{
label: '所属单位',
--
Gitblit v1.9.3