diff --git a/src/views/report/dashboardList/index.vue b/src/views/report/dashboardList/index.vue index 07dbe56e..8c155d67 100644 --- a/src/views/report/dashboardList/index.vue +++ b/src/views/report/dashboardList/index.vue @@ -373,25 +373,6 @@ const handlePreview = (item: DashboardItem) => { const queryParams = new URLSearchParams() if (item.id) queryParams.append('goviewId', String(item.id)) if (item.orgId) queryParams.append('orgId', String(item.orgId)) - if (item.type === '1') { - let deviceIdsStr = '' - if (Array.isArray(item.deviceIdsList) && item.deviceIdsList.length) { - deviceIdsStr = item.deviceIdsList - .map((g) => g.deviceId) - .filter((id) => id !== undefined && id !== null) - .join(',') - } else if (Array.isArray(item.deviceIds)) { - deviceIdsStr = item.deviceIds - .map((g: any) => g?.deviceId) - .filter((id: any) => id !== undefined && id !== null) - .join(',') - } else if (typeof item.deviceIds === 'string') { - deviceIdsStr = item.deviceIds - } - if (deviceIdsStr && deviceIdsStr.trim()) { - queryParams.append('deviceIds', deviceIdsStr.trim()) - } - } const queryString = queryParams.toString() const url = router.resolve(path + (queryString ? `?${queryString}` : '')).href window.open(url, '_blank') diff --git a/src/views/report/dashboardPage/dashboard1/index.vue b/src/views/report/dashboardPage/dashboard1/index.vue index c01749fa..cc1c845e 100644 --- a/src/views/report/dashboardPage/dashboard1/index.vue +++ b/src/views/report/dashboardPage/dashboard1/index.vue @@ -27,11 +27,25 @@
-