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

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

View File

@ -60,15 +60,15 @@ export default {
deviceShow: true,
allMenuList: [
{ 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: '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: '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: '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: 'initialize', click: this.initializeSim, 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 && this.$route.query.client !== 'diagramEdit'; } },
{ label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } }
]
};
@ -264,7 +264,8 @@ export default {
width: 60px;
right: 10px;
padding: 9px 0;
background: #fff;
background: #409EFF;
color: #fbfbfb;
text-align: center;
bottom: 10px;
border-radius: 2px;
@ -276,7 +277,8 @@ export default {
right: 71px;
width: 95px;
bottom: 10px;
background: #fff;
background: #409EFF;
color: #fbfbfb;
// min-height: 100px;
border-radius: 2px;
font-size: 14px;
@ -293,7 +295,7 @@ export default {
user-select: none;
}
.eachSimulationMenu:hover {
background: #dedede;
background: #499cef;
}
.menuDisabled {
background: #ccc !important;

View File

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

View File

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

View File

@ -3,14 +3,13 @@
<img class="logo" :src="logoImg">
<span> {{ mapName }} &ensp;</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>
</template>
<script>
import logo_ from '@/assets/logo_.png';
import { getPublishMapInfo } from '@/api/jmap/map';
import { UrlConfig } from '@/scripts/ConstDic';
export default {
name: 'PlanTitleBar',
@ -31,9 +30,9 @@ export default {
});
},
methods: {
back() {
this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
}
// back() {
// this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
// }
}
};
</script>
@ -54,7 +53,7 @@ export default {
background: -moz-linear-gradient(#0055E8, #0099F8);
background: linear-gradient(#0055E8, #0099F8);
color: white;
font: bold;
font-weight: bold;
font-size: 16px;
.logo {