From fd89fe974e1a9ad24e80a31fd9fba4b704ae0b7a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 8 Jul 2020 15:49:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                   | 1 -
 src/views/newMap/jointTrainingNew/index.vue | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 0d90641b1..6e9e70af9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -412,7 +412,6 @@ export default {
                         };
                         setSessionStorage('projectDevice', JSON.stringify(res.data.deviceVO));
                         if (this.$route.query.type == 'LSW') {
-                            console.log('进入', `/bigSplitScreen/${resp.data.map.id}`);
                             this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: query });
                         } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') {
                             this.$router.push({ path: `/displayIscs/system`, query: {
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 49a14e1e0..467d7af69 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -206,6 +206,9 @@ export default {
             if (this.$route.query.type === 'VR_PSD') {
                 this.deviceShow = true;
             }
+            if (this.$route.query.type === 'DRIVE') {
+                this.hidepanel();
+            }
         },
         '$store.state.socket.memberChangeCount': function () {
             this.initMemberUserInfo();
@@ -566,7 +569,7 @@ export default {
             });
             window.open(routeData.href, '_blank', 'noopener noreferrer');
         },
-        hidepanel() {
+        hidepanel() { // 司机视角
             this.panelShow = false;
             this.drivingShow = true;
             this.ibpShow = false;

From faa57eb3c99c37c2252f8f0419b821c79bc14534 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Wed, 8 Jul 2020 16:15:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=87=E6=8D=A2=E6=A8=A1=E5=9E=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/jl3ddevice/jl3ddeviceNew.js | 13 ++++++++-----
 src/utils/baseUrl.js                    |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
index 4a2177905..3ccd587ff 100644
--- a/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
+++ b/src/jlmap3d/jl3ddevice/jl3ddeviceNew.js
@@ -219,7 +219,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 				scope.scene.remove(scope.showmodel);
 				scope.showmodel = null
 				scope.nowcode  = data.code;
-
+				if(scope.nowobject){
+					scope.resetmodel();
+				}
 				if (data._type == "Switch") {
 					// scope.modelmanager.switchmodel.locateType = data.body.locateType;
 					scope.modelmanager.switchmodel.code = data.code;
@@ -230,8 +232,9 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 					updatemenulist(scope.devicetext.devicelist);
 					scope.raycasterstatus = true;
 				}else{
+
 					scope.raycasterstatus = false;
-					scope.nowobject = "";
+					scope.nowobject = null;
 					updatemenulist();
 				}
 				if (data._type == "Signal") {
@@ -306,7 +309,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 
 	//设备分解、归位动画按钮
 	this.disperdevice1 = function(){
-		if(scope.nowobject.animacode){
+		if(scope.nowobject){
 			if(moveanima.status == true){
 				if(scope.animastats == false){
 					scope.animastats = true;
@@ -322,7 +325,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	};
 
 	this.disperdevice2 = function(){
-		if(scope.nowobject.animacode){
+		if(scope.nowobject){
 			if(moveanima.status == true){
 				if(scope.animastats == false){
 					scope.animastats = true;
@@ -337,7 +340,7 @@ export function Jl3ddeviceNew(dom,group,token,skinCode) {
 	};
 
 	this.resetmodel = function(){
-		if(scope.nowobject.animacode){
+		if(scope.nowobject){
 			scope.animastats = false;
 			moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true);
 		}
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c59924e25..778caeb7b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';