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-13 17:31:23 +08:00
commit 11d75a76a6
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,20 +111,20 @@
<el-date-picker v-model="model.arrivePlanTime" type="datetime" :disabled="model.startRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
</el-form-item>
<el-form-item label="" prop="startRunPlan" class="noMargin" style="margin-left:10px;">
<el-checkbox v-model="model.startRunPlan">始发</el-checkbox>
<el-checkbox v-model="model.startRunPlan" @change="changeStartRp">始发</el-checkbox>
</el-form-item>
<el-form-item label="出发时间:" prop="departPlanTime" style="margin-left:10px;">
<el-date-picker v-model="model.departPlanTime" type="datetime" :disabled="model.endRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
</el-form-item>
<el-form-item label="" prop="endRunPlan" class="noMargin" style="margin-left:10px;">
<el-checkbox v-model="model.endRunPlan">终到</el-checkbox>
<el-checkbox v-model="model.endRunPlan" @change="changeEndRp">终到</el-checkbox>
</el-form-item>
<div>
<el-form-item label="" prop="arriveElectrical" class="noMargin" style="margin-left:80px;margin-bottom: 0px;">
<el-checkbox v-model="model.arriveElectrical">到达电力</el-checkbox>
<el-checkbox v-model="model.arriveElectrical" :disabled="model.startRunPlan">到达电力</el-checkbox>
</el-form-item>
<el-form-item label="" prop="departElectrical" class="noMargin" style="margin-left:80px;">
<el-checkbox v-model="model.departElectrical">出发电力</el-checkbox>
<el-checkbox v-model="model.departElectrical" :disabled="model.endRunPlan">出发电力</el-checkbox>
</el-form-item>
</div>
<el-form-item label="" prop="passenger" class="noMargin" style="margin-left:30px;">
@ -222,13 +222,13 @@ export default {
arrivePlanTime:'', // 到达计划时间
arriveTripNumber:'', // 到达车次
arriveDirectionCode:'', // 到达方向编码（到达口）
arriveTransfinite:'', // 到达超限
arriveTransfinite:null, // 到达超限
arriveElectrical:false, // 到达电力
departSectionCode:'', // 发车股道
departPlanTime:'', // 发车计划时间
departTripNumber:'', // 发车车次
departDirectionCode:'', // 发向方向编码（发车口）
departTransfinite:'', // 出发超限
departTransfinite:null, // 出发超限
departElectrical:false, // 出发电力
startRunPlan:false, // 始发计划 true,false
@ -306,11 +306,33 @@ export default {
} else {
this.title = '新增列车信息';
this.model.stationCode = row.stationCode;
this.model.trainType = 'LOCAL_EXPRESS_PASSENGER_TRAIN'; // 列车类型
this.model.runType = 'FAST_PASSENGER_TRAIN'; // 运行类型
}
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
});
},
changeEndRp(data) {
if (data) {
this.model.departSectionCode = '';
this.model.departPlanTime = '';
this.model.departTripNumber = '';
this.model.departDirectionCode = '';
this.model.departTransfinite = null;
this.model.departElectrical = false;
}
},
changeStartRp(data) {
if (data) {
this.model.arriveSectionCode = '';
this.model.arrivePlanTime = '';
this.model.arriveTripNumber = '';
this.model.arriveDirectionCode = '';
this.model.arriveTransfinite = null;
this.model.arriveElectrical = false;
}
},
doClose() {
this.loading = false;
this.dialogShow = false;
@ -324,13 +346,13 @@ export default {
arrivePlanTime:'', // 到达计划时间
arriveTripNumber:'', // 到达车次
arriveDirectionCode:'', // 到达方向编码（到达口）
arriveTransfinite:'', // 到达超限
arriveTransfinite:null, // 到达超限
arriveElectrical:false, // 到达电力
departSectionCode:'', // 发车股道
departPlanTime:'', // 发车计划时间
departTripNumber:'', // 发车车次
departDirectionCode:'', // 发向方向编码（发车口）
departTransfinite:'', // 出发超限
departTransfinite:null, // 出发超限
departElectrical:false, // 出发电力
startRunPlan:false, // 始发计划 true,false

28
src/views/dispatcherLoger/addDispatcherLogerRunplan.vue
View File

@ -91,13 +91,13 @@
<el-date-picker v-model="model.arrivePlanTime" type="datetime" :disabled="model.startRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
</el-form-item>
<el-form-item label="" prop="startRunPlan" class="noMargin" style="margin-left:10px;">
<el-checkbox v-model="model.startRunPlan">始发</el-checkbox>
<el-checkbox v-model="model.startRunPlan" @change="changeStartRp">始发</el-checkbox>
</el-form-item>
<el-form-item label="出发时间:" prop="departPlanTime" style="margin-left:10px;">
<el-date-picker v-model="model.departPlanTime" type="datetime" :disabled="model.endRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
</el-form-item>
<el-form-item label="" prop="endRunPlan" class="noMargin" style="margin-left:10px;">
<el-checkbox v-model="model.endRunPlan">终到</el-checkbox>
<el-checkbox v-model="model.endRunPlan" @change="changeEndRp">终到</el-checkbox>
</el-form-item>
<el-form-item label="" prop="electrical" class="noMargin" style="margin-left:80px;">
<el-checkbox v-model="model.electrical">电力</el-checkbox>
@ -209,13 +209,13 @@ export default {
arriveSectionCode:'', // 到达股道
arrivePlanTime:'', // 到达计划时间
arriveTripNumber:'', // 到达车次
arriveStationCode:'', // 到达车站
// arriveStationCode:'', // 到达车站
arriveDirectionCode:'', // 到达方向编码（到达口）
departSectionCode:'', // 发车股道
departPlanTime:'', // 发车计划时间
departTripNumber:'', // 发车车次
departStationCode:'', // 发车车站
// departStationCode:'', // 发车车站
departDirectionCode:'', // 发向方向编码（发车口）
startRunPlan:false, // 始发计划 true,false
@ -278,6 +278,22 @@ export default {
this.filterArrSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; });
this.filterDepSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; });
},
changeEndRp(data) {
if (data) {
this.model.departSectionCode = '';
this.model.departPlanTime = '';
this.model.departTripNumber = '';
this.model.departDirectionCode = '';
}
},
changeStartRp(data) {
if (data) {
this.model.arriveSectionCode = '';
this.model.arrivePlanTime = '';
this.model.arriveTripNumber = '';
this.model.arriveDirectionCode = '';
}
},
doClose() {
this.loading = false;
this.dialogShow = false;
@ -288,12 +304,12 @@ export default {
arriveSectionCode:'', // 到达股道
arrivePlanTime:'', // 到达计划时间
arriveTripNumber:'', // 到达车次
arriveStationCode:'', // 到达车站
// arriveStationCode:'', // 到达车站
arriveDirectionCode:'', // 到达方向编码（到达口）
departSectionCode:'', // 发车股道
departPlanTime:'', // 发车计划时间
departTripNumber:'', // 发车车次
departStationCode:'', // 发车车站
// departStationCode:'', // 发车车站
departDirectionCode:'', // 发向方向编码（发车口)
startRunPlan:false, // 始发计划 true,false