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-08-25 16:38:08 +08:00
parent f2957c370c
commit 1668b25337
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
<div class="nav-border">
<div class="nav-border-top">
<el-button :id="commandId" class="fl" :class="{'disabled': canCommand}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand" @click="command">执行</el-button>
<el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="doClose">取消</el-button>
<el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="cancle">取消</el-button>
</div>
<div class="nav-border-bottom">
<el-table
@ -167,6 +167,11 @@ export default {
'$store.state.training.prdType': function (val) {
this.initMenus();
this.initRouteMenus();
},
'$store.state.training.started':function (val) {
if (!val) {
this.doClose();
}
}
},
mounted() {
@ -450,8 +455,12 @@ export default {
this.$refs.noticeInfo.doShow(error.message);
});
},
doClose() {
cancle() {
if (this.$store.state.training.mode != TrainingMode.TEACH) {
this.doClose();
}
},
doClose() {
this.deviceHighLight(this.oldDevice, false); // 当前选中
this.operate = ''; // 清空指令
this.cmdType = '';
@ -464,7 +473,6 @@ export default {
this.canCommand = true; // 执行变为禁用
this.oldClickObj = null; // 清空上次点击信号机
this.clearAllMenuShow();
}
},
initMenus() {
this.basicParamList = this.$store.state.training.prdType === '01' ? [

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

@ -440,7 +440,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【ATP进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"ATP"}'
},
{
maxDuration: 15,
@ -456,7 +457,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【ATP进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"ATP"}'
},
{
maxDuration: 15,
@ -472,7 +474,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消ATP】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"ATP"}'
},
{
maxDuration: 15,
@ -488,7 +491,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
{ deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消ATP】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"ATP"}'
},
{
maxDuration: 15,
@ -684,7 +688,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"GROUND"}'
},
{
maxDuration: 15,
@ -700,7 +705,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"GROUND"}'
},
{
maxDuration: 15,
@ -716,7 +722,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"GROUND"}'
},
{
maxDuration: 15,
@ -732,7 +739,8 @@ export default {
{ deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
{ deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
]
],
config:'{routeType:"GROUND"}'
},
{
maxDuration: 15,