joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
“sunzy” 2021-12-20 12:38:59 +08:00
commit 72034ece10
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.production
View File

@ -2,7 +2,13 @@
NODE_ENV = 'production' NODE_ENV = 'production'
# base api # base api
<<<<<<< HEAD
VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud' VUE_APP_BASE_API = 'https://api.joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club' VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
=======
VUE_APP_BASE_API = 'https://joylink.club/jlcloud'
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
>>>>>>> 151251a693a5357d34c7ebac16387ad54091622e
VUE_APP_BASE_SITE='https://joylink.club/cbtc' VUE_APP_BASE_SITE='https://joylink.club/cbtc'

5
.env.staging
View File

@ -3,6 +3,11 @@ NODE_ENV = 'test'
# base api # base api
VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud' VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
<<<<<<< HEAD
VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://upload.joylink.club' VUE_APP_UPLOAD_API = 'https://upload.joylink.club'
=======
VUE_APP_VOICE_API = 'https://oss.joylink.club/oss/joylink'
VUE_APP_UPLOAD_API = 'https://joylink.club/jlfile/'
>>>>>>> 151251a693a5357d34c7ebac16387ad54091622e
VUE_APP_BASE_SITE='https://test.joylink.club/cbtc' VUE_APP_BASE_SITE='https://test.joylink.club/cbtc'

2
src/jlmap3d/utils/pathfinder/Pathfinding.js
View File

@ -29,7 +29,7 @@ class Pathfinding {
// not-recommended these days, so go ahead and start warning. // not-recommended these days, so go ahead and start warning.
console.warn('[three-pathfinding]: Use BufferGeometry, not Geometry, to create zone.'); console.warn('[three-pathfinding]: Use BufferGeometry, not Geometry, to create zone.');
} else { } else {
geometry = new Geometry().fromBufferGeometry(geometry); geometry = new THREE.Geometry().fromBufferGeometry(geometry);
} }
return Builder.buildZone(geometry); return Builder.buildZone(geometry);

2
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -140,7 +140,7 @@ export default {
return (this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy'); return (this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '02' || this.isAdmin) && (!this.$route.query.projectDevice || this.project == 'sdy');
}, },
isStationSupervisor() { isStationSupervisor() {
return this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy'); return (this.userRole == 'STATION_SUPERVISOR' && (!this.$route.query.projectDevice || this.project == 'sdy')) || this.project === 'gzb';
}, },
isDriver() { isDriver() {
return this.userRole == 'DRIVER' && !this.$route.query.projectDevice; return this.userRole == 'DRIVER' && !this.$route.query.projectDevice;