Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management

张含笑

2025-09-01 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b

 src/views/device/addDevice.vue

@@ -81,7 +81,7 @@
                calcHeight: 20,
                column: [
                    {
                        label: '工作空间名称',
                        label: '设备名称',// '工作空间名称',
                        prop: 'workspace_name',
                        editDisabled: true,
                        searchLabelWidth: 130,
@@ -91,40 +91,24 @@
                        rules: [
                            {
                                required: true,
                                message: '请输入工作空间名称',
                                message: '请输入设备名称',
                                trigger: 'blur',
                            },
                        ],
                    },
                    {
                        label: '工作空间描述',
                        prop: 'workspace_desc',
                        labelWidth: 130,
                        // search: true,
                        searchSpan: 4,
                        // editDisabled: true,
                        rules: [
                            {
                                required: true,
                                message: '请输入工作空间描述',
                                trigger: 'blur',
                            },
                        ],
                    },
                    {
                        label: '平台名称',
                        label: '系统名称',// '平台名称',
                        prop: 'platform_name',
                        labelWidth: 130,
                        editDisabled: true,
                        rules: [
                            {
                                required: false,
                                message: '请输入平台名称',
                                message: '请输入系统名称',
                                trigger: 'blur',
                            },
                        ],
                    },

                    {
                        label: '所属单位',
                        prop: 'dept_id',
@@ -182,10 +166,27 @@
                        ],
                    },
                    {
                        label: '设备描述',// '工作空间描述',
                        prop: 'workspace_desc',
                        labelWidth: 130,
                        // search: true,
                        searchSpan: 4,
                        // editDisabled: true,
                        rules: [
                            {
                                required: true,
                                message: '请输入设备描述',
                                trigger: 'blur',
                            },
                        ],
                    },
                    
                    {
                        label: '创建时间',
                        prop: 'create_time',
                        addDisplay: false,
                        editDisplay: false,
                        overHidden: true,
                        type: 'date',
                        labelWidth: 130,
                        width: 160,
@@ -193,7 +194,7 @@

                    },
                    {
                        label: '行政区划',
                        label: '设备位置',// '行政区划',
                        prop: 'area_code',
                        type: 'cascader',
                        labelWidth: 130,
@@ -212,7 +213,7 @@
                        rules: [
                        {
                            required: true,
                            message: '请选择行政区划',
                            message: '请选择设备位置',
                            trigger: 'change',
                        },
                        ],