智慧园区前端大屏
shuishen
2024-12-16 9c3050a2b8e140f91c830cfafd1f5300f4b5dd72
新干路由配置调整、作战图显示调整
6 files modified
1 files deleted
1 files added
60 ■■■■ changed files
public/img/ochart.jpeg patch | view | raw | blame | history
public/img/ochart.jpg patch | view | raw | blame | history
src/pages/main/components/mainMenu.vue 6 ●●●● patch | view | raw | blame | history
src/pages/single/components/mainMenu.vue 6 ●●●● patch | view | raw | blame | history
src/pages/single/index.vue 4 ●●●● patch | view | raw | blame | history
src/permission.js 17 ●●●●● patch | view | raw | blame | history
src/router/index.js 23 ●●●● patch | view | raw | blame | history
src/views/ochart/index.vue 4 ●●●● patch | view | raw | blame | history
public/img/ochart.jpeg
Binary files differ
public/img/ochart.jpg
src/pages/main/components/mainMenu.vue
@@ -30,7 +30,11 @@
    {
      menuName: '360全景',
      path: '/layout/map/main/pd'
    }
    },
    {
      menuName: '作战图',
      path: '/layout/single/ochart'
    },
  ]
)
src/pages/single/components/mainMenu.vue
@@ -30,7 +30,11 @@
    {
      menuName: '360全景',
      path: '/layout/map/main/pd'
    }
    },
    {
      menuName: '作战图',
      path: '/layout/single/ochart'
    },
  ]
)
src/pages/single/index.vue
@@ -136,10 +136,10 @@
    .main-container {
      position: absolute;
      top: 40px;
      top: 54px;
      left: 40px;
      right: 40px;
      bottom: 40px;
      bottom: 54px;
    }
  }
}
src/permission.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-30 17:03:57
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-10-30 17:07:40
 * @LastEditTime: 2024-12-16 19:35:12
 * @FilePath: \bigScreen\src\permission.js
 * @Description: 
 * 
@@ -22,14 +22,19 @@
  const meta = to.meta || {}
  if (token) {
    if (to.path === '/login') {
      //如果登录成功访问登录页跳转到主页
    if (!to.matched.length) {
      // 如果路由不存在
      next({ path: '/' })
    } else {
      if (token.length === 0) {
        next({ path: '/login' })
      if (to.path === '/login') {
        //如果登录成功访问登录页跳转到主页
        next({ path: '/' })
      } else {
        next()
        if (token.length === 0) {
          next({ path: '/login' })
        } else {
          next()
        }
      }
    }
  } else {
src/router/index.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-10-25 16:35:31
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-12-10 16:46:59
 * @LastEditTime: 2024-12-16 19:19:09
 * @FilePath: \bigScreen\src\router\index.js
 * @Description: 
 * 
@@ -22,8 +22,8 @@
  //   redirect: '/layout',
  // },
  {
    path: '',
    redirect: '/layout',
    path: '/',
    redirect: '/layout/map/main/space',
  },
  {
    path: '/login',
@@ -75,7 +75,22 @@
            ]
          },
        ]
      }
      },
      {
        path: 'single',
        name: 'single',
        component: singleLayout,
        children: [
          {
            path: 'ochart',
            meta: {
              title: '作战图'
            },
            component: () => import('@/views/ochart/index.vue')
          },
        ]
      },
    ]
  },
]
src/views/ochart/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-10 15:27:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-11-27 19:05:04
 * @LastEditTime: 2024-12-16 19:25:30
 * @FilePath: \bigScreen\src\views\ochart\index.vue
 * @Description: 综合设计
 * 
@@ -11,7 +11,7 @@
<script setup>
import { Picture } from '@element-plus/icons-vue'
const { VITE_APP_BASE } = import.meta.env
let image = ref(VITE_APP_BASE + 'img/ochart.jpeg')
let image = ref(VITE_APP_BASE + 'img/ochart.jpg')
</script>
<template>