集成三维大屏

src/layout/components/Navbar.vue

@@ -24,8 +24,11 @@
 
     <div class="right-menu">
 		<div style="display:inline-block;height:100%;vertical-align:unset;margin-right:10px;">
+      <el-tooltip content="三维大屏" effect="dark" placement="bottom">
+        <a href="http://39.164.225.220:5003/edge/Screen" class="el-icon-s-platform" style="font-size:24px;"></a>
+      </el-tooltip>
 			<el-tooltip content="可视化大屏" effect="dark" placement="bottom">
-				<router-link class="el-icon-s-platform" style="font-size:24px;" to="/MLargeScreen/index" target="_blank" tag="a" ></router-link>
+				<router-link class="el-icon-s-marketing" style="font-size:24px;" to="/MLargeScreen/index" tag="a" ></router-link>
 			</el-tooltip>
 		</div>
 
@@ -240,15 +243,15 @@ export default {
 		height:100%;cursor:pointer;
 		transition: background .3s;
 		-webkit-tap-highlight-color:transparent;
-	
+
 		&:hover {
 		  background: rgba(0, 0, 0, .025)
 		}
 	}
 
 	.breadcrumb-container {float: left;}
-		
-	
+
+
 
 	.errLog-container {
 		display: inline-block;vertical-align: top;

src/views/MLargeScreen/index.vue

@@ -4,7 +4,6 @@
 		<div class="top_title" style="text-align: center">
       <span class="projectName">恒源矿业二道庄矿区智慧矿山</span>
       <div class="top_titl_left">
-        <div></div>
 				<div v-for="(item,index) in topSmallTitleLeftData" :key="index" style="cursor: pointer;" @click="changeOver(item)">
 					<div :class="selectModule == item.componentName ? 'top_titl_left_textStyle2' : 'top_titl_left_textStyle1' ">{{item.title}}</div>
 					<img src="../../assets/images/cutGraph/light7.png" width="85" style="margin-top:-1vh;" v-if="selectModule == item.componentName">
@@ -15,6 +14,9 @@
 					<div :class="selectModule == item.componentName ? 'top_titl_left_textStyle2' : 'top_titl_left_textStyle1' ">{{item.title}}</div>
 					<img src="../../assets/images/cutGraph/light7.png" width="85" style="margin-top:-1vh;" v-if="selectModule == item.componentName">
 				</div>
+        <div>
+          <div class="top_titl_left_textStyle1"><a href="http://39.164.225.220:5003/edge/Screen">三维大屏</a></div>
+        </div>
 			</div>
 			<!-- 时间 -->
 			<div class="currentTimeStyle">{{currentTime}}</div>
@@ -207,10 +209,10 @@ export default {
 						let array1 = res.data.content.sort(function(a,b){
 							return parseInt(a.dsort) - parseInt(b.dsort);
 						});
-						for(let i = 0 ; i<2 ; i++){
+						for(let i = 0 ; i<3 ; i++){
 							leftTemporaryData.push(array1[i]);
 						}
-						for(let j = 2 ; j<res.data.totalElements ; j++){
+						for(let j = 3 ; j<res.data.totalElements ; j++){
 							rightTemporaryData.push(array1[j]);
 						}
 						this.topSmallTitleLeftData = leftTemporaryData;
@@ -221,7 +223,11 @@ export default {
 		},
 		//选择展示模块
 		changeOver(item){
-			this.selectModule = item.componentName;
+      if (this.selectModule == item.componentName) {
+        this.selectModule = null;
+      }else{
+        this.selectModule = item.componentName;
+      }
 			if(item.componentName == 'dataScreening'){
 				if(this.isShow.dataScreening == false){
 					this.isShow.dataScreening = true;
@@ -395,7 +401,8 @@ export default {
 					let routeUrl = this.$router.resolve({
 						path: "/dashboard",
 					});
-					window.open(routeUrl.href, '_blank');
+					// window.open(routeUrl.href, '_blank');
+          window.location.href = routeUrl.href;
 				})
 				this.videoSelect1 = false;
 				this.kaungEZUIKitJsShow = false;