bug修复 【ID1000402】 【运行图编制】缺少测试运行功能
This commit is contained in:
parent
93a7c42748
commit
ad0ac9b277
@ -349,6 +349,15 @@ export function simulationLoadRunPlan(group, templateId) {
|
|||||||
method: 'put'
|
method: 'put'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 仿真里加载草稿运行图 */
|
||||||
|
export function simulationLoadDraftRunPlan(group, draftRunPlanId) {
|
||||||
|
return request({
|
||||||
|
url:`/simulation/${group}/load/draftRunPlan/${draftRunPlanId} `,
|
||||||
|
method: 'put'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/** 根据车次号获取列车信息 */
|
/** 根据车次号获取列车信息 */
|
||||||
export function getTrainDetailBytripNumber(group, params) {
|
export function getTrainDetailBytripNumber(group, params) {
|
||||||
return request({
|
return request({
|
||||||
|
@ -91,6 +91,12 @@ export default {
|
|||||||
MovePlaningTrain,
|
MovePlaningTrain,
|
||||||
CreateEmptyPlan
|
CreateEmptyPlan
|
||||||
},
|
},
|
||||||
|
props:{
|
||||||
|
planId: {
|
||||||
|
type: String,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
PlanParser: {},
|
PlanParser: {},
|
||||||
@ -118,9 +124,10 @@ export default {
|
|||||||
this.refreshRunPlanList(true);
|
this.refreshRunPlanList(true);
|
||||||
generateRunPlanInfoSync(this.$route.query.mapId);
|
generateRunPlanInfoSync(this.$route.query.mapId);
|
||||||
}
|
}
|
||||||
debugger;
|
if (this.planId) {
|
||||||
const runPlanInfo = this.$store.state.rpTools.runPlanInfo;
|
this.loadRunPlanId = this.planId;
|
||||||
debugger;
|
this.refresh();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
},
|
},
|
||||||
@ -210,7 +217,7 @@ export default {
|
|||||||
this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, planName: name }});
|
this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, planName: name }});
|
||||||
},
|
},
|
||||||
pictureChange(data) {
|
pictureChange(data) {
|
||||||
this.$emit('pictureChange', data.name);
|
this.$emit('pictureChange', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -138,7 +138,7 @@ import { planEffectiveCheck, clearPlaningData } from '@/api/runplan';
|
|||||||
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';
|
||||||
import { simulationLoadRunPlan } from '@/api/simulation';
|
import { simulationLoadDraftRunPlan } from '@/api/simulation';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'PlanMenuBar',
|
name: 'PlanMenuBar',
|
||||||
@ -724,9 +724,9 @@ export default {
|
|||||||
// 测试运行图
|
// 测试运行图
|
||||||
handleTestRunPlan() {
|
handleTestRunPlan() {
|
||||||
if (this.loadRunPlanId) {
|
if (this.loadRunPlanId) {
|
||||||
// simulationLoadRunPlan(this.$route.query.group, this.loadRunPlanId).then(resp => {
|
simulationLoadDraftRunPlan(this.$route.query.group, this.loadRunPlanId).then(resp => {
|
||||||
this.$emit('pictureChange', {name:'testRunplan'});
|
this.$emit('pictureChange', {name:'testRunplan', planId:this.loadRunPlanId});
|
||||||
// });
|
});
|
||||||
} else {
|
} else {
|
||||||
this.$messageBox(this.$t('tip.selectARunGraphFirst'));
|
this.$messageBox(this.$t('tip.selectARunGraphFirst'));
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
<train-ticket v-else-if="picture === 'trainTicket'" ref="trainTicket" />
|
<train-ticket v-else-if="picture === 'trainTicket'" ref="trainTicket" />
|
||||||
<diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
|
<diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
|
||||||
<diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
|
<diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
|
||||||
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" @pictureChange="pictureChange" />
|
<diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
|
||||||
<pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
|
<pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
|
||||||
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
|
<display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
|
||||||
<tro-work v-else-if="picture === 'troWork'" ref="troWork" />
|
<tro-work v-else-if="picture === 'troWork'" ref="troWork" />
|
||||||
@ -33,7 +33,7 @@
|
|||||||
<jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
|
<jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
|
||||||
<interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
|
<interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
|
||||||
|
|
||||||
<test-runplan v-if="picture=='testRunplan'" ref="testRunplan" @pictureChange="pictureChange" />
|
<test-runplan v-if="picture=='testRunplan'" ref="testRunplan" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
|
||||||
|
|
||||||
<terminal-menu
|
<terminal-menu
|
||||||
v-if="menuShow"
|
v-if="menuShow"
|
||||||
@ -122,6 +122,7 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
picture: '',
|
picture: '',
|
||||||
|
loadPlanId:'',
|
||||||
centralizedStationList: [],
|
centralizedStationList: [],
|
||||||
centralizedStationMap: {},
|
centralizedStationMap: {},
|
||||||
loading: false,
|
loading: false,
|
||||||
@ -251,6 +252,10 @@ export default {
|
|||||||
loadingChange() {
|
loadingChange() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
},
|
},
|
||||||
|
pictureChangeAndPlan(data) {
|
||||||
|
this.pictureChange(data.name);
|
||||||
|
this.loadPlanId = data.planId;
|
||||||
|
},
|
||||||
pictureChange(val) {
|
pictureChange(val) {
|
||||||
this.picture = val;
|
this.picture = val;
|
||||||
this.$store.dispatch('map/setPicture', this.picture);
|
this.$store.dispatch('map/setPicture', this.picture);
|
||||||
|
@ -12,6 +12,12 @@ export default {
|
|||||||
components: {
|
components: {
|
||||||
StationDiagram
|
StationDiagram
|
||||||
},
|
},
|
||||||
|
props:{
|
||||||
|
planId: {
|
||||||
|
type: String,
|
||||||
|
required: true
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
selected: null
|
selected: null
|
||||||
@ -53,7 +59,7 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
backTo() {
|
backTo() {
|
||||||
this.$emit('pictureChange', 'diagramEdit');
|
this.$emit('pictureChange', {name:'diagramEdit', planId:this.planId});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -61,7 +67,7 @@ export default {
|
|||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.backTo{
|
.backTo{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right:0px;
|
right: 15px;
|
||||||
top:10px;
|
top: 15px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user