diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置
diff --git a/src/views/ycjg/sjhf/index.vue b/src/views/ycjg/sjhf/index.vue
index 0c368a0..7fecb63 100644
--- a/src/views/ycjg/sjhf/index.vue
+++ b/src/views/ycjg/sjhf/index.vue
@@ -296,7 +296,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
     }
   })
   reset()

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置
diff --git a/src/views/ycjg/sjhf/index.vue b/src/views/ycjg/sjhf/index.vue
index 0c368a0..7fecb63 100644
--- a/src/views/ycjg/sjhf/index.vue
+++ b/src/views/ycjg/sjhf/index.vue
@@ -296,7 +296,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
     }
   })
   reset()
diff --git a/src/views/ycjg/ssjk/index-isc-single.vue b/src/views/ycjg/ssjk/index-isc-single.vue
index 1b30699..0dc7d79 100644
--- a/src/views/ycjg/ssjk/index-isc-single.vue
+++ b/src/views/ycjg/ssjk/index-isc-single.vue
@@ -168,9 +168,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      console.log('获取树的列表', data.value)
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置
diff --git a/src/views/ycjg/sjhf/index.vue b/src/views/ycjg/sjhf/index.vue
index 0c368a0..7fecb63 100644
--- a/src/views/ycjg/sjhf/index.vue
+++ b/src/views/ycjg/sjhf/index.vue
@@ -296,7 +296,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
     }
   })
   reset()
diff --git a/src/views/ycjg/ssjk/index-isc-single.vue b/src/views/ycjg/ssjk/index-isc-single.vue
index 1b30699..0dc7d79 100644
--- a/src/views/ycjg/ssjk/index-isc-single.vue
+++ b/src/views/ycjg/ssjk/index-isc-single.vue
@@ -168,9 +168,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      console.log('获取树的列表', data.value)
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {
diff --git a/src/views/ycjg/ssjk/index-media-single.vue b/src/views/ycjg/ssjk/index-media-single.vue
index 7ee9834..b67cbb6 100644
--- a/src/views/ycjg/ssjk/index-media-single.vue
+++ b/src/views/ycjg/ssjk/index-media-single.vue
@@ -130,7 +130,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // 获取流媒体token

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置
diff --git a/src/views/ycjg/sjhf/index.vue b/src/views/ycjg/sjhf/index.vue
index 0c368a0..7fecb63 100644
--- a/src/views/ycjg/sjhf/index.vue
+++ b/src/views/ycjg/sjhf/index.vue
@@ -296,7 +296,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
     }
   })
   reset()
diff --git a/src/views/ycjg/ssjk/index-isc-single.vue b/src/views/ycjg/ssjk/index-isc-single.vue
index 1b30699..0dc7d79 100644
--- a/src/views/ycjg/ssjk/index-isc-single.vue
+++ b/src/views/ycjg/ssjk/index-isc-single.vue
@@ -168,9 +168,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      console.log('获取树的列表', data.value)
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {
diff --git a/src/views/ycjg/ssjk/index-media-single.vue b/src/views/ycjg/ssjk/index-media-single.vue
index 7ee9834..b67cbb6 100644
--- a/src/views/ycjg/ssjk/index-media-single.vue
+++ b/src/views/ycjg/ssjk/index-media-single.vue
@@ -130,7 +130,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // 获取流媒体token
diff --git a/src/views/ycjg/ssjk/index-noPlugin-single.vue b/src/views/ycjg/ssjk/index-noPlugin-single.vue
index c17d1a6..c05e7a1 100644
--- a/src/views/ycjg/ssjk/index-noPlugin-single.vue
+++ b/src/views/ycjg/ssjk/index-noPlugin-single.vue
@@ -202,8 +202,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {

diff --git a/public/config/config.json b/public/config/config.json
index 12a6978..27d5341 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,6 +1,6 @@
 {
   "title": "安全生产智慧监管系统",
-  "baseUrl": "http://192.168.83.42:6909/safe-server/",
+  "baseUrl": "http://192.168.83.37:6909/safe-server/",
   "mediaBaseUrl": "http://192.168.83.42:80",
   "lat-bd": "39.91459528",
   "lng-bd": "116.26499505",
diff --git a/src/api/index.ts b/src/api/index.ts
index 244333e..4f5ac4e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -43,7 +43,12 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
     }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
+    }
+
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
       // request.data = qs.stringify(request.data, {
@@ -78,6 +83,7 @@
           })
         }
         else {
+          console.log('跳转到404以外其他页面')
           // token失效状态跳转到登录页
           toLogin()
           if (useUserStore().isLogout === 0) {
diff --git a/src/api/indexMedia.ts b/src/api/indexMedia.ts
index 72d60b2..9304b62 100644
--- a/src/api/indexMedia.ts
+++ b/src/api/indexMedia.ts
@@ -45,6 +45,10 @@
      */
     if (userStore.isLogin && request.headers) {
       request.headers.token = userStore.token
+      // request.headers.token = localStorage.getItem('token')
+    }
+    if (!userStore.isLogin && localStorage.getItem('tokenBak') === 'true') { // 未登录且url带token
+      request.headers.token = localStorage.getItem('token')
     }
     // 是否将 POST 请求参数进行字符串化处理
     if (request.method === 'post') {
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 7222afd..d6fc326 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -77,9 +77,11 @@
 function pro() {
   window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
 }
+const systemType = ref('')
 onMounted(() => {
   // 连接 websocket
   // websocket.initWebSocket()
+  systemType.value = window.localStorage.getItem('systemType') as string
 })
 onBeforeMount(() => {
   // 断开 websocket
@@ -161,7 +163,13 @@
         </el-popover>
       </span> -->
     </div>
-    <el-dropdown class="user-container" size="default" @command="userCommand">
+    <div v-if="systemType === 'gm'" class="user-wrapper">
+      {{ userStore.name }}
+      <el-icon>
+        <svg-icon name="ep:caret-bottom" />
+      </el-icon>
+    </div>
+    <el-dropdown v-if="systemType !== 'gm'" class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
         <!-- <el-avatar size="small">
           <el-icon>
diff --git a/src/main.ts b/src/main.ts
index 40f82cc..e7130ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,39 +25,6 @@
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
 }
-const app = createApp(App)
-app.config.globalProperties.hasPerm = hasPermission
-app.config.globalProperties.buttonPerm = buttonPerm
-app.config.globalProperties.dayjs = dayjs
-// let loading: any
-// let loadingCount = 0
-// app.config.globalProperties.showLoading = () => {
-//   if (loadingCount === 0) {
-//     loading = ElLoading.service({
-//       lock: true,
-//       text: '加载中，请耐心等待...',
-//       background: 'rgba(0, 0, 0, 0.7)',
-//     })
-//     loadingCount++
-//   }
-// }
-// app.config.globalProperties.closeLoading = () => {
-//   if (loadingCount <= 0) { return }
-//   loadingCount--
-//   if (loadingCount === 0) {
-//     if (loading) {
-//       loading.close()
-//     }
-//   }
-// }
-app.use(print)
-app.use(ElementPlus)
-app.use(pinia)
-app.use(router)
-for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-  app.component(key, component)
-}
-directive(app)
 
 axios
   .get('./config/config.json')
@@ -66,6 +33,24 @@
     console.log(result)
     window.localStorage.setItem('baseurl-safe', result.data.baseUrl)
     request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址
+    window.localStorage.setItem('baseURL', result.data.baseUrl)
+    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
+    window.localStorage.setItem('timeGap', result.data.timeGap)
+    window.localStorage.setItem('systemType', result.data.systemType)
+
+    const app = createApp(App)
+    app.config.globalProperties.hasPerm = hasPermission
+    app.config.globalProperties.buttonPerm = buttonPerm
+    app.config.globalProperties.dayjs = dayjs
+    app.use(print)
+    app.use(ElementPlus)
+    app.use(pinia)
+    app.use(router)
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+      app.component(key, component)
+    }
+    directive(app)
+
     app.config.globalProperties.config = result.data
     app.config.globalProperties.$position = {
       lat: result.data.lat,
@@ -76,10 +61,7 @@
       maxZoom: result.data.maxZoom,
       zoom: result.data.zoom,
     }
-    window.localStorage.setItem('baseURL', result.data.baseUrl)
-    window.localStorage.setItem('mediaBaseUrl', result.data.mediaBaseUrl)
-    window.localStorage.setItem('timeGap', result.data.timeGap)
-    window.localStorage.setItem('systemType', result.data.systemType)
+
     app.mount('#app')
   })
   .catch((error) => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 0a2c6fc..03e4a3b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -3,7 +3,12 @@
 import { useNProgress } from '@vueuse/integrations/useNProgress'
 import '@/assets/styles/nprogress.scss'
 // 路由相关数据
-import { asyncRoutes, asyncRoutesByFilesystem, constantRoutes, constantRoutesByFilesystem } from './routes'
+import {
+  asyncRoutes,
+  asyncRoutesByFilesystem,
+  constantRoutes,
+  constantRoutesByFilesystem,
+} from './routes'
 import pinia from '@/store'
 import useSettingsStore from '@/store/modules/settings'
 import useKeepAliveStore from '@/store/modules/keepAlive'
@@ -16,7 +21,10 @@
 
 const router = createRouter({
   history: createWebHashHistory(),
-  routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
+  routes:
+    useSettingsStore(pinia).app.routeBaseOn === 'filesystem'
+      ? constantRoutesByFilesystem
+      : (constantRoutes as RouteRecordRaw[]),
 })
 
 router.beforeEach(async (to, from, next) => {
@@ -29,10 +37,10 @@
     settingsStore.app.enableProgress && (isLoading.value = true)
     // 是否已登录
     if (userStore.isLogin) {
-      if (to.name === 'login') { // 如果还要进入登录页，直接跳转
+      if (to.name === 'login') {
+        // 如果还要进入登录页，直接跳转
         next()
-      }
-      else {
+      } else {
         // 携带token 需要去掉
         const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
         if (hrefIdx > -1) {
@@ -41,27 +49,130 @@
           localStorage.setItem('token', token)
           localStorage.setItem('tokenBak', 'true')
           // 刷新页面并隐藏token
-          window.location.href = window.location.href.replace(`?token=${token}`, '')
-        // history.go(0)
-        }
-        else {
+          // window.location.href = window.location.href.replace(
+          //   `?token=${token}`,
+          //   ''
+          // )
+          // history.go(0)
+        } else {
           localStorage.setItem('tokenBak', 'false')
         }
         if (!userStore.hasUserInfo) {
-        // 获取用户信息
+          // 获取用户信息
           await userStore.getUserInfo()
 
-          console.log('index.ts-after userinfo', localStorage.token, userStore.username)
+          console.log(
+            'index.ts-after userinfo',
+            localStorage.token,
+            userStore.username
+          )
         }
         // 是否已根据权限动态生成并注册路由
         if (routeStore.isGenerate) {
           // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
+          settingsStore.menu.menuMode !== 'single' &&
+            menuStore.setActived(to.path)
+          // 如果已登录状态下，进入登录页会强制跳转到控制台页面
+          if (to.name === 'login') {
+            next({
+              name: 'index',
+              replace: true
+            })
+          }
+          // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
+          else if (!settingsStore.dashboard.enable && to.name === 'dashboard') {
+            if (menuStore.sidebarMenus.length > 0) {
+              next({
+                path: menuStore.sidebarMenusFirstDeepestPath,
+                replace: true
+              })
+            }
+            // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
+            else {
+              next()
+            }
+          }
+          // 正常访问页面
+          else {
+            next()
+          }
+        } else {
+          // 生成动态路由
+          switch (settingsStore.app.routeBaseOn) {
+            case 'frontend':
+              await routeStore.generateRoutesAtFront(asyncRoutes)
+              break
+            case 'backend':
+              await routeStore.generateRoutesAtBack()
+              break
+            case 'filesystem':
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
+              // 文件系统生成的路由，需要手动生成导航数据
+              switch (settingsStore.menu.baseOn) {
+                case 'frontend':
+                  await menuStore.generateMenusAtFront()
+                  break
+                case 'backend':
+                  await menuStore.generateMenusAtBack()
+                  break
+              }
+              break
+          }
+          // 注册并记录路由数据
+          // 记录的数据会在登出时会使用到，不使用 router.removeRoute 是考虑配置的路由可能不一定有设置 name ，则通过调用 router.addRoute() 返回的回调进行删除
+          const removeRoutes: Function[] = []
+          routeStore.flatRoutes.forEach(route => {
+            if (!/^(https?:|mailto:|tel:)/.test(route.path)) {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            }
+          })
+          // 添加静态路由
+          if (settingsStore.app.routeBaseOn !== 'filesystem') {
+            routeStore.flatSystemRoutes.forEach(route => {
+              removeRoutes.push(router.addRoute(route as RouteRecordRaw))
+            })
+          }
+          routeStore.setCurrentRemoveRoutes(removeRoutes)
+          // 动态路由生成并注册后，重新进入当前路由
+          next({
+            path: to.path,
+            query: to.query,
+            replace: true
+          })
+        }
+      }
+    }
+    else {
+      console.log('未登录')
+      // 携带token 需要去掉
+      const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+      if (hrefIdx > -1) {
+        const params = queryString(window.location.href)
+        const token = stripscript(params.token)
+        localStorage.setItem('token', token)
+        localStorage.setItem('tokenBak', 'true')
+        // 刷新页面并隐藏token
+        // window.location.href = window.location.href.replace(
+        //   `?token=${token}`,
+        //   ''
+        // )
+        // history.go(0)
+      }
+      else {
+        localStorage.setItem('tokenBak', 'false')
+      }
+      if (localStorage.getItem('tokenBak') === 'true') {
+        // 是否已根据权限动态生成并注册路由
+        if (routeStore.isGenerate) {
+          // 导航栏如果不是 single 模式，则需要根据 path 定位主导航的选中状态
           settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
           // 如果已登录状态下，进入登录页会强制跳转到控制台页面
           if (to.name === 'login') {
             next({
               name: 'index',
-              replace: true,
+              replace: true
             })
           }
           // 如果未开启控制台，但进入的是控制台页面，则会进入侧边栏导航第一个模块
@@ -69,7 +180,7 @@
             if (menuStore.sidebarMenus.length > 0) {
               next({
                 path: menuStore.sidebarMenusFirstDeepestPath,
-                replace: true,
+                replace: true
               })
             }
             // 如果侧边栏导航第一个模块无法命中，则还是进入控制台页面
@@ -92,7 +203,9 @@
               await routeStore.generateRoutesAtBack()
               break
             case 'filesystem':
-              await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+              await routeStore.generateRoutesAtFilesystem(
+                asyncRoutesByFilesystem
+              )
               // 文件系统生成的路由，需要手动生成导航数据
               switch (settingsStore.menu.baseOn) {
                 case 'frontend':
@@ -114,7 +227,7 @@
           })
           // 添加静态路由
           if (settingsStore.app.routeBaseOn !== 'filesystem') {
-            routeStore.flatSystemRoutes.forEach((route) => {
+            routeStore.flatSystemRoutes.forEach(route => {
               removeRoutes.push(router.addRoute(route as RouteRecordRaw))
             })
           }
@@ -126,17 +239,38 @@
             replace: true,
           })
         }
+        await userStore.setToken(localStorage.getItem('token') as string)
       }
-    }
-    else {
+
       // 未登录跳转到登录
       if (to.name !== 'login') {
-        next({
-          name: 'login',
-          query: {
-            redirect: to.fullPath,
-          },
-        })
+        if (localStorage.getItem('tokenBak') === 'true') {
+          // url带token,验证token，token正确跳过登录
+          console.log('未登录-url带token', localStorage.getItem('token'))
+          const res = await userStore.getUserInfo()
+          if (res !== '') {
+            console.log('跳转首页')
+            next({
+              path: '/tdashboard',
+              replace: true,
+            })
+          }
+          else {
+            console.log('跳转noPage')
+            next({
+              name: '/noPage',
+              replace: true,
+            })
+          }
+        }
+        else {
+          next({
+            name: 'login',
+            query: {
+              redirect: to.fullPath,
+            },
+          })
+        }
       }
       else {
         next()
@@ -153,7 +287,10 @@
   const keepAliveStore = useKeepAliveStore()
   settingsStore.app.enableProgress && (isLoading.value = false)
   // 设置页面 title
-  to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
+  to.meta.title
+    && settingsStore.setTitle(
+      typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title,
+    )
   // 判断当前页面是否开启缓存，如果开启，则将当前页面的 name 信息存入 keep-alive 全局状态
   if (to.meta.cache) {
     const componentName = to.matched[to.matched.length - 1].components?.default.name
@@ -169,7 +306,7 @@
   if (from.meta.cache) {
     const componentName = from.matched[to.matched.length - 1].components?.default.name
     if (componentName) {
-    // 通过 meta.cache 判断针对哪些页面进行缓存
+      // 通过 meta.cache 判断针对哪些页面进行缓存
       switch (typeof from.meta.cache) {
         case 'string':
           if (from.meta.cache !== to.name) {
@@ -189,6 +326,15 @@
     }
   }
   document.documentElement.scrollTop = 0
+  // 携带token 需要去掉
+  // const hrefIdx = window.location.href.indexOf('token') // url中是否携带token
+  // if (hrefIdx > -1) {
+  //   const params = queryString(window.location.href)
+  //   const token = stripscript(params.token)
+  //   localStorage.setItem('token', token)
+  //   localStorage.setItem('tokenBak', 'true')
+  //   window.location.href = window.location.href.replace(`?token=${token}`, '')
+  // }
 })
 
 export default router
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 5017c51..394cc5a 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -60,8 +60,8 @@
               // import('@/views/ycjg/ssjk/index-noPlugin-single.vue'), // SDK单路
               // import('@/views/ycjg/ssjk/index-noPlugin.vue'), // SDK4路
               // import('@/views/ycjg/ssjk/index-isc-single.vue'), // isc
-              // import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
-              import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
+              import('@/views/ycjg/ssjk/index-media-single.vue'), // 商流媒体单路
+              // import('@/views/ycjg/ssjk/index-new-gm-plugin.vue'), // 国
             meta: {
               title: '实时监控',
               auth: '/realTime',
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f2940b1..a5369a9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -56,6 +56,9 @@
       },
     },
     actions: {
+      setToken(token: string) {
+        this.token = token
+      },
       // 被退出登录
       toLogout() {
         this.isLogout += 1
diff --git a/src/views/noPage.vue b/src/views/noPage.vue
index 31a7e8b..4adc911 100644
--- a/src/views/noPage.vue
+++ b/src/views/noPage.vue
@@ -13,9 +13,9 @@
   <div class="notfound">
     <svg-icon name="404" class="icon" />
     <div class="content">
-      <h1>404</h1>
+      <h1>401</h1>
       <div class="desc">
-        抱歉，你访问的页面不存在
+        无权限访问，请联系管理员
       </div>
     </div>
   </div>
diff --git a/src/views/ycjg/sjhf/index-isc.vue b/src/views/ycjg/sjhf/index-isc.vue
index d091cc5..73ed6a5 100644
--- a/src/views/ycjg/sjhf/index-isc.vue
+++ b/src/views/ycjg/sjhf/index-isc.vue
@@ -214,7 +214,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // resize()
diff --git a/src/views/ycjg/sjhf/index-media.vue b/src/views/ycjg/sjhf/index-media.vue
index 635d27a..5f4725f 100644
--- a/src/views/ycjg/sjhf/index-media.vue
+++ b/src/views/ycjg/sjhf/index-media.vue
@@ -257,7 +257,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   reset() // 重置
diff --git a/src/views/ycjg/sjhf/index.vue b/src/views/ycjg/sjhf/index.vue
index 0c368a0..7fecb63 100644
--- a/src/views/ycjg/sjhf/index.vue
+++ b/src/views/ycjg/sjhf/index.vue
@@ -296,7 +296,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
     }
   })
   reset()
diff --git a/src/views/ycjg/ssjk/index-isc-single.vue b/src/views/ycjg/ssjk/index-isc-single.vue
index 1b30699..0dc7d79 100644
--- a/src/views/ycjg/ssjk/index-isc-single.vue
+++ b/src/views/ycjg/ssjk/index-isc-single.vue
@@ -168,9 +168,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      console.log('获取树的列表', data.value)
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {
diff --git a/src/views/ycjg/ssjk/index-media-single.vue b/src/views/ycjg/ssjk/index-media-single.vue
index 7ee9834..b67cbb6 100644
--- a/src/views/ycjg/ssjk/index-media-single.vue
+++ b/src/views/ycjg/ssjk/index-media-single.vue
@@ -130,7 +130,7 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
+      // data.value = solveData(data.value)
     }
   })
   // 获取流媒体token
diff --git a/src/views/ycjg/ssjk/index-noPlugin-single.vue b/src/views/ycjg/ssjk/index-noPlugin-single.vue
index c17d1a6..c05e7a1 100644
--- a/src/views/ycjg/ssjk/index-noPlugin-single.vue
+++ b/src/views/ycjg/ssjk/index-noPlugin-single.vue
@@ -202,8 +202,6 @@
   videoTree().then((response) => {
     if (response.code === 200) {
       data.value = response.data
-      data.value = solveData(data.value)
-      console.log('修改后树的列表', data.value)
     }
   })
   setTimeout(() => {
diff --git "a/\346\265\201\345\252\222\344\275\223-20241024.zip" "b/\346\265\201\345\252\222\344\275\223-20241024.zip"
deleted file mode 100644
index 9aac4b0..0000000
--- "a/\346\265\201\345\252\222\344\275\223-20241024.zip"
+++ /dev/null
Binary files differ