From 6c220d64befec39fb2b982558eb837ab6da8087d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 18 Sep 2025 10:06:45 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into feature/v6.0/6.0.2
---
src/views/device/addDevice.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 8b12544..45ebc85 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -181,17 +181,16 @@
label: '设备类型',
editDisplay: false,
prop: 'type',
- type: 'radio',
labelWidth: 130,
value: 0,
type: 'select',
dicData: [
{
- label: '机场',
+ label: '机巢',
value: 0
},
{
- label: '遥控器',
+ label: '控制器',
value: 1
}
],
@@ -279,24 +278,31 @@
{
label: '设备描述', // '工作空间描述',
prop: 'workspace_desc',
+ type: 'textarea',
labelWidth: 130,
searchSpan: 4,
+ overHidden: true,
+ minRows: 3,
+ maxRows: 5,
+ maxlength: 250,
+ span: 24,
+ showWordLimit: true,
rules: [
{
required: true,
- message: '请输入设备描述',
+ message: '请输入设备描述不能超过250个字',
trigger: 'blur',
},
{
- max: 30,
- message: '设备描述不能超过30个字',
+ max: 250,
+ message: '设备描述不能超过250个字',
trigger: 'blur',
},
// 如果需要更严格的校验（如中文字符计算），可以使用 validator
{
validator: (rule, value, callback) => {
- if (value && value.length > 30) {
- callback(new Error('设备描述不能超过30个字'));
+ if (value && value.length > 250) {
+ callback(new Error('设备描述不能超过250个字'));
} else {
callback();
}
--
Gitblit v1.9.3