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:
joylink_cuiweidong 2023-01-16 18:22:40 +08:00
parent 0c7f55c911
commit 413ac96e01
7 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,16 @@ export default {
{ 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 && 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: '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' || (this.$route.query.client == 'diagramEdit' && this.$store.state.map.picture == 'testRunplan'));
} },
{ 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' || (this.$route.query.client == 'diagramEdit' && this.$store.state.map.picture == 'testRunplan'));
} },
{ label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } }
]
};
@ -94,6 +102,11 @@ export default {
'$store.state.training.simulationUserType': function (val) {
this.handleMenuShow();
},
'$store.state.map.picture': function (val) {
if (val == 'testRunplan') {
this.handleMenuShow();
}
},
'$store.state.socket.simulationOver':function(val) {
this.back();
},

3
src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
View File

@ -4,7 +4,7 @@
<div v-if="type=='generateRouting'">
<gernarate-plan ref="gernaratePlanTrain" :load-run-plan-id="loadRunPlanId" @close="closeDialog" @mapLoading="mapLoading" />
</div>
<jlmap-visual ref="jlmapVisual" v-loading="loadingMap" @onMenu="onContextmenu" @onSelect="clickEvent" />
<jlmap-visual ref="jlmapVisual" v-loading="loadingMap" type="routeMap" @onMenu="onContextmenu" @onSelect="clickEvent" />
<!-- :style="{height: $store.state.app.height-54+'px' }" -->
<div v-if="type=='routeMap'" class="routeMap">
<route-config ref="routeConfig" />
@ -113,7 +113,6 @@ export default {
width = this.$store.state.app.width - 500;
} else {
width = this.$store.state.app.width * 0.7;
}
const height = this.$store.state.app.height - 49;
this.$store.dispatch('config/resize', { width, height });

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

@ -10,6 +10,7 @@
@loadingRunPlan="loadingRunPlan"
@modifyRunPlanName="modifyRunPlanName"
@refresh="refreshRunPlanList"
@pictureChange="pictureChange"
@refreshData="refresh"
/>
<!-- :plan-parser="PlanParser" -->
@ -117,6 +118,9 @@ export default {
this.refreshRunPlanList(true);
generateRunPlanInfoSync(this.$route.query.mapId);
}
debugger;
const runPlanInfo = this.$store.state.rpTools.runPlanInfo;
debugger;
},
beforeDestroy() {
},
@ -204,6 +208,9 @@ export default {
this.$refs.schedule.refreshRunPlanName(name);
this.refreshRunPlanList(this.loadRunPlanId);
this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, planName: name }});
},
pictureChange(data) {
this.$emit('pictureChange', data.name);
}
}
};

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

@ -138,6 +138,7 @@ import { planEffectiveCheck, clearPlaningData } from '@/api/runplan';
import { EventBus } from '@/scripts/event-bus';
import { publishRunPlanAllUser } from '@/api/designPlatform';
import { deleteRunPlan } from '@/api/runplan';
import { simulationLoadRunPlan } from '@/api/simulation';
export default {
name: 'PlanMenuBar',
@ -285,11 +286,11 @@ export default {
{
title: this.$t('planMonitor.validityCheck'),
click: this.handlePlanEffectiveCheck
},
{
title: this.$t('planMonitor.testRunningDiagram'),
click: this.handleTestRunPlan
}
// {
// title: this.$t('planMonitor.testRunningDiagram'),
// click: this.handleTestRunPlan
// }
]
}
// {
@ -719,6 +720,16 @@ export default {
this.$messageBox(this.$t('tip.publishRunPlanFail'));
this.publishVisible = false;
});
},
// 测试运行图
handleTestRunPlan() {
if (this.loadRunPlanId) {
// simulationLoadRunPlan(this.$route.query.group, this.loadRunPlanId).then(resp => {
this.$emit('pictureChange', {name:'testRunplan'});
// });
} else {
this.$messageBox(this.$t('tip.selectARunGraphFirst'));
}
}
}
};

5
src/views/newMap/display/terminals/diagramEdit/statusBar.vue
View File

@ -160,9 +160,6 @@ export default {
handlePlanEffectiveCheck() {
const planId = this.loadRunPlanId;
if (planId) {
if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
this.$messageBox(' 功能待完善');
} else {
planEffectiveCheck(planId).then(resp => {
this.$emit('dispatchDialog', {
name: 'systermOut',
@ -174,8 +171,6 @@ export default {
}).catch(error => {
this.$messageBox(error.message + ' ' + this.$t('tip.runGraphVerificationFailed'));
});
}
} else {
this.$messageBox(this.$t('tip.selectARunGraphFirst'));
}

8
src/views/newMap/display/terminals/index.vue
View File

@ -25,7 +25,7 @@
<train-ticket v-else-if="picture === 'trainTicket'" ref="trainTicket" />
<diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
<diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" />
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" @pictureChange="pictureChange" />
<pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
<tro-work v-else-if="picture === 'troWork'" ref="troWork" />
@ -33,6 +33,8 @@
<jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
<interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
<test-runplan v-if="picture=='testRunplan'" ref="testRunplan" @pictureChange="pictureChange" />
<terminal-menu
v-if="menuShow"
ref="terminalMenu"
@ -79,6 +81,7 @@ import DiagramEdit from './diagramEdit/index';
import DisplayBaSiDi from './displayBaSiDi/index';
import TroWork from './troWork';
import TroDetailWork from './troDetailWork';
import TestRunplan from './testRunplan';
export default {
name: 'Index',
@ -113,7 +116,8 @@ export default {
DiagramEdit,
DisplayBaSiDi,
TroDetailWork,
Jl3dMaintainerSelect
Jl3dMaintainerSelect,
TestRunplan
},
data() {
return {

8
src/views/newMap/jlmapNew/index.vue
View File

@ -55,6 +55,12 @@ export default {
default() {
return false;
}
},
type:{
type: String,
default() {
return '';
}
}
},
data() {
@ -212,7 +218,9 @@ export default {
EventBus.$off('viewProgressAt');
this.$store.dispatch('socket/clearSimulationRoleList');
this.$store.dispatch('menuOperation/resetRequestList');
if (this.type != 'routeMap') {
this.$store.dispatch('map/mapClear');
}
if (this.$jlmap) {
this.$jlmap.dispose();
Vue.prototype.$jlmap = null;