diff --git a/src/api/competition.js b/src/api/competition.js index eec560f25..8af0f2102 100644 --- a/src/api/competition.js +++ b/src/api/competition.js @@ -64,10 +64,11 @@ export function postSignUp(id, data) { } /** 查询用户是否已经报名该竞赛 */ -export function getIsSignUp(raceId) { +export function getIsSignUp(raceId, params = {}) { return request({ url: `/api/race/${raceId}/isSignUp`, - method: 'get' + method: 'get', + params }); } diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js index 77880b13b..ca5433e33 100644 --- a/src/jmapNew/shape/Station/index.js +++ b/src/jmapNew/shape/Station/index.js @@ -36,7 +36,6 @@ export default class Station extends Group { if (model.visible) { // 公里标名称是否显示 - console.log(model.nameFont); this.stationText = new ETextName({ zlevel: this.zlevel, z: this.z, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 818fe4147..b62985baa 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,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'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index 76722ccd6..2a96bfc84 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -150,16 +150,16 @@ export default { } return getRaceUserList(params); }, - handleClick(row) { - const group = row.room.group; + handleClick(index, row) { + const group = row.group; refereeEnterSimulation(group).then(response=>{ const query = { lineCode: '11', mapId: '41', group: group, raceId: this.$route.query.raceId}; - this.$router.replace({ path: `/jointTrainingNew`, query: query}); + this.$router.push({ path: `/jointTrainingNew`, query: query}); }); }, - playBack() { + playBack(index, row) { }, - gradeScore() { + gradeScore(index, row) { }, refresh() { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d3027d9b6..6078dda2d 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -337,7 +337,7 @@ export default { removeSessionStorage('againEnter'); if (this.$route.query.raceId) { if (this.$route.path.includes('jsxt/login')) { - getIsSignUp(this.$route.query.raceId).then(res => { + getIsSignUp(this.$route.query.raceId, { isLogin: true }).then(res => { if (res.data) { setSessionStorage('raceId', this.$route.query.raceId); this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } }); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 074f7db00..0a1412c22 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -363,16 +363,17 @@ export default { if (this.lineCode) { // 01 现地 02 行调 '' 观众 - let resp; + let resp = {data: {}}; if (this.project == 'jsxt' ) { resp = await getRaceUserById(this.$route.query.raceId, this.userId); resp.data.userRole = resp.data.role; } else if (this.project == 'refereeJsxt') { - resp.data.userRole = 'ADMIN'; + resp['code'] = 200; + resp.data['userRole'] = 'ADMIN'; } else { resp = await this.getUserRole(); } - console.log('/////////////' + resp.data.userRole); + // console.log('/////////////' + resp.data.userRole); if (resp && resp.code == 200) { // Admin 管理员 Instructor 教员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘 this.userRole = resp.data.userRole; diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 76125f3a1..2432a3fb7 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -5,7 +5,7 @@ {{ $t('joinTraining.connectRealDevices') }} {{ $t('joinTraining.driverPerspective') }} -