From 656fcfd2d3d35aff12cbbec41f48cec99fdef1cb Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 18:50:01 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/device/addDevice.vue | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index ccff2f8..3c32c25 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -11,7 +11,7 @@
@click.stop="copyInfo(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">复制
</el-button>
</template>
- </avue-crud>
+ </avue-crud>F
</basic-container>
</template>
@@ -75,6 +75,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
+ searchGutter: 30,
border: true,
index: true,
indexLabel: '序号',
@@ -95,7 +96,7 @@
prop: 'workspace_name',
// editDisabled: true,
editDisplay: false,
- searchLabelWidth: 130,
+ labelWidth: 130,
search: true,
// searchSpan: 4,
labelWidth: 130,
@@ -180,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
}
],
@@ -214,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',
},
@@ -274,22 +276,6 @@
},
},
{
- label: '设备描述',// '工作空间描述',
- prop: 'workspace_desc',
- labelWidth: 130,
- // search: true,
- searchSpan: 4,
- // editDisabled: true,
- rules: [
- {
- required: true,
- message: '请输入设备描述',
- trigger: 'blur',
- },
- ],
- },
-
- {
label: '创建时间',
prop: 'create_time',
addDisplay: false,
@@ -301,6 +287,44 @@
format: 'YYYY-MM-DD HH:mm:ss',
},
+ {
+ 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: '请输入设备描述不能超过250个字',
+ trigger: 'blur',
+ },
+ {
+ max: 250,
+ message: '设备描述不能超过250个字',
+ trigger: 'blur',
+ },
+ // 如果需要更严格的校验（如中文字符计算），可以使用 validator
+ {
+ validator: (rule, value, callback) => {
+ if (value && value.length > 250) {
+ callback(new Error('设备描述不能超过250个字'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ],
+ },
+
+
],
--
Gitblit v1.9.3