Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release

lzhe

2024-10-07 3007cbf86ea42756be4d5bf4f81e0d56d6150c67

 src/views/console/workstation/CollDialog.vue

@@ -129,7 +129,15 @@
            this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
                try {
                    this.cols = JSON.parse(res.data.dpHead)
                    console.log(this.cols, 'cols')
                    if (this.cols.filter(v => v.prop === 'dplabel').length === 0) {
                        this.cols.unshift(
                            {
                                label: "显示名称",
                                prop: "dplabel",
                                isRequired: true,
                            }
                        )
                    }
                } catch (error) {
                    this.cols = []
                }