Commit 299dcb172c6bed2e71eec3a79c818312c05d0f42
Merge branch 'ft' into 'main_dev'
feat: 大屏跳转url传组织id See merge request yunteng/thingskit-front!899
Showing
2 changed files
with
7 additions
and
2 deletions
| @@ -8,6 +8,7 @@ export interface BigScreenCenterItemsModel { | @@ -8,6 +8,7 @@ export interface BigScreenCenterItemsModel { | ||
| 8 | remark: string; | 8 | remark: string; |
| 9 | state: number; | 9 | state: number; |
| 10 | publicId: string; | 10 | publicId: string; |
| 11 | + organizationId?: string; | ||
| 11 | } | 12 | } |
| 12 | export type queryPageParams = BasicPageParams & { | 13 | export type queryPageParams = BasicPageParams & { |
| 13 | name?: Nullable<string>; | 14 | name?: Nullable<string>; |
| @@ -124,12 +124,16 @@ | @@ -124,12 +124,16 @@ | ||
| 124 | const { largeDesignerPrefix } = useGlobSetting(); | 124 | const { largeDesignerPrefix } = useGlobSetting(); |
| 125 | 125 | ||
| 126 | const handlePreview = (record: BigScreenCenterItemsModel) => { | 126 | const handlePreview = (record: BigScreenCenterItemsModel) => { |
| 127 | - window.open(`${largeDesignerPrefix}/#/chart/preview/${record.id}`); | 127 | + window.open( |
| 128 | + `${largeDesignerPrefix}/#/chart/preview/${record.id}?organizationId=${record.organizationId}` | ||
| 129 | + ); | ||
| 128 | }; | 130 | }; |
| 129 | 131 | ||
| 130 | const handleDesign = (record: BigScreenCenterItemsModel) => { | 132 | const handleDesign = (record: BigScreenCenterItemsModel) => { |
| 131 | if (record.state === 1) return; | 133 | if (record.state === 1) return; |
| 132 | - window.open(`${largeDesignerPrefix}/#/chart/home/${record.id}`); | 134 | + window.open( |
| 135 | + `${largeDesignerPrefix}/#/chart/home/${record.id}?organizationId=${record.organizationId}` | ||
| 136 | + ); | ||
| 133 | }; | 137 | }; |
| 134 | 138 | ||
| 135 | const handleDelete = async (record: BigScreenCenterItemsModel) => { | 139 | const handleDelete = async (record: BigScreenCenterItemsModel) => { |