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 2020-06-09 13:16:47 +08:00
parent ff86c8d07f
commit dd758a1bfb
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue
View File

@ -199,11 +199,11 @@ export default {
}, },
// 道岔定位 // 道岔定位
locate() { locate() {
this.sendCommand(menuOperate.Switch.npChain); this.sendCommand(menuOperate.Switch.locate);
}, },
// 道岔反位 // 道岔反位
reverse() { reverse() {
this.sendCommand(menuOperate.Switch.rpChain); this.sendCommand(menuOperate.Switch.reverse);
}, },
// 区段切除 // 区段切除
split() { split() {

8
src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
View File

@ -59,12 +59,12 @@ export default {
{ {
label: '道岔单锁', label: '道岔单锁',
handler: this.lock, handler: this.lock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
}, },
{ {
label: '道岔单解', label: '道岔单解',
handler: this.unlock, handler: this.unlock,
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
}, },
{ {
label: '道岔封锁', label: '道岔封锁',
@ -185,7 +185,7 @@ export default {
}, },
// 定操定位 // 定操定位
locate() { locate() {
commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchControl.doShow(operate, this.selected); this.$refs.switchControl.doShow(operate, this.selected);
} }
@ -193,7 +193,7 @@ export default {
}, },
// 定操反位 // 定操反位
reverse() { reverse() {
commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.switchControl.doShow(operate, this.selected); this.$refs.switchControl.doShow(operate, this.selected);
} }

10
src/jmapNew/theme/ningbo_01/menus/utils/menuOperate.js
View File

@ -131,14 +131,12 @@ export const menuOperate = {
lock:{ lock:{
// 道岔单锁(联锁) // 道岔单锁(联锁)
operation: OperationEvent.Switch.lock.menu.operation, operation: OperationEvent.Switch.lock.menu.operation,
// cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK_CHAIN
}, },
unlock:{ unlock:{
// 道岔解锁(联锁) // 道岔解锁(联锁)
operation: OperationEvent.Switch.unlock.menu.operation, operation: OperationEvent.Switch.unlock.menu.operation,
// cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK_CHAIN
}, },
block:{ block:{
// 道岔封锁 // 道岔封锁
@ -150,12 +148,12 @@ export const menuOperate = {
operation: OperationEvent.Switch.unblock.menu.operation, operation: OperationEvent.Switch.unblock.menu.operation,
cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
}, },
npChain:{ locate:{
// 道岔定操（联动） // 道岔定操（联动）
operation: OperationEvent.Switch.locate.menu.operation, operation: OperationEvent.Switch.locate.menu.operation,
cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION
}, },
rpChain:{ reverse:{
// 道岔反操（联动） // 道岔反操（联动）
operation: OperationEvent.Switch.reverse.menu.operation, operation: OperationEvent.Switch.reverse.menu.operation,
cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION

4
src/jmapNew/theme/xian_02/menus/menuSwitch.vue
View File

@ -256,7 +256,7 @@ export default {
}, },
// 定操定位 // 定操定位
locate() { locate() {
commitOperate(menuOperate.Switch.npChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/pushRequestList', { this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected, device: this.selected,
@ -269,7 +269,7 @@ export default {
}, },
// 定操反位 // 定操反位
reverse() { reverse() {
commitOperate(menuOperate.Switch.rpChain, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Switch.reverse, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/pushRequestList', { this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected, device: this.selected,

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

@ -8,10 +8,10 @@ export default {
CMD_SWITCH_SINGLE_LOCK: {value:'Switch_Single_Lock', label: '单锁'}, CMD_SWITCH_SINGLE_LOCK: {value:'Switch_Single_Lock', label: '单锁'},
/** 单解 */ /** 单解 */
CMD_SWITCH_SINGLE_UNLOCK: {value:'Switch_Single_Unlock', label: '单解'}, CMD_SWITCH_SINGLE_UNLOCK: {value:'Switch_Single_Unlock', label: '单解'},
/** 单锁(联动) */ // /** 单锁(联动) */
CMD_SWITCH_SINGLE_LOCK_CHAIN: {value:'Switch_Single_Lock_Chain', label: '单锁(联动)'}, // CMD_SWITCH_SINGLE_LOCK_CHAIN: {value:'Switch_Single_Lock_Chain', label: '单锁(联动)'},
/** 单解(联动) */ // /** 单解(联动) */
CMD_SWITCH_SINGLE_UNLOCK_CHAIN: {value:'Switch_Single_Unlock_Chain', label: '单解(联动)'}, // CMD_SWITCH_SINGLE_UNLOCK_CHAIN: {value:'Switch_Single_Unlock_Chain', label: '单解(联动)'},
/** 封锁 */ /** 封锁 */
CMD_SWITCH_BLOCK: {value:'Switch_Block', label: '封锁'}, CMD_SWITCH_BLOCK: {value:'Switch_Block', label: '封锁'},
/** 解封 */ /** 解封 */
@ -78,7 +78,7 @@ export default {
CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'}, CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'},
/** 取消进路 */ /** 取消进路 */
CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'}, CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'},
/** 强制取消进路 */ // /** 强制取消进路 */
// CMD_SIGNAL_FORCE_CANCEL_ROUTE: {value: 'Signal_Force_Cancel_Route', label: '强制取消进路'}, // CMD_SIGNAL_FORCE_CANCEL_ROUTE: {value: 'Signal_Force_Cancel_Route', label: '强制取消进路'},
/** 人解进路 */ /** 人解进路 */
CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'}, CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},