修改三维设备界面隐藏显示

src/jlmap3d/jl3ddevice/jl3ddeviceNew.js

@@ -206,29 +206,15 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 			});
 		}
 	}
-
-	window.onresize = function () {
-
-		// if(scope.windowstatus){
-		// 	changeelement.style.width = '50%';
-		// 	changeelement.style.height = '50%';
-		// 	changeelement.style.top = '25%';
-		// 	scope.windowstatus = false;
-		// 	scope.updatewindowstatus('0');
-		// }else{
-		scope.camera.aspect = scope.dom.offsetWidth / scope.dom.offsetHeight;
-		scope.camera.updateProjectionMatrix();
-		scope.renderer.setSize(scope.dom.offsetWidth, scope.dom.offsetHeight);
-
-		if(scope.windowstatus == "0"){
 	let changeelement = document.getElementById('jl3d');
-			changeelement.style.width = '100%';
-			changeelement.style.height = '100%';
-			changeelement.style.top = '0';
-			scope.camera.aspect = window.innerWidth / scope.dom.offsetHeight;
+	window.addEventListener('resize', () =>
+	onresize()
+	, false)
+	let onresize = function () {
+
+		scope.camera.aspect = changeelement.offsetWidth / changeelement.offsetHeight;
 		scope.camera.updateProjectionMatrix();
-			scope.renderer.setSize(window.innerWidth, scope.dom.offsetHeight);
-		}
+		scope.renderer.setSize(changeelement.offsetWidth, changeelement.offsetHeight);
 
 	}
 

src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js

@@ -73,6 +73,10 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe
 			// 	jl3d.updateNowLeaveData("down",data.body.out);
 			// }
 		}
+
+		if(data.type == "TRAIN_PIS"){
+			console.log(data);
+		}
 		if(data.type == "TRAIN_PFI_NUM"){
 
 			trafficTrain.trainList = [];

src/views/jlmap3d/device/jl3ddevice.vue

@@ -4,7 +4,7 @@
 			</Jl3ddevice-Msg>
 			<Jl3ddevice-List v-show="isswitch" :devicelist="devicelist"  @sdevice="sdevice">
 			</Jl3ddevice-List>
-			<canvas id="canvastexture" />
+			<canvas id="canvastexture" ></canvas>
 			<div class="jl3dcontrolpane" v-show="isswitch">
 				<el-button-group>
 					<el-button type="primary" @click="back">初始化</el-button>
@@ -16,7 +16,7 @@
 
 			<div id="jl3dwindow" v-show="isPsd" class="windowbutton"
 			:style="{'background-image': 'url('+localStatic+'/texture/fk.png)'}"
-			@click="windowchange"></div
+			@click="windowchange"></div>
 
 			<div id="jl3dclose" v-show="isPsd" class="backbutton"
 			:style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}"

src/views/newMap/displayNew/demonMenu.vue

@@ -28,7 +28,8 @@
       </el-button-group>
     </div>
     <Jl3d-Device
-      v-if="deviceShow"
+      v-if="deviceif"
+      v-show="deviceShow"
       ref="Jl3dDevice"
       :panel-show="deviceShow"
       @closedevice3dview="jumpjlmap3dmodel"
@@ -113,7 +114,8 @@ export default {
             mapId:'',
             lineCode:'',
             practiceDisabled:false,
-            deviceShow: false,
+            deviceif:false,
+            deviceShow: true,
             drivingShow: false,
             jl3dtrafficplan:this.$t('display.demon.trafficplantext'),
             jl3dtraffictrain:this.$t('display.demon.traffictraintext'),
@@ -159,11 +161,16 @@ export default {
             }
         },
         jumpjlmap3dmodel() {
+          if(this.deviceif == false){
+            this.deviceif = true;
+          }else{
             if (this.deviceShow == false) {
                 this.deviceShow = true;
             } else {
                 this.deviceShow = false;
             }
+          }
+
         },
         showdriving() {
             this.drivingShow = false;

src/views/newMap/jointTrainingNew/index.vue

@@ -50,7 +50,8 @@
       <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
       <add-member ref="addMember" />
       <Jl3d-Device
-        v-if="deviceShow"
+        v-if="deviceif"
+        v-show="deviceShow"
         ref="Jl3dDevice"
         :panel-show="deviceShow"
         @closedevice3dview="devicemodel"
@@ -124,7 +125,8 @@ export default {
             mapViewLoadedOver: false,
             dataError: false,
             isAdmin: false,
-            deviceShow: false,
+            deviceif:false,
+            deviceShow: true,
             centralizedStationMap: {}
         };
     },
@@ -175,7 +177,8 @@ export default {
             this.showSelectStation && this.setShowStation(this.showStation);
             // this.initMemberUserInfo();
             if (this.$route.query.type === 'VR_PSD') {
-                this.deviceShow = true;
+                this.deviceif = true;
+                this.deviceShow = false;
             }
             if (this.$route.query.type === 'DRIVE') {
                 this.$store.dispatch('training/setPrdType', '04');
@@ -292,11 +295,16 @@ export default {
         //     });
         // },
         devicemodel() {
+          if(this.deviceif == false){
+            this.deviceif = true;
+          }else{
             if (this.deviceShow == false) {
                 this.deviceShow = true;
             } else {
                 this.deviceShow = false;
             }
+          }
+
         },
         /* 地图根据仿真group获取仿真基础信息 */
         async loadSimulationInfo() {