Merge remote-tracking branch 'origin/feature/v6.0/6.0.3' into feature/v6.0/...

张含笑

2025-09-20 ee8589ea223a7ff864df467c4dbcafe9aa45909e

 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>

@@ -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
                            }
                        ],
@@ -277,36 +276,6 @@
                        },
                    },
                    {
                        label: '设备描述', // '工作空间描述',
                        prop: 'workspace_desc',
                        labelWidth: 130,
                        searchSpan: 4,
                        rules: [
                            {
                                required: true,
                                message: '请输入设备描述',
                                trigger: 'blur',
                            },
                            {
                                max: 30,
                                message: '设备描述不能超过30个字',
                                trigger: 'blur',
                            },
                            // 如果需要更严格的校验（如中文字符计算），可以使用 validator
                            {
                                validator: (rule, value, callback) => {
                                    if (value && value.length > 30) {
                                        callback(new Error('设备描述不能超过30个字'));
                                    } else {
                                        callback();
                                    }
                                },
                                trigger: 'blur',
                            },
                        ],
                    },
                    
                    {
                        label: '创建时间',
                        prop: 'create_time',
                        addDisplay: false,
@@ -318,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',
                            },
                        ],
                    },
                    
                    
                    

                ],