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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-07-28 13:03:25 +08:00
commit 41aadd30cb
8 changed files with 41 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jmapNew/theme/haerbin_01/menus/menuBar.vue
View File

@ -148,22 +148,15 @@ export default {
this.stationCode = code;
}
},
'$store.state.socket.simulationRoleList':function(val) {
if (val && val.length) {
this.checkRoleChange(val);
'$store.state.socket.simulationRoleList':function(list) {
if (list && list.length) {
this.checkRoleChange(list);
}
}
},
mounted() {
this.version = this.$store.state.map.version;
this.initMenu();
if (this.$store.state.socket.simulationRoleList && this.$store.state.socket.simulationRoleList.length) {
this.$store.state.socket.simulationRoleList.forEach(item => {
if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') {
this.switchShowStation(this.centralizedMap[item.deviceCode]);
}
});
}
},
methods: {
initMenu() {
@ -241,6 +234,13 @@ export default {
this.$nextTick(() => {
EventBus.$emit('closeMenu');
});
},
checkRoleChange(list) {
list.forEach(item => {
if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') {
this.switchShowStation(this.centralizedMap[item.deviceCode]);
}
});
}
}
};

6
src/scripts/ProjectConfig.js
View File

@ -20,6 +20,7 @@ export const loginInfo = {
title: '西安铁路职业技术学院城市轨道交通实训平台',
loginPath:'/login?pro=xty',
loginParam: 'XTY',
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
@ -41,6 +42,7 @@ export const loginInfo = {
title: '西安铁路职业技术学院城市轨道交通设计平台',
loginPath:'/design/login?project=xty',
loginParam: 'XTY',
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
@ -48,12 +50,14 @@ export const loginInfo = {
title: '贵州装备制造职业学院城市轨道交通实训平台',
loginPath:'/login?project=gzb',
loginParam: 'GZB',
titleDistance: '-150px',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
},
designgzb: {
title: '贵州装备制造职业学院城市轨道交通设计平台',
loginPath:'/design/login?project=gzb',
titleDistance: '-150px',
loginParam: 'GZB',
navigationLogoWidth: '40px',
navigationMarginLeft: '60px'
@ -63,6 +67,7 @@ export const loginInfo = {
loginTitle: '城市轨道交通综合行车模拟仿真系统V1.0',
logoWidth: '140px',
loginPath: '/login?project=heb',
titleDistance: '150px',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'HEB',
navigationLogoWidth: '120px',
@ -72,6 +77,7 @@ export const loginInfo = {
title: '城市轨道交通设计平台V1.0',
loginTitle: '城市轨道交通设计平台V1.0',
logoWidth: '140px',
titleDistance: '150px',
loginPath: '/design/login?project=heb',
bottomColumn: '哈尔滨盈达科技有限公司 联系电话:0451-87001273',
loginParam: 'HEB',

5
src/views/login/index.vue
View File

@ -197,7 +197,6 @@ export default {
}
},
loginTitle () {
// this.$route.path.split('/')[1]
return loginInfo[this.project].loginTitle;
},
title() {
@ -591,7 +590,9 @@ export default {
.text-box{
font-size: 40px;
font-weight: bold;
top: -50px;
top: 150px;
width: 1000px;
text-align: center;
position: absolute;
}
.left-logo-box{

17
src/views/newMap/displayNew/designIndex.vue
View File

@ -22,7 +22,7 @@
@selectQuest="selectQuest"
@switchStationMode="switchStationMode"
/>
<menu-system-time ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
<menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
</div>
<!-- <Jl3d-Simulation v-show="simulationShow" ref="Jl3dSimulation" :panel-show="simulationShow" @showpanel="showpanel" /> -->
@ -115,9 +115,6 @@ export default {
height() {
return this.$store.state.app.height;
},
right() {
return this.$store.state.config.width / 2 - 55;
},
mapId() {
return this.$route.query.mapId;
},
@ -249,13 +246,11 @@ export default {
},
setPosition() {
this.$nextTick(() => {
this.offset = 15;
this.offsetBottom = 15;
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
this.offset = this.offset + (menuBar ? menuBar.offsetHeight || 0 : 0) + (menuTool ? menuTool.offsetHeight || 0 : 0);
this.offsetBottom = this.offsetBottom + (menuBottom ? menuBottom.offsetHeight || 0 : 0);
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
this.offset = 15 + (menuBar ? menuBar.offsetHeight || 0 : 0) + (menuTool ? menuTool.offsetHeight || 0 : 0);
this.offsetBottom = 15 + (menuBottom ? menuBottom.offsetHeight || 0 : 0);
});
},
async back() {

19
src/views/newMap/displayNew/index.vue
View File

@ -74,7 +74,7 @@
<menu-train-list v-if="isDemon" @setCenter="setCenter" />
<menu-system-time ref="menuSystemTime" :offset="offset" :right="right" :group="group" />
<menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
</template>
<Jl3d-Device
v-if="deviceShow"
@ -207,9 +207,6 @@ export default {
isDrive() {
return this.prdType == '04';
},
right() {
return this.$store.state.config.width / 2 - 55;
},
trainingId() {
return this.$route.query.trainingId;
}
@ -499,31 +496,23 @@ export default {
// }
setPosition() {
this.$nextTick(() => {
let offset = 15;
let offsetBottom = 15;
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
const menuButtonsBox = document.getElementById('menuButtons_box');
if (menuBar) {
offset += (menuBar.offsetHeight || 0);
this.offset = (menuBar.offsetHeight || 0) + 15;
}
if (menuTool) {
offset += (menuTool.offsetHeight || 0);
this.offset = (menuTool.offsetHeight || 0) + 15;
}
const buttonWidth = this.width - 1200;
if (menuBottom && buttonWidth < 550) {
offsetBottom = (menuBottom.offsetHeight || 0) + 15;
this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
}
if (menuButtonsBox) {
this.tipBottom = (menuButtonsBox.offsetHeight || 0) + 15;
}
if (this.offset != offset) {
this.offset = offset;
}
if (this.offsetBottom != offsetBottom) {
this.offsetBottom = offsetBottom;
}
});
},
setCenter(code) {

6
src/views/newMap/displayNew/menuSystemTime.vue
View File

@ -29,10 +29,6 @@ export default {
offset: {
type: Number,
required: true
},
right: {
type: Number,
required: true
}
},
data() {
@ -64,7 +60,7 @@ export default {
return this.isShowDate ? (this.$route.query.prdType == '05' ? 5 : 35) : this.offset;
},
newRight() {
return this.isShowDate ? this.$store.state.config.width - 420 : this.right;
return this.isShowDate ? this.$store.state.config.width - 420 : this.$store.state.config.width / 2 - 55;
}
},
watch: {

33
src/views/newMap/jointTrainingNew/index.vue
View File

@ -41,7 +41,7 @@
<join-fault-choose ref="faultChoose" :group="group" :offset="offset" />
<join-run-plan-Load ref="runPlanLoad" :group="group" />
<join-run-plan-view ref="runPlanView" :group="group" />
<menu-system-time ref="menuSystemTime" :offset="offset" :group="group" :right="right" />
<menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
<menu-train-list v-if="prdType=='02'" @setCenter="setCenter" />
<js-question v-if="project == 'jsxt'" :offset="offset" :question-list="questionList" />
<members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
@ -153,9 +153,6 @@ export default {
height() {
return this.$store.state.app.height;
},
right() {
return this.$store.state.config.width / 2 - 55;
},
userId() {
return this.$store.state.user ? this.$store.state.user.id : '';
},
@ -209,7 +206,7 @@ export default {
}
});
},
'$store.state.app.windowSizeCount': function() {
'$store.state.app.windowSizeCount': function() { // 窗口变化
this.setWindowSize();
},
$route() {
@ -250,29 +247,18 @@ export default {
// 设置菜单和工具栏位置
setPosition() {
this.$nextTick(() => {
let offset = 10;
let offsetBottom = 15;
const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton');
if (menuBar) {
offset += (menuBar.offsetHeight || 0);
this.offset = (menuBar.offsetHeight || 0) + 15;
}
if (menuTool) {
offset += (menuTool.offsetHeight || 0);
this.offset = (menuTool.offsetHeight || 0) + 15;
}
const buttonWidth = this.width - 1200;
if (menuBottom && buttonWidth < 550) {
offsetBottom += (menuBottom.offsetHeight || 0);
}
if (this.$store.state.training.prdType === '07') {
offset = 10;
}
if (this.offset != offset) {
this.offset = offset;
}
if (this.offsetBottom != offsetBottom) {
this.offsetBottom = offsetBottom;
this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
}
});
},
@ -529,17 +515,10 @@ export default {
});
},
setWindowSize() {
// this.$nextTick(() => {
this.$store.dispatch('config/resize', { width: this.width, height: this.height });
if (this.prdType == '07') {
const width = this.$store.state.app.width - 2;
const height = this.$store.state.app.height;
this.$store.dispatch('config/resize', { width, height });
this.setBigScreenMode();
} else {
this.$store.dispatch('config/resize', { width: this.width, height: this.height });
// this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
}
// });
},
switchStationMode(stationCode) {
this.showStation = stationCode;

10
src/views/newMap/jointTrainingNew/menuSchema.vue
View File

@ -4,7 +4,7 @@
<el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
<el-button-group>
<el-button v-if="userRole=== 'DISPATCHER'" size="small" @click="goBigScreen">大屏</el-button>
<el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice" size="small" @click="goBigScreen">大屏</el-button>
<el-button v-if="runing && !dataError" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
<template v-if="isAdmin">
<el-button v-if="!runing && !dataError" size="small" type="warning" @click="loadRunPlan">
@ -154,12 +154,12 @@ export default {
},
setRuning(run) {
this.runing = run;
},
// 选择车站
},
// 选择车站
switchStationMode(stationCode) {
this.$emit('switchStationMode', stationCode);
},
// 点击大屏预览
},
// 点击大屏预览
goBigScreen() {
const routeData = this.$router.resolve({
path:`/displayBigScreen/${this.$route.query.mapId}`,