Merge branch 'feature/v5.0/5.0.5' into test

chenyao

2025-09-04 4ef5d6ac2b52b467928854e0648ff2933b3d9dd9

Merge branch 'feature/v5.0/5.0.5' into test

 src/views/device/addDevice.vue

@@ -71,6 +71,7 @@
                tree: true,

                dialogWidth: 1050,
                searchGutter: 30,
                tip: false,
                searchShow: true,
                searchMenuSpan: 6,
@@ -214,20 +215,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',
                        },

 src/views/device/airport.vue

@@ -281,6 +281,7 @@
        tree: true,

        dialogWidth: 1050,
        searchGutter: 30,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
@@ -400,11 +401,12 @@
            // overHidden: true,
            editDisplay: true,
            viewDisplay: true,
            checkStrictly: true,

            props: {
              label: 'title',
              value: 'value',
              emitPath: false,
              checkStrictly: true,
              multiple: false,
              expandTrigger: 'hover',
            },