diff --git a/src/permission.ts b/src/permission.ts index 427ae0a1..ddfe4b8f 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -81,7 +81,8 @@ const whiteList = [ '/register', '/oauthLogin/gitee', '/iot/report/dashboardPage/Dashboard8', - '/iot/report/dashboardPage/Dashboard1' + '/iot/report/dashboardPage/Dashboard1', + '/iot/report/dashboardPage/Dashboard3' ] // 路由加载前 diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index f4697dd2..efc2f1ae 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -653,6 +653,17 @@ const remainingRouter: AppRouteRecordRaw[] = [ canTo: true } }, + { + path: '/iot/report/dashboardPage/Dashboard3', + component: () => import('@/views/report/dashboardPage/dashboard3/index.vue'), + name: 'IotReportDashboard3', + meta: { + title: '设备运行总览大屏', + hidden: true, + noTagsView: true, + canTo: true + } + }, { path: '/iot', component: Layout, diff --git a/src/views/report/dashboardList/index.vue b/src/views/report/dashboardList/index.vue index 8185705a..4e430cd4 100644 --- a/src/views/report/dashboardList/index.vue +++ b/src/views/report/dashboardList/index.vue @@ -185,6 +185,7 @@ const total = ref(0) const getDashboardImage = (item: DashboardItem) => { if (item.type === '2') return dashboardImage1 if (item.type === '1') return dashboardImage2 + if (item.type === '3') return dashboardImage1 return item.indexImage || defaultImage } @@ -373,6 +374,7 @@ const openEditDialog = (item: DashboardItem) => { const getRouteByType = (type?: string) => { if (type === '1') return 'iot/report/dashboardPage/Dashboard1' if (type === '2') return 'iot/report/dashboardPage/Dashboard8' + if (type === '3') return 'iot/report/dashboardPage/Dashboard3' return '' } diff --git a/src/views/report/dashboardPage/dashboard1/dashboard3/index.vue b/src/views/report/dashboardPage/dashboard1/dashboard3/index.vue new file mode 100644 index 00000000..f02dd17b --- /dev/null +++ b/src/views/report/dashboardPage/dashboard1/dashboard3/index.vue @@ -0,0 +1,937 @@ + + + + +