Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/utils/baseUrl.js

@@ -3,11 +3,11 @@ 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.41:9000'; // 杜闪
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }

src/views/display/index.vue

@@ -159,9 +159,6 @@ export default {
         skinCode() {
             return this.$route.query.skinCode;
         },
-        mapId() {
-            return this.$route.query.mapId;
-        },
         isLesson() {
             return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
         },
@@ -237,6 +234,7 @@ export default {
 
         await this.setWindowSize();
         await this.initLoadData();
+        console.log(history);
     },
     async beforeDestroy() {
         await this.clearAllTimer();
@@ -527,11 +525,11 @@ export default {
             if (this.isDrive) {
                 this.panelShow = false;
                 this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId,this.group);
+                this.$refs.Jl3dDrive.show(this.mapId, this.group);
             } else {
                 this.panelShow = false;
                 this.simulationShow = true;
-                this.$refs.Jl3dSimulation.show(this.mapId,this.group);
+                this.$refs.Jl3dSimulation.show(this.mapId, this.group);
             }
         },
         showScheduling() {