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-06-10 11:23:30 +08:00
commit 3b63d62eae
5 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
View File

@ -33,31 +33,35 @@
<div class="modifyTripNumberTip">原列车信息</div>
<div class="modifyTripNumberS">
<div class="modifyTripNumberName">到达车次：</div>
<el-input type="text" class="" size="mini" style="width: 95px;" disabled />
<el-input v-model="oldArriveTripNumber" type="text" class="" size="mini" style="width: 95px;" disabled />
</div>
<div class="modifyTripNumberE">
<div class="modifyTripNumberName">出发车次：</div>
<el-input type="text" class="" size="mini" style="width: 95px;" disabled />
<el-input v-model="oldDepartTripNumber" type="text" class="" size="mini" style="width: 95px;" disabled />
</div>
</div>
<div class="modifyTripNumberBR">
<div class="modifyTripNumberTip">新列车信息</div>
<div class="modifyTripNumberS">
<div class="modifyTripNumberName">到达车次：</div>
<el-input type="text" class="" size="mini" style="width: 95px;" />
<el-input v-model="model.arriveTripNumber" type="text" class="" size="mini" style="width: 95px;" />
</div>
<div class="modifyTripNumberE">
<div class="modifyTripNumberName">出发车次：</div>
<el-input type="text" class="" size="mini" style="width: 95px;" />
<el-input v-model="model.departTripNumber" type="text" class="" size="mini" style="width: 95px;" />
</div>
</div>
</div>
<el-checkbox-group v-model="trainTypeList" style="text-align:center;margin-top:10px">
<el-checkbox label="保留车" name="type" />
<el-checkbox label="终到车" name="type" />
</el-checkbox-group>
</div>
<el-row justify="center" class="button-group">
<el-col :span="8" :offset="4">
<el-row justify="center" style="margin-top:10px">
<el-col :span="7" :offset="5">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="1">
<el-col :span="7" :offset="2">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
@ -78,6 +82,9 @@ export default {
return {
dialogShow: false,
loading: false,
oldArriveTripNumber:'',
oldDepartTripNumber:'',
trainTypeList:[],
model:{
stationCode:'', // 车站编码
runPlanCode:'', // 运行编码
@ -107,8 +114,8 @@ export default {
doShow(row) {
this.model.stationCode = row.stationCode;
this.model.runPlanCode = row.code;
this.model.arriveTripNumber = (row.arriveRunPlan && row.arriveRunPlan.tripNumber) || '';
this.model.departTripNumber = (row.departRunPlan && row.departRunPlan.tripNumber) || '';
this.oldArriveTripNumber = (row.arriveRunPlan && row.arriveRunPlan.arriveTripNumber) || '';
this.oldDepartTripNumber = (row.departRunPlan && row.departRunPlan.departTripNumber) || '';
this.dialogShow = true;
this.$nextTick(function () {
this.$store.dispatch('training/emitTipFresh');
@ -170,3 +177,7 @@ export default {
.modifyTripNumberName{display: inline-block;}
.modifyTripNumberE{margin-top:10px;}
</style>
<style lang="scss">
.chengdou-03__systerm .el-dialog .modifyTripNumber .el-checkbox-group .el-checkbox .el-checkbox__label{font-size: 15px !important;line-height: 16px;}
.chengdou-03__systerm .el-dialog .modifyTripNumber .el-checkbox-group .el-checkbox .el-checkbox__input{vertical-align: top;line-height: 16px;}
</style>

11
src/jmapNew/theme/datie_02/menus/runplanPane.vue
View File

@ -86,7 +86,11 @@
prop="tripNumber"
label=""
width="100"
/>
>
<template slot-scope="scope">
<div>{{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':'' }}</div>
</template>
</el-table-column>
<el-table-column label="到 达">
<el-table-column label="列 车 车 次" style="text-align:center">
<el-table-column width="80" prop="arriveRunPlan.down">
@ -524,8 +528,7 @@ export default {
])
},
watch:{
'$store.state.socket.railCtcRunplanInitMsg': function (val) {
debugger;
'$store.state.socket.railCtcRunplanChange': function (val) {
const railCtcRunplanInitMsg = this.$store.state.socket.railCtcRunplanInitMsg;
this.tableData = Object.values(railCtcRunplanInitMsg).filter(data=>{ return data.stationCode == this.$store.state.training.roleDeviceCode; });
}
@ -559,6 +562,8 @@ export default {
},
doClose() {
this.isShow = false;
this.rpMenuPopShow = false;
this.currentRow = null;
},
sendRunplan() {
if (document.getElementById('sendRunplan').className.includes('active')) {

4
src/store/modules/socket.js
View File

@ -216,6 +216,7 @@ function handle(state, data) {
msg.forEach(element => {
state.railCtcRunplanInitMsg[element.code] = copyAssign(state.railCtcRunplanInitMsg[element.code], element);
});
state.railCtcRunplanChange++;
break;
}
}
@ -368,7 +369,8 @@ const socket = {
simulationPlanChange:{}, // 运行图加线/抽线/变化推送消息
loggedOutMsg: '',
railCtcStatusMsg: {}, // 占线板信息
railCtcRunplanInitMsg:{} // 大铁项目 ctc 运行图初始化信息
railCtcRunplanInitMsg:{}, // 大铁项目 ctc 运行图初始化信息
railCtcRunplanChange:0 // 大铁项目 ctc 运行图信息变化
},
getters: {
},

4
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/detail.vue
View File

@ -49,6 +49,10 @@
title: 'code',
prop: 'code'
},
{
title: '名称',
prop: 'name'
},
{
title: '关联车站',
prop: 'stationCode',

8
src/views/newMap/newMapdraft/dataRelation/indicatorAssociatedInfo/route.vue
View File

@ -4,6 +4,9 @@
<el-form-item v-if="isModify" label="编号:" prop="code">
<el-input v-model="addModel.code" style="width: 220px;" disabled />
</el-form-item>
<el-form-item label="名称:" prop="name">
<el-input v-model="addModel.name" style="width: 220px;" />
</el-form-item>
<el-form-item label="关联车站:" prop="stationCode">
<el-select v-model="addModel.stationCode" clearable filterable>
<el-option
@ -145,6 +148,7 @@
directionLabelList: ConstConfig.ConstSelect.directionLabelList,
addModel:{
id: '',
name:'',
stationCode: '',
labelEnum:'',
sectionList: [],
@ -155,6 +159,9 @@
relativeLabelEnum: ''
},
rules: {
'name':[
{ required: true, message: '请输入名称', trigger: 'blur' },
],
'stationCode':[
{ required: true, message: '请选择关联车站', trigger: 'blur' },
{ required: true, message: '请选择关联车站', trigger: 'change' },
@ -260,6 +267,7 @@
this.$refs.form.resetFields();
this.addModel = {
id: '',
name:'',
stationCode: '',
labelEnum:'',
sectionList: [],