From daa05eb67b0d3bb89f3a3d7a2d5fab0cb39d81cc Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 19 Oct 2022 17:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=B2=99=E7=9B=98=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jlmap3d/assets3d.js                     | 5 ++++-
 src/views/jlmap3d/simulation/jl3dsimulation.vue | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js
index 96d40a2cf..265c7adcc 100644
--- a/src/api/jlmap3d/assets3d.js
+++ b/src/api/jlmap3d/assets3d.js
@@ -4,7 +4,10 @@ const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc';
 
 export const JL3D_LOCAL_STATIC = publicPath+"/static";
 const BASE_UPLOAD_API = store.state.user.uploadUrl;
-export const BASE_ASSET_API = store.state.user.resourcesUrl;
+// export const BASE_ASSET_API = store.state.user.resourcesUrl;
+// export const BASE_ASSET_API = store.state.user.ossUrl;
+export const BASE_ASSET_API = 'https://joylink.club/oss/joylink';
+
 // console.log(JL3D_LOCAL_STATIC);
 // console.log(BASE_UPLOAD_API);
 // console.log(BASE_ASSET_API);
diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue
index d6cd3e8af..1ed2027b6 100644
--- a/src/views/jlmap3d/simulation/jl3dsimulation.vue
+++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue
@@ -19,7 +19,7 @@
       <el-button-group>
         <el-button v-show=" project == 'say'" type="primary" @click="enterStopStation" >进入停车场</el-button>
         <el-button type="primary" @click="railmove">{{ $t('jlmap3d.cameraRailMove') }}</el-button>
-        <el-button type="primary" @click="back">{{ $t('global.exit') }}</el-button>
+        <!-- <el-button type="primary" @click="back">{{ $t('global.exit') }}</el-button> -->
       </el-button-group>
     </div>
 
@@ -122,7 +122,7 @@ export default {
     methods: {
         getParams:function() {
             var routerParams = this.$route.query.group;
-            this.mapid = this.$route.query.mapid;
+            this.mapid = this.$route.query.mapId;
             this.group = this.$route.query.group;
             this.token = this.$route.query.token;
             this.init(this.mapid, this.group);