From facd1c081c90db43cce7905ec1d4ea38f1f48a3b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 3 Feb 2023 11:36:28 +0800
Subject: [PATCH] 0203

---
 src/config/route.js               | 39 +++++++++++++++++++------------
 src/layout/components/NavMenu.vue | 13 +++++++----
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index ef4a6d7e..771c4dcf 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -25,8 +25,6 @@
 // 		}]
 // 	}
 // ]
-// import sysConfig from "@/config";
-// const linkUrl = sysConfig.API_URL.slice(0,--3)+"#/bigScreen";
 
 const routes = [
   {
@@ -50,7 +48,7 @@ const routes = [
         },
         "component": "home"
       },
-       {
+      {
         "path": "/bigScreen",
         "name": "bigScreens",
         "meta": {
@@ -58,22 +56,33 @@ const routes = [
           "icon": "el-icon-position",
           "perms": ["bigScreen"],
           "fullpage": true,
-          "hidden":true,
         },
         "component": "bigScreen"
       },
-      {
-        "path": "/bigScreen",
-        "name": "bigScreen",
-        "meta": {
-          "title": "驾驶舱",
-          "icon": "el-icon-position",
-          "perms": ["bigScreen"],
-          "type": "link",
-          "fullpage": true,
+      //  {
+      //   "path": "/bigScreen",
+      //   "name": "bigScreens",
+      //   "meta": {
+      //     "title": "bigScreens",
+      //     "icon": "el-icon-position",
+      //     "perms": ["bigScreen"],
+      //     "fullpage": true,
+      //     "hidden":true,
+      //   },
+      //   "component": "bigScreen"
+      // },
+      // {
+      //   "path": "/bigScreen",
+      //   "name": "bigScreen",
+      //   "meta": {
+      //     "title": "驾驶舱",
+      //     "icon": "el-icon-position",
+      //     "perms": ["bigScreen"],
+      //     "type": "link",
+      //     "fullpage": true,
           
-        },
-      },
+      //   },
+      // },
      
       {
         "name": "userCenter",
diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue
index 946e4c57..5d7e25bc 100644
--- a/src/layout/components/NavMenu.vue
+++ b/src/layout/components/NavMenu.vue
@@ -4,7 +4,7 @@
 	</div>
 	<template v-for="navMenu in navMenus" v-bind:key="navMenu">
 		<el-menu-item v-if="!hasChildren(navMenu)" :index="navMenu.path">
-			<a v-if="navMenu.meta&&navMenu.meta.type=='link'" target="_blank" @click="blankPageClick(navMenu.path)"></a>
+			<a v-if="navMenu.meta&&navMenu.meta.type=='link'" href="javascript:void(0)"  @click="blankPageClick(navMenu.path)"></a>
 			<el-icon v-if="navMenu.meta&&navMenu.meta.icon"><component :is="navMenu.meta.icon || 'el-icon-menu'"/></el-icon>
 			<template #title>
 				<span>{{navMenu.meta.title}}</span>
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import sysConfig from "@/config";
 
 	export default {
 		name: 'NavMenu',
@@ -36,9 +35,15 @@ import sysConfig from "@/config";
 			blankPageClick(path){
 				console.log(window.location);
 				console.log(path);
-				debugger;
 				let linkUrl = window.location.origin+"/#"+path;
-				window.open(linkUrl);
+				console.log(linkUrl)
+				debugger;
+
+
+				let routeUrl = this.$router.resolve({path: path});
+
+				window.open(routeUrl.href, '_blank');
+				// window.open(linkUrl,'_blank');
 			},
 		}
 	}