Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
zyy
commit
24f089be32
@ -29,13 +29,6 @@ export function participantCreatTrainingRoom(id, data) {
|
||||
data: data
|
||||
});
|
||||
}
|
||||
/** 参赛者完成竞赛 */
|
||||
export function participantCompleteCompetition(id, group) {
|
||||
return request({
|
||||
url: `/api/v1/competition/${id}/room/${group}`,
|
||||
method: 'post'
|
||||
});
|
||||
}
|
||||
|
||||
/** 分页获取地图下的实操列表 */
|
||||
export function getQuestionListByMapId(params) {
|
||||
|
||||
@ -1,27 +1,34 @@
|
||||
<template>
|
||||
<div class="main" :style="{width: canvasWidth+'px'}">
|
||||
<transition name="el-zoom-in-bottom">
|
||||
<map-system-draft ref="mapCanvas" @back="back" />
|
||||
</transition>
|
||||
<!-- :style="{width: canvasWidth+'px'}" -->
|
||||
<div class="main" style="overflow:hidden;width:auto;height:100%;">
|
||||
<div class="map-view" style="width:auto;overflow:hidden;height:100%;">
|
||||
<jlmap-visual ref="jlmapVisual" @onMenu="onContextmenu" />
|
||||
<pop-menu ref="popMenu" :menu="menu" />
|
||||
</div>
|
||||
<menu-replay ref="menuReplay" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
|
||||
import JlmapVisual from '@/views/newMap/jlmapNew/index';
|
||||
import PopMenu from '@/components/PopMenu';
|
||||
import { loadNewMapDataByMapId } from '@/utils/loaddata';
|
||||
import { mapGetters } from 'vuex';
|
||||
import { checkLoginLine } from '@/api/login';
|
||||
import { EventBus } from '@/scripts/event-bus';
|
||||
import MenuReplay from './menuReplay';
|
||||
import { DeviceMenu, getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
|
||||
export default {
|
||||
name:'RefereeDisplay',
|
||||
components: {
|
||||
MapSystemDraft,
|
||||
JlmapVisual,
|
||||
PopMenu,
|
||||
MenuReplay
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
checkLine: null
|
||||
checkLine: null,
|
||||
menu: [],
|
||||
menuNormal: []
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -32,7 +39,7 @@ export default {
|
||||
return this.$route.query.mapId;
|
||||
},
|
||||
...mapGetters('map', [
|
||||
'map'
|
||||
'stationList'
|
||||
]),
|
||||
...mapGetters('training', [
|
||||
'offsetStationCode'
|
||||
@ -52,9 +59,9 @@ export default {
|
||||
this.mapBoxP = document.getElementById(this.canvasId).children[0];
|
||||
this.mapBoxP.style.cursor = '';
|
||||
},
|
||||
'size.width': function(val) {
|
||||
this.setWindowSize();
|
||||
},
|
||||
// 'size.width': function(val) {
|
||||
// this.setWindowSize();
|
||||
// },
|
||||
'$store.state.app.windowSizeCount': function() {
|
||||
this.setWindowSize();
|
||||
}
|
||||
@ -87,6 +94,16 @@ export default {
|
||||
this.endViewLoading();
|
||||
}
|
||||
},
|
||||
onContextmenu(em) {
|
||||
this.point = {
|
||||
x: em.clientX,
|
||||
y: em.clientY
|
||||
};
|
||||
if (!em.deviceType) {
|
||||
var menu = getDeviceMenuByDeviceType('Cancel');
|
||||
this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
|
||||
}
|
||||
},
|
||||
// 清除检查在线定时器
|
||||
clearAllTimer() {
|
||||
if (this.ierval) {
|
||||
@ -189,13 +206,12 @@ export default {
|
||||
// }
|
||||
// },
|
||||
setWindowSize() {
|
||||
// this.$nextTick(() => {
|
||||
const width = this.size ? this.size.width : this.width;
|
||||
const height = this.size ? this.size.height : this.height;
|
||||
|
||||
this.$store.dispatch('config/resize', { width, height });
|
||||
this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
|
||||
// });
|
||||
this.$nextTick(() => {
|
||||
const width = this.width;
|
||||
const height = this.height;
|
||||
this.$store.dispatch('config/resize', { width, height });
|
||||
this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@ -227,7 +227,7 @@ export default {
|
||||
playBack(index, row) {
|
||||
const group = row.group;
|
||||
getPublishMapInfo(this.mapId).then(resp=>{
|
||||
const query = { lineCode: resp.data.lineCode, mapId: this.mapId, group: group, raceId: this.$route.query.raceId};
|
||||
const query = { lineCode: resp.data.lineCode, mapId: this.mapId, group: group, raceId: this.$route.query.raceId, userName:row.name};
|
||||
this.$router.push({ path: `/refereeJsxtDisplay`, query: query});
|
||||
});
|
||||
},
|
||||
@ -249,5 +249,6 @@ export default {
|
||||
font-size: 18px;
|
||||
background: #fff;
|
||||
text-align: center;
|
||||
color: #409eff;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -14,18 +14,33 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="comercialName">{{ userName }}的实操回放</div>
|
||||
<el-button type="primary" class="back" @click="back">返回</el-button>
|
||||
<chat-box :group="group" :user-role="userRole" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { Notification } from 'element-ui';
|
||||
import ChatBox from '@/views/newMap/jointTrainingNew/chatView/chatBox';
|
||||
export default {
|
||||
name:'MenuPlay',
|
||||
components:{
|
||||
ChatBox
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
playSpeed:''
|
||||
playSpeed:'',
|
||||
userRole:'AUDIENCE'
|
||||
};
|
||||
},
|
||||
computed:{
|
||||
userName() {
|
||||
return this.$route.query.userName;
|
||||
},
|
||||
group() {
|
||||
return this.$route.query.group;
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
back() {
|
||||
this.$store.dispatch('training/over').then(() => {
|
||||
@ -39,14 +54,14 @@ export default {
|
||||
<style lang="scss" scoped>
|
||||
.menuReplay{
|
||||
position: absolute;
|
||||
width: 300px;
|
||||
width: 215px;
|
||||
height: 40px;
|
||||
left: 10px;
|
||||
bottom: 15px;
|
||||
right: 20px;
|
||||
top: 15px;
|
||||
z-index: 2;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
font-size:0px;
|
||||
font-size: 0px;
|
||||
}
|
||||
.replay,.speedAdd,.speedMinus{
|
||||
display: inline-block;
|
||||
@ -76,8 +91,20 @@ export default {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
.back{
|
||||
position:absolute;
|
||||
right:10px;
|
||||
bottom:10px;
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
bottom: 15px;
|
||||
}
|
||||
.comercialName{
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 0px;
|
||||
padding: 10px 30px;
|
||||
color: #000;
|
||||
font-size: 18px;
|
||||
-webkit-transform: translateX(-50%);
|
||||
transform: translateX(-50%);
|
||||
background: #fff;
|
||||
border-radius: 0px 0px 10px 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -92,7 +92,7 @@ export default {
|
||||
language:'zh',
|
||||
sex:'1'
|
||||
},
|
||||
headerTitle:'所有人'
|
||||
headerTitle:''
|
||||
};
|
||||
},
|
||||
computed:{
|
||||
|
||||
@ -61,7 +61,7 @@ export default {
|
||||
}
|
||||
this.scrollTop();
|
||||
} else {
|
||||
debugger;
|
||||
// debugger;
|
||||
if (!simulationText.all) {
|
||||
this.$emit('changeCoversition', simulationText);
|
||||
// this.$emit('addCoversition', {data:simulationText, headerTitle:''});
|
||||
|
||||
@ -34,7 +34,7 @@ import { putJointTrainingSimulationUserNew} from '@/api/jointTraining';
|
||||
import { EventBus } from '@/scripts/event-bus';
|
||||
import { getSessionStorage } from '@/utils/auth';
|
||||
import RealDevice from './menuDraft/realDevice';
|
||||
import { participantCompleteCompetition, refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition';
|
||||
import { refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition';
|
||||
import { prefixIntrger } from '@/utils/date';
|
||||
|
||||
export default {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user