joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

哈尔滨操作调整

Browse Source
This commit is contained in:
fan 2020-11-26 14:26:35 +08:00
parent 10d8b674b4
commit 8b8b5bd028
3 changed files with 171 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
View File

@ -52,7 +52,7 @@
</el-table-column>
<el-table-column prop="tripNumber" label="车次号">
<template slot-scope="scope">
<span>{{ scope.row.serviceNumber+scope.row.tripNumber+scope.row.destinationCode }}</span>
<span>{{ scope.row.destinationCode+scope.row.serviceNumber+scope.row.tripNumber }}</span>
</template>
</el-table-column>
</el-table>
@ -157,7 +157,7 @@ export default {
if (device && device.code && device.deviceType === 'TRAIN') {
this.tempTableData = [device];
this.sectionCode = device.sectionModel.name;
this.tripNum = device.serviceNumber + device.tripNumber + device.destinationCode;
this.tripNum = device.destinationCode + device.serviceNumber + device.tripNumber;
this.groupNum = device.groupNumber;
}
}
@ -186,11 +186,11 @@ export default {
},
commit() {
this.newTripNumError = false;
if (this.newTripNum && this.newTripNum.length === 8) {
if (this.newTripNum && this.newTripNum.length === 9) {
const params = {
groupNumber: this.groupNumber,
tripNumber: this.newTripNum.slice(3, 6),
serviceNumber: this.newTripNum.slice(0, 3)
tripNumber: this.newTripNum.slice(6, 9),
serviceNumber: this.newTripNum.slice(3, 6)
};
const step = {
over: true,

114
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -2,7 +2,7 @@
<div id="menuButton" class="menuButton">
<div class="haerbin-01__systerm button">
<el-row>
<el-col :span="11">
<el-col v-if="!trainOperationShow" :span="11">
<div v-if="secondConfirm" class="nav-border">
<el-row>
<div class="nav-border-top-cr">
@ -41,7 +41,7 @@
</el-row>
</div>
</el-col>
<el-col :span="10">
<el-col v-if="!trainOperationShow" :span="10">
<div class="nav-border">
<div class="nav-border-top">
<el-button :id="commandId" class="fl" :class="{'disabled': canCommand || secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand || secondConfirm" @click="command">执行</el-button>
@ -64,11 +64,59 @@
</div>
</div>
</el-col>
<el-col v-if="trainOperationShow" :span="10" style="padding: 1px;">
<div class="nav-border" style="padding: 5px;">
<el-row style="height: 25px;">
<div style="display: flex;justify-content: space-between">
<el-button size="mini" plain>车次号修改</el-button>
<el-button size="mini" plain :disabled="true">车次号删除</el-button>
<el-button size="mini" plain :disabled="true">车次号创建</el-button>
<el-button size="mini" plain :disabled="true">车次号步进</el-button>
</div>
</el-row>
<el-row style="height: 25px;line-height: 25px;border-top: 2px solid #7E8076;border-left: 2px solid #6A6B64;border-right: 2px solid #FBFBFA;">
<el-col :span="6" style="border-right: 1px solid #808080;">轨道号</el-col>
<el-col :span="6" style="border-right: 1px solid #808080;border-left: 1px solid #FBFBFB;">车次号</el-col>
<el-col :span="6" style="border-right: 1px solid #808080;border-left: 1px solid #FBFBFB;">车底号1</el-col>
<el-col :span="6" style="border-left: 1px solid #FBFBFB;">车底号2</el-col>
</el-row>
<el-row style="height: 25px;line-height: 25px;border-left: 2px solid #6A6B64;border-right: 2px solid #FBFBFA;color: #FFF;">
<el-col :span="6" style="background-color: #0A246A;border-right: 1px solid #475475;height: 25px;">{{ (trainModel.sectionModel || {}).name }}</el-col>
<el-col :span="6" style="background-color: #0A246A;border-right: 1px solid #475475;border-left: 1px solid #7F7F7F;height: 25px;">{{ trainModel.serviceNumber?trainModel.destinationCode + trainModel.serviceNumber + trainModel.tripNumber:'' }}</el-col>
<el-col :span="6" style="background-color: #0A246A;border-right: 1px solid #475475;border-left: 1px solid #7F7F7F;height: 25px;" />
<el-col :span="6" style="background-color: #0A246A;border-left: 1px solid #7F7F7F;height: 25px;" />
</el-row>
</div>
</el-col>
<el-col v-if="trainOperationShow" :span="5" style="padding: 1px;">
<div class="nav-border" style="padding: 5px;">
<el-row style="display: flex;align-items: center;">
<el-col :span="7" style="height: 25px;line-height: 25px;">车次号</el-col>
<el-col :span="17"><el-input v-model="formModelTripNum" size="mini" style="height: 20px;" :disabled="true" /></el-col>
</el-row>
<el-row style="display: flex;align-items: center;">
<el-col :span="7" style="height: 25px;line-height: 25px;">轨道号</el-col>
<el-col :span="17"><el-input v-model="formModelSectionName" size="mini" style="height: 20px;" :disabled="true" /></el-col>
</el-row>
<el-row style="display: flex;align-items: center;">
<el-col :span="7" style="height: 25px;line-height: 25px;">新车次号</el-col>
<el-col :span="17"><el-input v-model="formModelNewTrip" size="mini" style="height: 20px;" /></el-col>
</el-row>
</div>
</el-col>
<el-col v-if="trainOperationShow" :span="6" style="padding: 1px;">
<div class="nav-border">
<div style="display: flex;justify-content: space-around;width: 100%;height: 45px;align-items: center;border-bottom: 2px solid #FBFBFA;">
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="trainCommit">执行</el-button>
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="doClose">退出</el-button>
</div>
</div>
</el-col>
<el-col :span="3">
<div class="nav-border flex-box">
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain>联锁</el-button>
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="changeShowMode(false)">联锁</el-button>
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain>时刻表</el-button>
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain>ATS</el-button>
<el-button style="line-height: 18px; width: 100px; margin: 0;" plain @click="changeShowMode(true)">ATS</el-button>
</div>
</el-col>
</el-row>
@ -135,7 +183,12 @@ export default {
directionRodParamList: [],
secondConfirm: false,
banIcon: BanIcon,
timer: null
timer: null,
trainOperationShow: false,
trainModel: {},
formModelTripNum: '',
formModelSectionName: '',
formModelNewTrip: ''
};
},
computed: {
@ -197,6 +250,9 @@ export default {
case 'DirectionRod':
this.handleDirectionRodMenu();
break;
case 'Train':
this.handleTrainParam();
break;
}
}
}).catch((error) => {
@ -210,6 +266,7 @@ export default {
}
},
'$store.state.training.prdType': function (val) {
this.trainOperationShow = false;
this.initMenus();
this.initRouteMenus();
},
@ -591,6 +648,7 @@ export default {
},
doClose() {
this.deviceHighLight(this.oldDevice, false); // 当前选中
this.changeShowMode(false);
this.operate = ''; // 清空指令
this.cmdType = '';
this.securityCommand = '';
@ -606,6 +664,46 @@ export default {
this.oldClickObj = null; // 清空上次点击信号机
this.clearAllMenuShow();
},
handleTrainParam() {
this.trainModel = this.selectedObj;
this.formModelTripNum = this.trainModel.destinationCode + this.trainModel.serviceNumber + this.trainModel.tripNumber;
this.formModelSectionName = this.trainModel.sectionModel.name;
this.formModelNewTrip = '';
},
changeShowMode(flag) {
if (this.$store.state.training.prdType === '01') {
this.trainModel = {};
this.formModelTripNum = '';
this.formModelSectionName = '';
this.trainOperationShow = flag;
}
},
trainCommit() {
if (this.formModelNewTrip && this.formModelNewTrip.length === 9) {
const params = {
groupNumber: this.trainModel.groupNumber,
tripNumber: this.formModelNewTrip.slice(6, 9),
serviceNumber: this.formModelNewTrip.slice(3, 6)
};
const step = {
over: true,
cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN,
operation: OperationEvent.Train.setPlanTrainId.menu.operation,
param: params
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.changeShowMode(true);
}
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
} else {
this.$refs.noticeInfo.doShow('请输入正确的车次号');
}
},
initMenus() {
this.basicParamList = [
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
@ -700,6 +798,12 @@ export default {
}
};
</script>
<style lang="scss" scoped>
/deep/ .el-input--mini .el-input__inner{
height: 20px;
line-height: 20px;
}
</style>
<style lang="scss">
#menuButton{
position: absolute;

86
src/jmapNew/theme/haerbin_01/operationConfig.js
View File

@ -69,11 +69,11 @@ export default {
// trainingType: 'Section',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
// { deviceType: '03', orderNum: 2, operateCode: '4041', tip: '鼠标左键点击【下达】按钮' },
// { deviceType: '03', orderNum: 3, operateCode: '4043', tip: '鼠标左键点击【确认1】按钮' },
// { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确认2】按钮' },
// { deviceType: '03', orderNum: 5, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
// { deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标右键菜单选择【区段解封】' },
// { deviceType: '03', orderNum: 2, operateCode: '4047', tip: '鼠标左键点击【下达】按钮' },
// { deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【确认1】按钮' },
// { deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【确认2】按钮' },
// { deviceType: '03', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【关闭】按钮' }
// ]
// },
{
@ -84,11 +84,13 @@ export default {
trainingName: '区段解封({8}{9})',
trainingRemark: '区段解封功能',
trainingType: 'Section',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4047', tip: '鼠标左键点击【解封区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
// {
@ -118,11 +120,13 @@ export default {
trainingName: '轨区设限({8}{9})',
trainingRemark: '区段设置限速功能（限速值：5）',
trainingType: 'Section',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4077', tip: '鼠标左键点击【轨区设限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
// {
@ -151,11 +155,13 @@ export default {
trainingName: '轨区消限({8}{9})',
trainingRemark: '区段取消限速功能',
trainingType: 'Section',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4086', tip: '鼠标左键点击【轨区消限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -166,11 +172,13 @@ export default {
trainingName: '强解区段({8}{9})',
trainingRemark: '强解区段功能',
trainingType: 'Section',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该区段' },
{ deviceType: '03', orderNum: 2, operateCode: '4029', tip: '鼠标左键点击【强解区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -285,11 +293,13 @@ export default {
trainingName: '道岔单解({7})',
trainingRemark: '道岔单解功能',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1047', tip: '鼠标左键点击【取消锁定】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -344,11 +354,13 @@ export default {
trainingName: '道岔解封({7})',
trainingRemark: '道岔解封功能',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '02', orderNum: 2, operateCode: '1067', tip: '鼠标左键点击【解封道岔】按钮' },
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '02', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -374,11 +386,13 @@ export default {
trainingName: '道岔区段解封({7})',
trainingRemark: '区段解封功能',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '03', orderNum: 2, operateCode: '4047', tip: '鼠标左键点击【解封区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -389,11 +403,13 @@ export default {
trainingName: '强解区段({7})',
trainingRemark: '强解区段',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '03', orderNum: 2, operateCode: '4029', tip: '鼠标左键点击【强解区段】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -404,11 +420,13 @@ export default {
trainingName: '道岔轨区设限({7})',
trainingRemark: '轨区设限功能',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '03', orderNum: 2, operateCode: '1137', tip: '鼠标左键点击【轨区设限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -419,11 +437,13 @@ export default {
trainingName: '道岔轨区消限({7})',
trainingRemark: '轨区消限功能',
trainingType: 'Switch',
productTypes: ['01'],
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '03', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该道岔' },
{ deviceType: '03', orderNum: 2, operateCode: '1146', tip: '鼠标左键点击【轨区消限】按钮' },
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '03', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -536,7 +556,9 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3077', tip: '鼠标左键点击【解封信号】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -551,7 +573,9 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
{ deviceType: '04', orderNum: 2, operateCode: '3077', tip: '鼠标左键点击【解封信号】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -911,7 +935,9 @@ export default {
// { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', subType:'trainSetButton'},
{ deviceType: '04', orderNum: 2, operateCode: '5025', tip: '鼠标左键点击【越站】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{
@ -927,7 +953,9 @@ export default {
// { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台' },
{ deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该站台', subType:'trainSetButton'},
{ deviceType: '04', orderNum: 2, operateCode: '5035', tip: '鼠标左键点击【取消越站】按钮' },
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
{ deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
]
},
{