From 7d7b8aa76fcfbfc77b3d0618a594df6316fbfbae Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 3 Feb 2023 15:33:35 +0800
Subject: [PATCH] 0203

---
 src/config/route.js               | 30 +++++++++++++++---------------
 src/layout/components/NavMenu.vue | 14 +++++---------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index aa239a4c..7015b384 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -48,6 +48,18 @@ const routes = [
         },
         "component": "home"
       },
+      //  {
+      //   "path": "/bigScreen",
+      //   "name": "bigScreen",
+      //   "meta": {
+      //     "title": "驾驶舱",
+      //     "icon": "el-icon-position",
+      //     "perms": ["bigScreen"],
+      //     "fullpage": true,
+      //   },
+      //   "component": "bigScreen"
+      // },
+       
       {
         "path": "/bigScreen",
         "name": "bigScreen",
@@ -55,11 +67,12 @@ const routes = [
           "title": "驾驶舱",
           "icon": "el-icon-position",
           "perms": ["bigScreen"],
-          "fullpage": true,
+          "type": "link",
+          "fullpage": true, 
         },
         "component": "bigScreen"
       },
-      //  {
+      // {
       //   "path": "/bigScreen",
       //   "name": "bigScreens",
       //   "meta": {
@@ -71,19 +84,6 @@ const routes = [
       //   },
       //   "component": "bigScreen"
       // },
-      // {
-      //   "path": "/bigScreen",
-      //   "name": "bigScreen",
-      //   "meta": {
-      //     "title": "驾驶舱",
-      //     "icon": "el-icon-position",
-      //     "perms": ["bigScreen"],
-      //     "type": "link",
-      //     "fullpage": true,
-          
-      //   },
-      // },
-     
       {
         "name": "userCenter",
         "path": "/usercenter",
diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue
index c3854178..c1ac7c8f 100644
--- a/src/layout/components/NavMenu.vue
+++ b/src/layout/components/NavMenu.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-
 	export default {
 		name: 'NavMenu',
 		props: ['navMenus'],
@@ -37,15 +36,12 @@
 			blankPageClick(path){
 				// console.log(window.location);
 				// console.log(path);
-				let linkUrl = window.location.origin+"/#"+path;
-				console.log(linkUrl)
-				debugger;
-
-
+				// let linkUrl = window.location.origin+"/#"+path;
+				
 				let routeUrl = this.$router.resolve({path: path});
-
-				window.open(routeUrl.href, '_blank');
-				// window.open(linkUrl,'_blank');
+				console.log(routeUrl.href)
+				debugger;
+				window.open(routeUrl.href);
 			},
 		}
 	}