update

src/permission.ts

@@ -69,7 +69,7 @@ router.beforeEach(async (to, from, next) => {
 
           //初始化地图资源
           // let appconfig = await store.dispatch('gis/initGISResource')
-          next({ ...to })
+          next(accessRoutes.some(e => e.path == '/bigScreen') ? { path: '/bigScreen' } : { ...to })
         } catch (error) {
           // debugger
           console.log(error)

src/views/login/index.vue

@@ -21,7 +21,7 @@
           class="login-form middle"
           auto-complete="on"
           label-position="left"
-          style="position: relative;top: 200px; left: calc((100% - 320px)/2);top: 150px;"
+          style="position: relative; top: 200px; left: calc((100% - 320px) / 2); top: 150px"
         >
           <el-input
             ref="username"
@@ -99,8 +99,6 @@ import { regPassword } from '@/utils/reg'
 import { ElForm } from 'element-ui/types/form'
 const sha1Hex = require('sha1-hex')
 const defaultPwd = '000000'
-
-import { getUserMenu } from '@/api/user'
 @Component
 export default class Login extends Vue {
   name = 'Login'
@@ -231,25 +229,9 @@ export default class Login extends Vue {
                   sessionStorage.removeItem('userId')
                   this.$store.state.user.userId = undefined
                 } else {
-                  // setTimeout(() => {
-                  //   this.$router.push({ path: '/' })
-                  // }, 0)
-                  const userId = sessionStorage.getItem('userId') || this.$store.state.user.userId
-                  getUserMenu(userId)
-                    .then((res) => {
-                      const loadingDone = () => {
-                        this.loading = false
-                      }
-                      if (res.result.some((item) => item.type === 'bigScreen')) {
-                        this.$router.push({ path: '/bigScreen' }, loadingDone)
-                      } else {
-                        this.$router.push({ path: '/' }, loadingDone)
-                      }
-                    })
-                    .catch((err) => {
-                      console.log(err)
-                      this.loading = false
-                    })
+                  setTimeout(() => {
+                    this.$router.push({ path: '/' })
+                  }, 0)
                 }
               })
               .catch(() => {