数据看板修改

src/layout/modules/RouterMenu.vue

@@ -68,9 +68,10 @@ const setBarMenuData = () => {
 
 //跳转到数据看板
 const barDatavClick = () => {
-    const { key } = barRoutes.value
+    const { key, path } = barRoutes.value
+
     if (key !== 'datav') {
-        router.push({ name: 'statistics-datav' })
+        router.push({ name: 'statistics-datav', query:{ from: path } })
     }
 }
 

src/router/modules/base.js

@@ -54,6 +54,12 @@ export default [
         meta: { title: 'pdf文件预览' },
         component: () => import('~src/views/home/pdf.vue'),
     },
+    {
+        path: '/statistics/datav',
+        name: 'statistics-datav',
+        meta: { title: '数据看板' },
+        component: () => import('~src/views/statistics/datav.vue'),
+    },
     // {
     //     path: '/datav',
     //     name: 'datav',
@@ -215,12 +221,12 @@ export default [
                 meta: { title: '案卷统计' },
                 component: () => import('~src/views/statistics/stats.vue'),
             },
-            {
-                path: '/statistics/datav',
-                name: 'statistics-datav',
-                meta: { title: '数据看板' },
-                component: () => import('~src/views/statistics/datav.vue'),
-            },
+            // {
+            //     path: '/statistics/datav',
+            //     name: 'statistics-datav',
+            //     meta: { title: '数据看板' },
+            //     component: () => import('~src/views/statistics/datav.vue'),
+            // },
         ],
     },
     {

src/views/statistics/datav.vue

@@ -280,7 +280,13 @@ const tabsClick = (item) => {
 
 //项目名称被点击
 const projectNameClick = () => {
-    router.push({ name: store.homeUrl })
+    const fromRoute = router.currentRoute.value.query?.from
+    if (fromRoute) {
+        router.push(fromRoute)
+    } else {
+        router.push({ name: store.homeUrl })
+    }
+    // router.push({ name: store.homeUrl })
 }
 
 //是否全屏