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 2021-02-20 15:05:25 +08:00
parent 858c7dd7a7
commit 86ac34e899
4 changed files with 223 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/config/skinCode/ningbo_03.js
View File

@ -239,7 +239,9 @@ class SkinCode extends defaultStyle {
fontWeight:'normal', // 字体粗细 fontWeight:'normal', // 字体粗细
textPadding:[0, 0], // 字体边距 textPadding:[0, 0], // 字体边距
borderColor:'', // 字体边框颜色 borderColor:'', // 字体边框颜色
textBorderWidth:0 // 字体边框宽度 textBorderWidth:0, // 字体边框宽度
isSpecialType:true, // 特雷兹特殊类型
noneModeColor:'#ff0' // 无模式时字体颜色
}, },
kmPostShow: false, // 公里标显示 kmPostShow: false, // 公里标显示
@ -262,7 +264,7 @@ class SkinCode extends defaultStyle {
lampSpace: 60 // 灯间距 lampSpace: 60 // 灯间距
}, },
StationControl: { StationControl: {
disPlayNone: true, // 不显示 disPlayNone: true, // 不显示
text: { text: {
distance: 12, // 灯和文字之间的距离 distance: 12, // 灯和文字之间的距离
fontSize: 12, // 字体大小 fontSize: 12, // 字体大小

28
src/jmapNew/shape/Station/index.js
View File

@ -385,7 +385,12 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor); this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor);
this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色 this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色
this.stationText.setColor('#1fdc1f'); if (this.style.Station.stationText.isSpecialType) {
// simulationRoleList
} else {
this.stationText.setColor('#1fdc1f');
}
this.stationControlText && this.stationControlText.setStyle({text:'CC', textFill:this.style.Station.StationControl.text.centerControlColor}); this.stationControlText && this.stationControlText.setStyle({text:'CC', textFill:this.style.Station.StationControl.text.centerControlColor});
// //
// //
@ -411,7 +416,11 @@ export default class Station extends Group {
// this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // this.subheadText && this.subheadText.setStyle('textFill', '#fff');
// } // }
// } // }
this.stationText.setColor('#fff'); if (this.style.Station.stationText.isSpecialType) {
} else {
this.stationText.setColor('#fff');
}
} }
handleEmergency() { // 紧急站控 handleEmergency() { // 紧急站控
@ -427,7 +436,11 @@ export default class Station extends Group {
// this.subheadText && this.subheadText.setStyle('textFill', '#fff'); // this.subheadText && this.subheadText.setStyle('textFill', '#fff');
// } // }
// } // }
this.stationText.setColor('#fff'); if (this.style.Station.stationText.isSpecialType) {
} else {
this.stationText.setColor('#fff');
}
} }
handleInterlock() { // 联锁控 成都三号线 handleInterlock() { // 联锁控 成都三号线
@ -448,6 +461,9 @@ export default class Station extends Group {
if (this.style.Station.stationText.noneModeFlash) { if (this.style.Station.stationText.noneModeFlash) {
this.stationText.setAnimateStyle(this.noneBeforeMode); this.stationText.setAnimateStyle(this.noneBeforeMode);
} }
if (this.style.Station.stationText.isSpecialType) {
this.stationText.setColor(this.style.Station.stationText.noneModeColor);
}
} }
recover() { recover() {
@ -462,7 +478,11 @@ export default class Station extends Group {
this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor); this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.stationText && this.stationText.stopAnimate(); if (this.style.Station.stationText.isSpecialType) {
} else {
this.stationText && this.stationText.stopAnimate();
}
} }
// 设置状态 // 设置状态

294
src/jmapNew/theme/ningbo_03/menus/menuBar.vue
View File

@ -95,9 +95,9 @@
<interval-stop-number ref="intervalStopNumber" /> <interval-stop-number ref="intervalStopNumber" />
<allocate-time ref="allocateTime" /> <allocate-time ref="allocateTime" />
<station-transfer ref="stationTransfer" /> <station-transfer ref="stationTransfer" />
<station-request ref="stationRequest" /> <station-request ref="stationRequest" />
<station-devolution ref="stationDevolution" /> <station-devolution ref="stationDevolution" />
<station-reclaim ref="stationReclaim" /> <station-reclaim ref="stationReclaim" />
<stand-detail ref="standDetail" /> <stand-detail ref="standDetail" />
<switch-command ref="switchCommand" /> <switch-command ref="switchCommand" />
<initialize-switch-block ref="initializeSwitchBlock" /> <initialize-switch-block ref="initializeSwitchBlock" />
@ -203,10 +203,10 @@ export default {
StandDetain, StandDetain,
IntervalStopNumber, IntervalStopNumber,
AllocateTime, AllocateTime,
StationTransfer, StationTransfer,
StationRequest, StationRequest,
StationDevolution, StationDevolution,
StationReclaim, StationReclaim,
StandDetail, StandDetail,
SwitchCommand, SwitchCommand,
InitializeSwitchBlock, InitializeSwitchBlock,
@ -356,7 +356,7 @@ export default {
{ {
title: '取消CBTC列车进路', title: '取消CBTC列车进路',
click: this.cancelCbtcRoute click: this.cancelCbtcRoute
}, }
// { // {
// title: 'VOBC切换', // title: 'VOBC切换',
// click: this.undeveloped // click: this.undeveloped
@ -429,33 +429,33 @@ export default {
children: [ children: [
{ {
title: '开放/关闭', title: '开放/关闭',
click: this.standOpenOrClose, click: this.standOpenOrClose,
operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose
}, },
{ {
title: '设置/取消扣车', title: '设置/取消扣车',
click: this.setStandDetain, click: this.setStandDetain,
operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot
}, },
{ {
title: '设置站间列车数量', title: '设置站间列车数量',
click: this.undeveloped, click: this.undeveloped,
operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum
}, },
{ {
title: '分配停站时间', title: '分配停站时间',
click: this.setAllocateTime, click: this.setAllocateTime,
operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime
}, },
{ {
title: '授权转移', title: '授权转移',
click: this.authorizeTransfer, click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo3.line_stand_transfer operate: OperationEvent.Command.commandNingBo3.line_stand_transfer
}, },
{ {
title: '显示', title: '显示',
click: this.showStandDetail, click: this.showStandDetail,
operate: OperationEvent.Command.commandNingBo3.line_stand_detail operate: OperationEvent.Command.commandNingBo3.line_stand_detail
} }
] ]
}, },
@ -464,28 +464,28 @@ export default {
operate: OperationEvent.Command.commandNingBo3.line_switch, operate: OperationEvent.Command.commandNingBo3.line_switch,
children: [ children: [
{ {
title: '命令', title: '命令',
operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
click: this.setSwitchCommand click: this.setSwitchCommand
}, },
{ {
title: '封锁', title: '封锁',
operate: OperationEvent.Command.commandNingBo3.line_switch_block, operate: OperationEvent.Command.commandNingBo3.line_switch_block,
click: this.setBlockSwitch click: this.setBlockSwitch
}, },
{ {
title: '解除封锁', title: '解除封锁',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, operate: OperationEvent.Command.commandNingBo3.line_switch_unblock,
click: this.setUnblockSwitch click: this.setUnblockSwitch
}, },
{ {
title: '请求动岔/请求或授权/取消', title: '请求动岔/请求或授权/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_empower, operate: OperationEvent.Command.commandNingBo3.line_switch_empower,
click: this.setSwitchActive click: this.setSwitchActive
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_switch_detail, operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
click: this.showSwitchDetail click: this.showSwitchDetail
} }
] ]
@ -496,38 +496,38 @@ export default {
children: [ children: [
{ {
title: '引导', title: '引导',
operate: OperationEvent.Command.commandNingBo3.line_signal_guide, operate: OperationEvent.Command.commandNingBo3.line_signal_guide,
click: this.setSignalGuide click: this.setSignalGuide
}, },
{ {
title: '取消允许锁闭', title: '取消允许锁闭',
operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot,
click: this.setSignalCanBlock click: this.setSignalCanBlock
}, },
{ {
title: '进路/命令', title: '进路/命令',
operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, operate: OperationEvent.Command.commandNingBo3.line_signal_cmd,
click: this.setRouteCommand click: this.setRouteCommand
}, },
{ {
title: '信号指示模式', title: '信号指示模式',
operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, operate: OperationEvent.Command.commandNingBo3.line_signal_indicator,
click: this.setSignalModel click: this.setSignalModel
}, },
{ {
title: '封锁', title: '封锁',
operate: OperationEvent.Command.commandNingBo3.line_signal_block, operate: OperationEvent.Command.commandNingBo3.line_signal_block,
click: this.setSignalBlock click: this.setSignalBlock
}, },
{ {
title: '解除封锁', title: '解除封锁',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, operate: OperationEvent.Command.commandNingBo3.line_signal_unblock,
click: this.setSignalCancelBlock click: this.setSignalCancelBlock
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_signal_detail, operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
click: this.showSignalDetail click: this.showSignalDetail
} }
] ]
@ -537,23 +537,23 @@ export default {
operate: OperationEvent.Command.commandNingBo3.line_section, operate: OperationEvent.Command.commandNingBo3.line_section,
children: [ children: [
{ {
title: '开放', title: '开放',
operate: OperationEvent.Command.commandNingBo3.line_section_open, operate: OperationEvent.Command.commandNingBo3.line_section_open,
click: this.handleOpenSection click: this.handleOpenSection
}, },
{ {
title: '关闭', title: '关闭',
operate: OperationEvent.Command.commandNingBo3.line_section_close, operate: OperationEvent.Command.commandNingBo3.line_section_close,
click: this.handleCloseSection click: this.handleCloseSection
}, },
{ {
title: '临时限速', title: '临时限速',
operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed,
click: this.handleLimitSpeed click: this.handleLimitSpeed
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_section_detail, operate: OperationEvent.Command.commandNingBo3.line_section_detail,
click: this.handleSectionShow click: this.handleSectionShow
} }
] ]
@ -727,6 +727,38 @@ export default {
} }
] ]
}, },
{
title: '用户权限(U)',
operate: OperationEvent.Command.mBar.userManage,
children: [
{
title: '转移控制',
operate: OperationEvent.Command.commandNingBo3.line_user,
children: [
{
title: '请求区域控制权',
click: this.authorizeRequest,
operate: OperationEvent.Command.commandNingBo3.line_user_request
},
{
title: '授权转移',
click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo3.line_user_transfer
},
{
title: '下放站控',
click: this.authorizeDevolution,
operate: OperationEvent.Command.commandNingBo3.line_user_devolution
},
{
title: '收回站控',
click: this.authorizeReclaim,
operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
}
]
}
]
}
// { // {
// title: '视图(V)', // title: '视图(V)',
// operate: '', // operate: '',
@ -919,39 +951,39 @@ export default {
title: '线路(G)', title: '线路(G)',
operate: OperationEvent.Command.commandNingBo3.line, operate: OperationEvent.Command.commandNingBo3.line,
children: [ children: [
{ {
title: '站台', title: '站台',
operate: OperationEvent.Command.commandNingBo3.line_stand, operate: OperationEvent.Command.commandNingBo3.line_stand,
children: [ children: [
{ {
title: '开放/关闭', title: '开放/关闭',
click: this.standOpenOrClose, click: this.standOpenOrClose,
operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose
}, },
{ {
title: '设置/取消扣车', title: '设置/取消扣车',
click: this.setStandDetain, click: this.setStandDetain,
operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot
}, },
{ {
title: '设置站间列车数量', title: '设置站间列车数量',
click: this.undeveloped, click: this.undeveloped,
operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum
}, },
{ {
title: '分配停站时间', title: '分配停站时间',
click: this.setAllocateTime, click: this.setAllocateTime,
operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime
}, },
{ {
title: '授权转移', title: '授权转移',
click: this.authorizeTransfer, click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo3.line_stand_transfer operate: OperationEvent.Command.commandNingBo3.line_stand_transfer
}, },
{ {
title: '显示', title: '显示',
click: this.showStandDetail, click: this.showStandDetail,
operate: OperationEvent.Command.commandNingBo3.line_stand_detail operate: OperationEvent.Command.commandNingBo3.line_stand_detail
} }
] ]
}, },
@ -960,99 +992,99 @@ export default {
operate: OperationEvent.Command.commandNingBo3.line_switch, operate: OperationEvent.Command.commandNingBo3.line_switch,
children: [ children: [
{ {
title: '命令', title: '命令',
operate: OperationEvent.Command.commandNingBo3.line_switch_cmd, operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
click: this.setSwitchCommand click: this.setSwitchCommand
}, },
{ {
title: '封锁', title: '封锁',
operate: OperationEvent.Command.commandNingBo3.line_switch_block, operate: OperationEvent.Command.commandNingBo3.line_switch_block,
click: this.setBlockSwitch click: this.setBlockSwitch
}, },
{ {
title: '解除封锁', title: '解除封锁',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock, operate: OperationEvent.Command.commandNingBo3.line_switch_unblock,
click: this.setUnblockSwitch click: this.setUnblockSwitch
}, },
{ {
title: '请求动岔/请求或授权/取消', title: '请求动岔/请求或授权/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_empower, operate: OperationEvent.Command.commandNingBo3.line_switch_empower,
click: this.setSwitchActive click: this.setSwitchActive
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_switch_detail, operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
click: this.showSwitchDetail click: this.showSwitchDetail
} }
] ]
}, },
{ {
title: '信号机', title: '信号机',
operate: OperationEvent.Command.commandNingBo3.line_signal, operate: OperationEvent.Command.commandNingBo3.line_signal,
children: [ children: [
{ {
title: '引导', title: '引导',
operate: OperationEvent.Command.commandNingBo3.line_signal_guide, operate: OperationEvent.Command.commandNingBo3.line_signal_guide,
click: this.setSignalGuide click: this.setSignalGuide
}, },
{ {
title: '取消允许锁闭', title: '取消允许锁闭',
operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot, operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot,
click: this.setSignalCanBlock click: this.setSignalCanBlock
}, },
{ {
title: '进路/命令', title: '进路/命令',
operate: OperationEvent.Command.commandNingBo3.line_signal_cmd, operate: OperationEvent.Command.commandNingBo3.line_signal_cmd,
click: this.setRouteCommand click: this.setRouteCommand
}, },
{ {
title: '信号指示模式', title: '信号指示模式',
operate: OperationEvent.Command.commandNingBo3.line_signal_indicator, operate: OperationEvent.Command.commandNingBo3.line_signal_indicator,
click: this.setSignalModel click: this.setSignalModel
}, },
{ {
title: '封锁', title: '封锁',
operate: OperationEvent.Command.commandNingBo3.line_signal_block, operate: OperationEvent.Command.commandNingBo3.line_signal_block,
click: this.setSignalBlock click: this.setSignalBlock
}, },
{ {
title: '解除封锁', title: '解除封锁',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock, operate: OperationEvent.Command.commandNingBo3.line_signal_unblock,
click: this.setSignalCancelBlock click: this.setSignalCancelBlock
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_signal_detail, operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
click: this.showSignalDetail click: this.showSignalDetail
} }
] ]
}, },
{ {
title: '轨道', title: '轨道',
operate: OperationEvent.Command.commandNingBo3.line_section, operate: OperationEvent.Command.commandNingBo3.line_section,
children: [ children: [
{ {
title: '开放', title: '开放',
operate: OperationEvent.Command.commandNingBo3.line_section_open, operate: OperationEvent.Command.commandNingBo3.line_section_open,
click: this.handleOpenSection click: this.handleOpenSection
}, },
{ {
title: '关闭', title: '关闭',
operate: OperationEvent.Command.commandNingBo3.line_section_close, operate: OperationEvent.Command.commandNingBo3.line_section_close,
click: this.handleCloseSection click: this.handleCloseSection
}, },
{ {
title: '临时限速', title: '临时限速',
operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed, operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed,
click: this.handleLimitSpeed click: this.handleLimitSpeed
}, },
{ {
title: '显示', title: '显示',
operate: OperationEvent.Command.commandNingBo3.line_section_detail, operate: OperationEvent.Command.commandNingBo3.line_section_detail,
click: this.handleSectionShow click: this.handleSectionShow
} }
] ]
}, },
{ {
title: '闭塞区段', title: '闭塞区段',
operate: '', operate: '',
@ -1214,9 +1246,9 @@ export default {
click: this.adjustStrategy click: this.adjustStrategy
} }
] ]
}, },
{ {
title: '用户权限(U)', title: '用户权限(U)',
operate: OperationEvent.Command.mBar.userManage, operate: OperationEvent.Command.mBar.userManage,
children: [ children: [
{ {
@ -1225,28 +1257,28 @@ export default {
children: [ children: [
{ {
title: '请求区域控制权', title: '请求区域控制权',
click: this.authorizeRequest, click: this.authorizeRequest,
operate: OperationEvent.Command.commandNingBo3.line_user_request operate: OperationEvent.Command.commandNingBo3.line_user_request
}, },
{ {
title: '授权转移', title: '授权转移',
click: this.authorizeTransfer, click: this.authorizeTransfer,
operate: OperationEvent.Command.commandNingBo3.line_user_transfer operate: OperationEvent.Command.commandNingBo3.line_user_transfer
}, },
{ {
title: '下放站控', title: '下放站控',
click: this.authorizeDevolution, click: this.authorizeDevolution,
operate: OperationEvent.Command.commandNingBo3.line_user_devolution operate: OperationEvent.Command.commandNingBo3.line_user_devolution
}, },
{ {
title: '收回站控', title: '收回站控',
click: this.authorizeReclaim, click: this.authorizeReclaim,
operate: OperationEvent.Command.commandNingBo3.line_user_reclaim operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
} }
] ]
} }
] ]
} }
// { // {
// title: '视图(V)', // title: '视图(V)',
// operate: '', // operate: '',
@ -1317,7 +1349,7 @@ export default {
return true; return true;
}, },
initMenu(menu) { initMenu(menu) {
const type = State2SimulationMap[this.$store.state.training.prdType]; const type = State2SimulationMap[this.$store.state.training.prdType];
this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode); this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
this.clickEvent(); this.clickEvent();
this.closeMenu(true); this.closeMenu(true);
@ -1357,7 +1389,7 @@ export default {
hookClick(item, event) { hookClick(item, event) {
this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null }); this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
if (item && typeof item.click == 'function') { if (item && typeof item.click == 'function') {
item.click(item.operate||{}); item.click(item.operate || {});
} }
}, },
selectedClassA(item, index) { selectedClassA(item, index) {
@ -1538,10 +1570,10 @@ export default {
this.$refs.stationTransfer.doShow(); this.$refs.stationTransfer.doShow();
} }
}); });
}, },
// 请求区域控制权 // 请求区域控制权
authorizeRequest(item) { authorizeRequest(item) {
const operate = { const operate = {
type: 'bar', type: 'bar',
operation: item.operation operation: item.operation
}; };
@ -1552,10 +1584,10 @@ export default {
this.$refs.stationRequest.doShow(); this.$refs.stationRequest.doShow();
} }
}); });
}, },
// 下放站控 // 下放站控
authorizeDevolution(item) { authorizeDevolution(item) {
const operate = { const operate = {
type: 'bar', type: 'bar',
operation: item.operation operation: item.operation
}; };
@ -1566,10 +1598,10 @@ export default {
this.$refs.stationDevolution.doShow(); this.$refs.stationDevolution.doShow();
} }
}); });
}, },
// 收回站控 // 收回站控
authorizeReclaim(item) { authorizeReclaim(item) {
const operate = { const operate = {
type: 'bar', type: 'bar',
operation: item.operation operation: item.operation
}; };
@ -1580,7 +1612,7 @@ export default {
this.$refs.stationReclaim.doShow(); this.$refs.stationReclaim.doShow();
} }
}); });
}, },
showStandDetail(item) { showStandDetail(item) {
const operate = { const operate = {
type: 'bar', type: 'bar',
@ -1632,8 +1664,8 @@ export default {
if (valid) { if (valid) {
this.closeMenu(true); this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
// this.$refs.initializeSwitchBlock.doShow(operate); // this.$refs.initializeSwitchBlock.doShow(operate);
this.$refs.switchBlock.doShow(operate); this.$refs.switchBlock.doShow(operate);
} }
}); });
}, },

57
src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
View File

@ -12,19 +12,19 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-table :id="domIdChoose" ref="table" :data="centralizedStaionList" style="width: 100%;" height="320px" highlight-current-row @current-change="handleCurrentChange"> <el-table :id="domIdChoose" ref="table" :data="centralizedStaionList" style="width: 100%;" height="320px" highlight-current-row @current-change="handleCurrentChange">
<el-table-column prop="name" label="控制区域" /> <el-table-column prop="name" label="控制区域" />
<el-table-column label="用户Id" /> <el-table-column label="用户Id" />
<el-table-column label="授权范围" /> <el-table-column label="授权范围" />
</el-table> </el-table>
<el-checkbox v-model="allChecked" :disabled="true" >所有站台(F)</el-checkbox> <el-checkbox v-model="allChecked" :disabled="true">所有站台(F)</el-checkbox>
<div class="message" style="color:#ff0000;font-size:14px;margin-left:10px">{{ message }}</div> <div class="message" style="color:#ff0000;font-size:14px;margin-left:10px">{{ message }}</div>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="status==''" @click="commit(true)">确定(O)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button> <el-button :id="domIdApply" :disabled="status==''" @click="commit(false)">应用(A)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button> <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@ -46,15 +46,15 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default { export default {
name: 'StationControl', name: 'StationControl',
components: { components: {
NoticeInfo NoticeInfo
}, },
data() { data() {
return { return {
status: true, status: '',
operate: null, operate: null,
loading: false, loading: false,
dialogShow: false, dialogShow: false,
allChecked: false, allChecked: false,
station:{}, station:{},
message:'' message:''
}; };
@ -107,26 +107,31 @@ export default {
'selected': function(val) { 'selected': function(val) {
if (val) { if (val) {
const sationEle = this.$store.getters['map/getDeviceByCode'](val.code); const sationEle = this.$store.getters['map/getDeviceByCode'](val.code);
if (this.prdType == '02') { if (this.prdType == '01' && sationEle && sationEle.controlMode == 'Center') {
this.status = sationEle && sationEle.controlMode != 'Center'; this.status = 'Center';
} else { } else if (this.prdType == '02' && sationEle && sationEle.controlMode != 'Center') {
this.status = sationEle && sationEle.controlMode == 'Center'; this.status = 'Local';
} }
// if (this.prdType == '02') {
//
// } else {
// this.status = sationEle && sationEle.controlMode == 'Center';
// }
} }
} }
}, },
methods: { methods: {
doShow() { doShow() {
this.message = ''; this.message = '';
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(e => { this.$nextTick(e => {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}) });
}, },
doClose() { doClose() {
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('socket/shiftMsgQueue'); this.$store.dispatch('socket/shiftMsgQueue');
}, },
@ -160,21 +165,23 @@ export default {
}); });
}, },
commit(isClose = true) { commit(isClose = true) {
debugger;
const val = this.selected || {}; const val = this.selected || {};
const steps = { const steps = {
operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: true, over: true,
param: {stationCode:val.code} param: {stationCodes:[val.code]}
}; };
steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL; // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
steps.cmdType = this.status == 'Center' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
this.$store.dispatch('training/nextNew', steps).then(({ valid }) => { this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', val.code); this.$emit('commandSuccess', val.code);
} }
}).catch((error) => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });