Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

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
     });
 }
 

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,

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';    // 张赛

src/views/jsxt/refereeList/index.vue

@@ -149,16 +149,16 @@ export default {
             }
             return getRaceUserList(params);
         },
-        handleClick(row) {
+        handleClick(index, row) {
-            const group = row.room.group;
+            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) {
 
         },
         afterQuery(data) {

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 } });

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;

src/views/newMap/jointTrainingNew/menuDemon.vue

@@ -5,7 +5,7 @@
       <el-button-group>
         <el-button v-if="isProject && !dataError " type="primary" @click="setRelDevice">{{ $t('joinTraining.connectRealDevices') }}</el-button>
         <el-button v-if="isDriver && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
-        <template v-if="isAdmin">
+        <template v-if="isAdmin && project != 'refereeJsxt'">
           <el-button type="success" :disabled="isDisable || dataError" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
           <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
@@ -332,7 +332,8 @@ export default {
         },
         refeeEndCompetition() {
             refereeExitSimulation(this.group).then(resp => {
-                this.$router.go(-1);
+                // this.$router.go(-1);
+                this.$router.replace({ path: `/refereeJsxt/home`, query: { raceId:this.$route.query.raceId } });
             }).catch(()=> {
                 this.$message.success('退出系统失败');
             });