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 2021-04-01 16:37:25 +08:00
commit baf424cfad
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/planMonitor/components/menus/addTask.vue
View File

@ -420,7 +420,6 @@ export default {
this.addModel.endSectionCode = row.endSectionCode;
this.addModel.startSectionCode = row.startSectionCode;
this.addModel.routingCode = row.id;
debugger;
this.addModel.startTbFront = row.startTbFront;
this.addModel.endTbFront = row.endTbFront;
this.computedDetailList('routingCode');

4
src/views/planMonitor/components/menus/editPlanningTrain.vue
View File

@ -104,8 +104,8 @@ export default {
tripNumber: tripNumber,
startStationCode:trainInfo.stationTimeList[0].stationCode,
endStationCode:trainInfo.stationTimeList[lastIndex].stationCode,
startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
endTime: formatTime(trainInfo.stationTimeList[lastIndex - 1].secondTime + 7200),
startTime: formatTime(trainInfo.startSecondTime + 7200),
endTime: formatTime(trainInfo.endSecondTime + 7200),
arriveConfigList: [],
startSectionCode:trainInfo.startSectionCode,
endSectionCode:trainInfo.endSectionCode,

14
src/views/planMonitor/components/menus/modifyingTask.vue
View File

@ -126,7 +126,7 @@
</el-dialog>
</template>
<script>
import { getRoutingBySDTNumber, updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
import { updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
import { getRunplanConfig } from '@/api/jmap/mapdraft';
import { formatTime, formatName } from '@/jmapNew/theme/parser/util';
@ -319,7 +319,11 @@ export default {
const paramData = params.rowData;
this.initRunlevel(paramData);
this.editModel.arriveConfigList = paramData.arriveConfigList;
// this.editModel.routingCode = paramData.routingCode;
if (paramData.routingCode) {
this.editModel.routingCode = paramData.routingCode;
} else {
this.editModel.tripNumber = this.tripNumber;
}
this.editModel.startStationCode = paramData.startStationCode;
this.editModel.endStationCode = paramData.endStationCode;
this.editModel.startTime = paramData.startTime;
@ -337,8 +341,8 @@ export default {
const lastIndex = trainInfo.stationTimeList.length - 1;
this.editModel = {
tripNumber: this.tripNumber,
startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime + 7200),
startTime: formatTime(trainInfo.startSecondTime + 7200),
endTime: formatTime(trainInfo.endSecondTime + 7200),
arriveConfigList: [],
startStationCode:trainInfo.stationTimeList[0].stationCode,
endStationCode:trainInfo.stationTimeList[lastIndex].stationCode,
@ -347,7 +351,7 @@ export default {
};
if (trainInfo.startSectionCode != trainInfo.stationTimeList[0].sectionCode) {
this.startTbFront = false;
this.editModel.startTime = formatTime(trainInfo.startSecondTime + 7200);
// this.editModel.startTime = formatTime(trainInfo.startSecondTime + 7200);
const newModel = {
sectionCode:trainInfo.startSectionCode,
stationCode:trainInfo.stationTimeList[0].stationCode,