From 715427b3c850514826dc7a8d69fec757865a41f3 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 04 Sep 2025 18:08:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/v5.0/5.0.5' into feature/v5.0/5.0.5
---
src/views/device/addDevice.vue | 13 ++++++++-----
src/views/device/airport.vue | 6 ++++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 4bf099e..292fe4e 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -70,7 +70,8 @@
lazy: true,
tree: true,
- // dialogWidth: 1050,
+ dialogWidth: 1050,
+ searchGutter: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -94,7 +95,7 @@
prop: 'workspace_name',
// editDisabled: true,
editDisplay: false,
- searchLabelWidth: 130,
+ // searchLabelWidth: 130,
search: true,
// searchSpan: 4,
labelWidth: 130,
@@ -213,20 +214,22 @@
width: 200,
},
{
- label: '设备位置',// '行政区划',
+ label: '设备位置',
prop: 'area_code',
type: 'cascader',
labelWidth: 130,
searchSpan: 4,
hide: true,
search: true,
+ // overHidden: true,
editDisplay: true,
- viewDisplay: false,
+ viewDisplay: true,
+ checkStrictly: true,
+
props: {
label: 'title',
value: 'value',
emitPath: false,
- checkStrictly: true,
multiple: false,
expandTrigger: 'hover',
},
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index bd3b139..3f3ca55 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -57,7 +57,7 @@
</template>
<template #menu="scope">
<el-dropdown>
- <el-button type="primary" text icon="el-icon-more" v-if="permission.oss_set">更 多</el-button>
+ <el-button type="primary" text icon="el-icon-folder-opened" v-if="permission.oss_set">更 多</el-button>
<template #dropdown v-if="scope.row.domain == 3">
<el-dropdown-menu teleported>
<el-dropdown-item command="a">
@@ -281,6 +281,7 @@
tree: true,
dialogWidth: 1050,
+ searchGutter: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -399,11 +400,12 @@
// overHidden: true,
editDisplay: true,
viewDisplay: true,
+ checkStrictly: true,
+
props: {
label: 'title',
value: 'value',
emitPath: false,
- checkStrictly: true,
multiple: false,
expandTrigger: 'hover',
},
--
Gitblit v1.9.3