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:
joylink_cuiweidong 2022-05-16 17:35:31 +08:00
parent e0f39c9f3d
commit 62c2a3dbda
6 changed files with 65 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/config/skinCode/datie_02.js
View File

@ -786,16 +786,18 @@ class SkinCode extends defaultStyle {
trainBody: {
fontFamily: 'consolas',
trainBodyLineWidth: 1, // 车身line宽
changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
specialTrainType: [
{
type: '03',
serviceNumber: '---',
nameFormat: 'groupNumber:serviceNumber'
// nameFormat: 'groupNumber:serviceNumber'
nameFormat:'tripNumber'
},
{
type: '03',
nameFormat: 'serviceNumber:trainNumber'
// nameFormat: 'serviceNumber:trainNumber'
nameFormat:'tripNumber'
}
], // 特殊列车类型需设置显示格式
lrPadding: 4, // 两边间隔
@ -803,7 +805,8 @@ class SkinCode extends defaultStyle {
trainBodyFillColor: '#88DF8E', // 列车车身填充颜色
trainSidelineColor: '#F00',
trainSidelineStopColor: '#000',
trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
// trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
trainNameFormat:'tripNumber'
},
directionArrow: {
},

5
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -69,6 +69,11 @@ export const menuOperate = {
// 添加备用车
operation: OperationEvent.Section.loadSpareTrain.menu.operation,
cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
},
addSpareTrain:{
// 添加备用车 (大铁线路 车次号 非车组号)
operation: OperationEvent.Section.addSpareTrain.menu.operation,
cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
}
},
Signal:{

34
src/jmapNew/theme/datie_02/menus/menuSection.vue
View File

@ -6,7 +6,8 @@
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
<train-add-plan ref="trainAddPlan" pop-class="chengdou-03__systerm" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
<load-spare-train ref="loadSpareTrain" pop-class="chengdou-03__systerm" />
<!-- <load-spare-train ref="loadSpareTrain" pop-class="chengdou-03__systerm" /> -->
<add-spare-train ref="addSpareTrain" />
<draw-select ref="drawSelect" />
</div>
</template>
@ -23,7 +24,9 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
// import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
import AddSpareTrain from './dialog/addSpareTrain';
import DrawSelect from './dialog/drawSelect';
export default {
@ -35,7 +38,8 @@ export default {
NoticeInfo,
TrainAddPlan,
SetFault,
LoadSpareTrain,
// LoadSpareTrain,
AddSpareTrain,
DrawSelect
},
props: {
@ -89,10 +93,15 @@ export default {
handler: this.triggerFaultManagement,
cmdType: CMD.Fault.CMD_TRIGGER_FAULT
},
// {
// label: '设置备用车',
// handler: this.loadSpare,
// cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
// }
{
label: '设置备用车',
handler: this.loadSpare,
cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
label: '增加备用车',
handler: this.addSpare,
cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
}
]
};
@ -156,10 +165,17 @@ export default {
this.$refs.popMenu.close();
}
},
loadSpare() {
commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
// loadSpare() {
// commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
// if (valid) {
// this.$refs.loadSpareTrain.doShow(operate, this.selected);
// }
// });
// },
addSpare() {
commitOperate(menuOperate.Section.addSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
if (valid) {
this.$refs.loadSpareTrain.doShow(operate, this.selected);
this.$refs.addSpareTrain.doShow(operate, this.selected);
}
});
},

12
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -174,7 +174,9 @@ export default {
/** 提前发车 */
CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'},
/** 设置默认发车轨 */
CMD_SECTION_SET_DEFAULT_TRANSFER : {value: 'Section_Set_Default_Transfer', label: '设置默认发车轨'}
CMD_SECTION_SET_DEFAULT_TRANSFER : {value: 'Section_Set_Default_Transfer', label: '设置默认发车轨'},
/** 增加备用车 大铁线路使用*/
CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN: {value: 'Train_Load_Trip_Number_Train', label: '增加备用车'}
},
// 站台
@ -286,10 +288,10 @@ export default {
CMD_STATION_RESTART_INTERLOCK_MACHINE: {value: 'Station_Restart_Interlock_Machine', label: '重启联锁机'},
/** 释放指令 */
CMD_STATION_RELEASE : {value:'Station_Release', label: '释放指令' },
/** 引导总锁 */
CMD_STATION_MASTER_LOCK: {value: 'Station_Master_Lock', label: '设置引导总锁'},
/** 取消引导总锁 */
CMD_STATION_MASTER_UNLOCK: {value: 'Station_Master_Unlock', label: '取消引导总锁'}
/** 引导总锁 */
CMD_STATION_MASTER_LOCK: {value: 'Station_Master_Lock', label: '设置引导总锁'},
/** 取消引导总锁 */
CMD_STATION_MASTER_UNLOCK: {value: 'Station_Master_Unlock', label: '取消引导总锁'}
},
Train: {
/** 人工限速行驶 */

4
src/scripts/cmdPlugin/CommandHandler.js
View File

@ -36,6 +36,10 @@ class CommandHandle {
controlMode: ['OperateCenterControl'],
conditionList: []
},
Train_Load_Trip_Number_Train:{
operate: 'Train_Load_Trip_Number_Train',
paramList:[{name: 'tripNumber'}, {name: 'sectionCode'}, {name: 'right'}]
},
Train_Trust: {
operate: 'Train_Trust',
paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}],

28
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -2269,6 +2269,12 @@ export const OperationEvent = {
operation: '4261',
domId: '_Tips-Section-ForceCancelSpeed-Menu{BOTTOM}'
}
},
addSpareTrain:{
menu: {
operation: '427',
domId: '_Tips-Section-Add-Spare-Train'
}
}
},
@ -2956,21 +2962,21 @@ export const OperationEvent = {
domId: '_Tips-Station-stationRelease'
}
},
// 引导总锁Station_Master_Lock
stationMasterLock: {
// 引导总锁Station_Master_Lock
stationMasterLock: {
menuButton: {
operation: '621',
domId: '_Tips-Station-stationMasterLock'
},
leftButton: {
domId: '_Tips-Station-stationMasterLock'
},
leftButton: {
operation: '6211',
domId: '_Tips-Station-stationMasterLock-leftButton'
},
rightButton: {
domId: '_Tips-Station-stationMasterLock-leftButton'
},
rightButton: {
operation: '6212',
domId: '_Tips-Station-stationMasterLock-rightButton'
}
}
domId: '_Tips-Station-stationMasterLock-rightButton'
}
}
},
// 列车