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:
fan 2022-07-15 09:17:12 +08:00
commit 97535872da
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue
View File

@ -41,7 +41,7 @@
width="105" width="105"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.arriveRunPlan" :title="scope.row.arriveRunPlan.accessName">{{ scope.row.arriveRunPlan.accessName }}</div> <div v-if="scope.row.arriveRunPlan" :title="mapStationDirectionData[scope.row.arriveRunPlan.accessName].name">{{ mapStationDirectionData[scope.row.arriveRunPlan.accessName].name }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -60,7 +60,7 @@
width="105" width="105"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.departRunPlan" :title="scope.row.departRunPlan.accessName">{{ scope.row.departRunPlan.accessName }}</div> <div v-if="scope.row.departRunPlan" :title="mapStationDirectionData[scope.row.departRunPlan.accessName].name">{{ mapStationDirectionData[scope.row.departRunPlan.accessName].name }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -152,6 +152,9 @@ export default {
}, },
title() { title() {
return '发送计划'; return '发送计划';
},
mapStationDirectionData() {
return this.$store.state.map.mapStationDirectionData;
} }
}, },
methods:{ methods:{

3
src/jmapNew/theme/datie_02/menus/dialog/trainRunplan.vue
View File

@ -287,7 +287,6 @@ export default {
// 到达 // 到达
if (row.arriveRunPlan) { if (row.arriveRunPlan) {
this.model.arriveSectionCode = row.arriveRunPlan.sectionCode; this.model.arriveSectionCode = row.arriveRunPlan.sectionCode;
// debugger;
this.model.arrivePlanTime = row.arriveRunPlan.planTime; this.model.arrivePlanTime = row.arriveRunPlan.planTime;
this.model.arriveTripNumber = row.arriveRunPlan.tripNumber; this.model.arriveTripNumber = row.arriveRunPlan.tripNumber;
this.model.arriveDirectionCode = row.arriveRunPlan.accessName; // 到达方向编码（到达口） this.model.arriveDirectionCode = row.arriveRunPlan.accessName; // 到达方向编码（到达口）
@ -296,7 +295,7 @@ export default {
} }
// 发车 // 发车
if (row.departRunPlan) { if (row.departRunPlan) {
this.model.departSectionCode = row.departRunPlan.planTime; this.model.departSectionCode = row.departRunPlan.sectionCode;
this.model.departPlanTime = row.departRunPlan.planTime; this.model.departPlanTime = row.departRunPlan.planTime;
this.model.departTripNumber = row.departRunPlan.tripNumber; this.model.departTripNumber = row.departRunPlan.tripNumber;
this.model.departDirectionCode = row.departRunPlan.accessName; this.model.departDirectionCode = row.departRunPlan.accessName;