合并项目

src/layout/components/Navbar.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="navbar">
     <div class="sys-name">
-      <!-- <img id="nav-logo" :src="logo" alt="logo"> -->
       <span>运矿管理系统</span>
       <hamburger v-if="!hideMenuBt" id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     </div>
@@ -35,12 +34,12 @@
         </div>
       </div>
 
-      <div class="right-menu-item" @click="navToPage('/message')">
+      <!-- <div class="right-menu-item" @click="navToPage('/message')">
         <el-badge :is-dot="false" class="nav-icon">
           <img class="icon" src="@/assets/images/Navbar/notice.png" alt="">
           <span class="name">预警信息</span>
         </el-badge>
-      </div>
+      </div> -->
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img class="icon" src="@/assets/images/Navbar/user.png" alt="">
@@ -66,7 +65,6 @@
 import { mapGetters } from 'vuex'
 import { Breadcrumb, Hamburger, ErrorLog, Screenfull, SizeSelect, Search } from '@/components'
 import { getUnReadCounter } from '@/api/system/msgApi'
-import { getToken } from '@/utils/auth'
 export default {
   name: 'NaveBarComponent',
   components: {
@@ -83,7 +81,7 @@ export default {
       sideMenuTabIndex: 1,
       sideMenuTabList: [
         { name: '系统管理', icon: require('@/assets/images/Navbar/sys.png'), iconSelectEd: require('@/assets/images/Navbar/sys_selected.png'), path: '/aqpt/setting/camera', permit: 'aqpt_system', id: 1 },
-        { name: '数字全景', icon: require('@/assets/images/Navbar/bigscreen.png'), iconSelectEd: require('@/assets/images/Navbar/bigscreen_selected.png'), path: '/bigScreen/index', permit: 'aqpt_panorama', id: 2 }
+        { name: '大屏', icon: require('@/assets/images/Navbar/bigscreen.png'), iconSelectEd: require('@/assets/images/Navbar/bigscreen_selected.png'), path: '/bigScreen/index', permit: 'aqpt_panorama', id: 2 }
       ]
     }
   },
@@ -125,11 +123,11 @@ export default {
       this.sideMenuTabList = sideMenuTabList
     },
     initsideTab() {
-      let index = 1
-      if (this.isNotNull(localStorage.getItem('tabIndex'))) {
-        index = parseFloat(localStorage.getItem('tabIndex'))
-      }
-      this.sideTabChange(index, this.sideMenuTabList[0])
+      this.sideTabChange(1, this.sideMenuTabList[0])
+      const routeData = this.$router.resolve({
+        path: '/bigScreen/index'
+      })
+      window.open(routeData.href, '_blank')
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -145,12 +143,12 @@ export default {
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     },
     sideTabChange(index, item) {
-      const token = getToken()
-      if (item.href) {
-        const bigscreen = process.env.NODE_ENV === 'development' ? 'http://192.168.3.16:1890/#/' : 'http://113.141.93.143:1689/#/'
-        window.open(`${bigscreen}?token=${token}`)
-        return
-      }
+      // const token = getToken()
+      // if (item.href) {
+      //   const bigscreen = process.env.NODE_ENV === 'development' ? 'http://192.168.3.16:1890/#/' : 'http://113.141.93.143:1689/#/'
+      //   window.open(`${bigscreen}?token=${token}`)
+      //   return
+      // }
       this.sideMenuTabIndex = index
       this.$router.replace({
         path: item.path

src/router/modules/aqpt.js

@@ -5,7 +5,7 @@ const aqptRouter = [
     path: '/',
     component: Layout,
     name: 'AqptPanorama',
-    redirect: '/bigScreen/index',
+    redirect: '/aqpt/setting',
     hidden: true
   },
   {