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

BUG:【仿真功能】哈尔滨仿真线路一、西安仿真线路三进入运行图编制工作站有问题

Browse Source
This commit is contained in:
fan 2023-01-03 11:26:56 +08:00
parent fdb244d802
commit d8a6e50601
4 changed files with 82 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -60,15 +60,15 @@ export default {
deviceShow: true, deviceShow: true,
allMenuList: [ allMenuList: [
{ label: '切换', name: 'switchOffset', click: this.switchOffset, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.ibp.moreScreen; } }, { label: '切换', name: 'switchOffset', click: this.switchOffset, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.ibp.moreScreen; } },
{ label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isDisabled: () => { return false; }, isShow: () => { return true; } }, { label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isDisabled: () => { return false; }, isShow: () => { return this.$route.query.client !== 'diagramEdit'; } },
{ label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } }, { label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } },
{ label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } }, { label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } },
{ label: '生成二维码', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '生成二维码', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
{ label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasLpf && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasLpf && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
{ label: '成员管理', name: 'memberManage', click: this.memberManage, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasMemberManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '成员管理', name: 'memberManage', click: this.memberManage, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasMemberManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
{ label: '考试', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '考试', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
{ label: '按计划行车', name: 'drivingPlan', click: this.drivingPlan, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '按计划行车', name: 'drivingPlan', click: this.drivingPlan, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$route.query.client !== 'diagramEdit'; } },
{ label: '初始化', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } }, { label: '初始化', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$route.query.client !== 'diagramEdit'; } },
{ label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } } { label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } }
] ]
}; };
@ -264,7 +264,8 @@ export default {
width: 60px; width: 60px;
right: 10px; right: 10px;
padding: 9px 0; padding: 9px 0;
background: #fff; background: #409EFF;
color: #fbfbfb;
text-align: center; text-align: center;
bottom: 10px; bottom: 10px;
border-radius: 2px; border-radius: 2px;
@ -276,7 +277,8 @@ export default {
right: 71px; right: 71px;
width: 95px; width: 95px;
bottom: 10px; bottom: 10px;
background: #fff; background: #409EFF;
color: #fbfbfb;
// min-height: 100px; // min-height: 100px;
border-radius: 2px; border-radius: 2px;
font-size: 14px; font-size: 14px;
@ -293,7 +295,7 @@ export default {
user-select: none; user-select: none;
} }
.eachSimulationMenu:hover { .eachSimulationMenu:hover {
background: #dedede; background: #499cef;
} }
.menuDisabled { .menuDisabled {
background: #ccc !important; background: #ccc !important;

9
src/views/newMap/display/terminals/diagramEdit/index.vue
View File

@ -65,7 +65,7 @@ import ModifyingStationIntervalTime from './components/menus/modifyingStationInt
import ModifyingStationStopTime from './components/menus/modifyingStationStopTime'; import ModifyingStationStopTime from './components/menus/modifyingStationStopTime';
import CreateEmptyPlan from './menus/createEmptyPlan'; import CreateEmptyPlan from './menus/createEmptyPlan';
import { deletePlanService } from '@/api/runplan'; import { deletePlanService } from '@/api/runplan';
import { loadMapDataById } from '@/utils/loaddata'; // import { loadMapDataById } from '@/utils/loaddata';
import { getRpListByMapId } from '@/api/runplan'; import { getRpListByMapId } from '@/api/runplan';
export default { export default {
@ -112,10 +112,8 @@ export default {
this.PlanParser = this.$theme.loadPlanParser(this.lineCode); this.PlanParser = this.$theme.loadPlanParser(this.lineCode);
}, },
async mounted() { async mounted() {
// this.loadRunPlanName = this.$route.query.planName;
if (this.$route.query.mapId) { if (this.$route.query.mapId) {
this.refreshRunPlanList(true); this.refreshRunPlanList(true);
await this.loadMap();
} }
}, },
beforeDestroy() { beforeDestroy() {
@ -139,11 +137,6 @@ export default {
} }
}); });
}, },
async loadMap() {
this.runplanLoading = true;
// 加载地图数据
loadMapDataById(this.$route.query.mapId, 'parse');
},
handleConfirm(params) { handleConfirm(params) {
if (params.operate == 'AddPlanningTrain') { if (params.operate == 'AddPlanningTrain') {
// 添加计划 // 添加计划

4
src/views/newMap/display/terminals/diagramEdit/menuBar.vue
View File

@ -135,8 +135,6 @@ import { mapGetters } from 'vuex';
import routeMap from './components/routingoperate/routeMap'; import routeMap from './components/routingoperate/routeMap';
import RunplanConfig from './components/routingoperate/runplanConfig'; import RunplanConfig from './components/routingoperate/runplanConfig';
import { planEffectiveCheck, clearPlaningData } from '@/api/runplan'; import { planEffectiveCheck, clearPlaningData } from '@/api/runplan';
// import { launchFullscreen } from '@/utils/screen';
// import { UrlConfig } from '@/scripts/ConstDic';
import { EventBus } from '@/scripts/event-bus'; import { EventBus } from '@/scripts/event-bus';
import { publishRunPlanAllUser } from '@/api/designPlatform'; import { publishRunPlanAllUser } from '@/api/designPlatform';
import { deleteRunPlan } from '@/api/runplan'; import { deleteRunPlan } from '@/api/runplan';
@ -376,7 +374,6 @@ export default {
}, },
methods: { methods: {
back() { back() {
// this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
if (this.dispaly) { if (this.dispaly) {
this.$emit('doClose'); this.$emit('doClose');
} else if (this.closeWindow) { } else if (this.closeWindow) {
@ -537,7 +534,6 @@ export default {
// 生成计划 // 生成计划
handleGernaratePlanningTrain() { handleGernaratePlanningTrain() {
if (this.loadRunPlanId) { if (this.loadRunPlanId) {
// this.$emit('dispatchDialog', { name: 'gernaratePlanTrain', params: {} });
this.$refs.routeMap.doShow('generateRouting'); this.$refs.routeMap.doShow('generateRouting');
} else { } else {
this.$messageBox(this.$t('tip.selectARunGraphFirst')); this.$messageBox(this.$t('tip.selectARunGraphFirst'));

147
src/views/newMap/display/terminals/diagramEdit/titleBar.vue
View File

@ -1,74 +1,73 @@
<template> <template>
<div id="PlanTitleBar"> <div id="PlanTitleBar">
<img class="logo" :src="logoImg"> <img class="logo" :src="logoImg">
<span> {{ mapName }} &ensp;</span> <span> {{ mapName }} &ensp;</span>
<span v-if="runPlanName">({{ runPlanName }})</span> <span v-if="runPlanName">({{ runPlanName }})</span>
<span class="system-close el-icon-close" @click="back" /> <!-- <span class="system-close el-icon-close" @click="back" />-->
</div> </div>
</template> </template>
<script> <script>
import logo_ from '@/assets/logo_.png'; import logo_ from '@/assets/logo_.png';
import { getPublishMapInfo } from '@/api/jmap/map'; import { getPublishMapInfo } from '@/api/jmap/map';
import { UrlConfig } from '@/scripts/ConstDic';
export default {
export default { name: 'PlanTitleBar',
name: 'PlanTitleBar', data() {
data() { return {
return { mapName: '',
mapName: '', logoImg: logo_
logoImg: logo_ };
}; },
}, computed: {
computed: { runPlanName() {
runPlanName() { return this.$route.query.planName || '';
return this.$route.query.planName || ''; }
} },
}, mounted() {
mounted() { getPublishMapInfo(this.$route.query.mapId).then(resp => {
getPublishMapInfo(this.$route.query.mapId).then(resp => { this.mapName = resp.data.name;
this.mapName = resp.data.name; });
}); },
}, methods: {
methods: { // back() {
back() { // this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` }); // }
} }
} };
}; </script>
</script> <style scoped rel="stylesheet/scss" lang="scss">
<style scoped rel="stylesheet/scss" lang="scss"> @import "src/styles/mixin.scss";
@import "src/styles/mixin.scss"; $width: 25px;
$width: 25px; $height: 25px;
$height: 25px;
#PlanTitleBar {
#PlanTitleBar { z-index: 10;
z-index: 10; display: flex;
display: flex; position: absolute;
position: absolute; width: 100%;
width: 100%; height: $height;
height: $height; line-height: $height;
line-height: $height; background: -webkit-linear-gradient(#0055E8, #0099F8);
background: -webkit-linear-gradient(#0055E8, #0099F8); background: -o-linear-gradient(#0055E8, #0099F8);
background: -o-linear-gradient(#0055E8, #0099F8); background: -moz-linear-gradient(#0055E8, #0099F8);
background: -moz-linear-gradient(#0055E8, #0099F8); background: linear-gradient(#0055E8, #0099F8);
background: linear-gradient(#0055E8, #0099F8); color: white;
color: white; font-weight: bold;
font: bold; font-size: 16px;
font-size: 16px;
.logo {
.logo { display: inline-block;
display: inline-block; width: $width;
width: $width; height: $height;
height: $height; padding-right: 5px;
padding-right: 5px; }
}
.system-close {
.system-close { width: 25px;
width: 25px; height: 25px;
height: 25px; position: absolute;
position: absolute; right: 1px;
right: 1px; }
} }
} </style>
</style>