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

线路：西安2

Browse Source 
问题：核对和修改西安2号线实训以及操作存在的问题
This commit is contained in:
lVAL 2021-02-25 15:02:01 +08:00
parent 2994b833fa
commit a482e3a866
14 changed files with 103 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/PopMenu/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div v-if="show" class="pop-menu" :class="popMenuClass" :style="{ left: tPosition.x+'px', top: tPosition.y+'px' }"> <div v-if="show" class="pop-menu" :class="popMenuClass" :style="{ left: tPosition.x+'px', top: tPosition.y+'px' }">
<pop-menu-item v-for="(option, i) in menu" :key="i" :option="option" :pop-class="popClass" @close="close" /> <pop-menu-item v-for="(option, i) in menu" :key="i" :option="option" :pop-class="popClass" :allowedColor="allowedColor" :disabledColor="disabledColor" @close="close" />
</div> </div>
</template> </template>
@ -29,7 +29,15 @@ export default {
default() { default() {
return ''; return '';
} }
} },
allowedColor: {
type: String,
default: '#000'
},
disabledColor: {
type: String,
default: '#ccc'
}
}, },
data() { data() {
return { return {

16
src/components/PopMenu/item.vue
View File

@ -11,7 +11,7 @@
<ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}"> <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}">
<div class="menu-pop pop-menu"> <div class="menu-pop pop-menu">
<div v-show="isShow" class="arrow el-icon-arrow-down" /> <div v-show="isShow" class="arrow el-icon-arrow-down" />
<pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" @close="close" /> <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" :allowedColor="allowedColor" :disabledColor="disabledColor" @close="close" />
<div v-show="isShow" class="arrow el-icon-arrow-up" /> <div v-show="isShow" class="arrow el-icon-arrow-up" />
</div> </div>
</ul> </ul>
@ -51,13 +51,19 @@ export default {
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false default: false
} },
disabledColor: {
type: String,
default: '#000',
},
allowedColor: {
type: String,
default: '#ccc'
}
}, },
data() { data() {
return { return {
active: -1, active: -1
allowedColor: '#000',
disabledColor: '#ccc'
}; };
}, },
computed: { computed: {

2
src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" disabledColor="#aaa"/>
<turn-back-control ref="turnBackControl" /> <turn-back-control ref="turnBackControl" />
</div> </div>
</template> </template>

2
src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" disabledColor="#aaa"/>
<section-alxe-reset ref="sectionAlxeReset" /> <section-alxe-reset ref="sectionAlxeReset" />
</div> </div>
</template> </template>

2
src/jmapNew/theme/xian_02/menus/menuCancel.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" /> <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" disabledColor="#aaa"/>
<notice-info ref="noticeInfo" pop-class="xian-02__system" /> <notice-info ref="noticeInfo" pop-class="xian-02__system" />
</div> </div>
</template> </template>

2
src/jmapNew/theme/xian_02/menus/menuLimit.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" disabledColor="#aaa"/>
<cancel-all-limit ref="cancelAllLimit" /> <cancel-all-limit ref="cancelAllLimit" />
</div> </div>
</template> </template>

14
src/jmapNew/theme/xian_02/menus/menuSection.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" /> <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabledColor="#aaa"/>
<section-control ref="sectionControl" pop-class="xian-02__system" /> <section-control ref="sectionControl" pop-class="xian-02__system" />
<section-un-lock ref="sectionUnLock" /> <section-un-lock ref="sectionUnLock" />
<speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" /> <speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" />
@ -56,7 +56,6 @@ export default {
data() { data() {
return { return {
topTip: '', topTip: '',
tipSubhead: '',
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
@ -98,22 +97,28 @@ export default {
cmdType: CMD.Section.CMD_SECTION_UNBLOCK cmdType: CMD.Section.CMD_SECTION_UNBLOCK
}, },
{ {
// 暂无功能，先disabled掉
label: '设备标签', label: '设备标签',
disabled: true,
children: [ children: [
{ {
label: '创建设备标签', label: '创建设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '查看设备标签', label: '查看设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '更改设备标签', label: '更改设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '删除设备标签', label: '删除设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -125,6 +130,7 @@ export default {
}, },
{ {
label: '帮助', label: '帮助',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -304,7 +310,9 @@ export default {
setSpeed() { setSpeed() {
commitOperate(menuOperate.Section.setSpeed, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.Section.setSpeed, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.speedLimit.doShow(operate, this.selected); // 先使用老版本的临时限速
// this.$refs.speedLimit.doShow(operate, this.selected);
this.$refs.speedLimitControl.doShow(operate, this.selected);
} }
}); });
}, },

15
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" /> <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" disabledColor="#aaa" pop-class="xian-02__pop_tip_station" />
<route-detail ref="routeDetail" /> <route-detail ref="routeDetail" />
<notice-info ref="noticeInfo" pop-class="xian-02__system" /> <notice-info ref="noticeInfo" pop-class="xian-02__system" />
<set-fault ref="setFault" pop-class="xian-02__system" /> <set-fault ref="setFault" pop-class="xian-02__system" />
@ -38,7 +38,6 @@ export default {
data() { data() {
return { return {
topTip: '', topTip: '',
tipSubhead: '',
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
@ -77,23 +76,29 @@ export default {
handler: this.guideSignal, handler: this.guideSignal,
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
}, },
// 暂无功能，先disabled掉
{ {
label: '设备标签', label: '设备标签',
disabled: true,
children: [ children: [
{ {
label: '创建设备标签', label: '创建设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '查看设备标签', label: '查看设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '更改设备标签', label: '更改设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '删除设备标签', label: '删除设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -141,22 +146,28 @@ export default {
cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
}, },
{ {
// 暂无功能，先disabled掉
label: '设备标签', label: '设备标签',
disabled: true,
children: [ children: [
{ {
label: '创建设备标签', label: '创建设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '查看设备标签', label: '查看设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '更改设备标签', label: '更改设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '删除设备标签', label: '删除设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]

29
src/jmapNew/theme/xian_02/menus/menuStation.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="xian-02__system"> <div class="xian-02__system">
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" /> <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabledColor="#aaa"/>
<station-cmd-control ref="stationCmdControl" /> <station-cmd-control ref="stationCmdControl" />
<notice-info ref="noticeInfo" pop-class="xian-02__systerm" /> <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
<set-fault ref="setFault" pop-class="xian-02__system" /> <set-fault ref="setFault" pop-class="xian-02__system" />
@ -39,7 +39,6 @@ export default {
data() { data() {
return { return {
topTip: '车站 (CP)', topTip: '车站 (CP)',
tipSubhead: '',
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
@ -77,18 +76,24 @@ export default {
{ {
label: '请求', label: '请求',
handler: this.setStationControl, handler: this.setStationControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
}, },
{ {
// 暂无功能，先disabled
label: '授权', label: '授权',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
// 暂无功能，先disabled
label: '取消', label: '取消',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
// 暂无功能，先disabled
label: '紧急本地控制', label: '紧急本地控制',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -109,14 +114,18 @@ export default {
] ]
}, },
{ {
// 暂无功能，先disabled掉
label: '通信', label: '通信',
disabled: true,
children: [ children: [
{ {
label: '本地', label: '本地',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '重新连接', label: '重新连接',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -139,35 +148,45 @@ export default {
// ] // ]
// }, // },
{ {
// 暂无功能，先disabled掉
label: '设备标签', label: '设备标签',
disabled: true,
children: [ children: [
{ {
label: '创建设备标签', label: '创建设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '查看设备标签', label: '查看设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '更改设备标签', label: '更改设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '删除设备标签', label: '删除设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
}, },
{ {
// 暂无功能，先disabled掉
label: '取消验证', label: '取消验证',
disabled: true,
children: [ children: [
{ {
label: '取消验证', label: '取消验证',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '恢复验证', label: '恢复验证',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
@ -353,7 +372,7 @@ export default {
return each.label == type; return each.label == type;
}); });
if (strategy) { if (strategy) {
commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.code, id:strategy.id}, 3).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.code, id:strategy.id}, 0).then(({valid, operate})=>{
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/pushRequestList', { this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected, device: this.selected,

2
src/jmapNew/theme/xian_02/menus/menuStationControl.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" disabledColor="#aaa"/>
<station-control ref="stationControl" /> <station-control ref="stationControl" />
</div> </div>
</template> </template>

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

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" /> <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabledColor="#aaa" />
<switch-control ref="switchControl" pop-class="xian-02__system" /> <switch-control ref="switchControl" pop-class="xian-02__system" />
<section-un-lock ref="sectionUnLock" pop-class="xian-02__system" /> <section-un-lock ref="sectionUnLock" pop-class="xian-02__system" />
<speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" /> <speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" />
@ -48,7 +48,6 @@ export default {
data() { data() {
return { return {
topTip: '', topTip: '',
tipSubhead: '',
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
@ -105,28 +104,35 @@ export default {
cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
}, },
{ {
// 暂无功能，先disabled掉
label: '设备标签', label: '设备标签',
disabled: true,
children: [ children: [
{ {
label: '创建设备标签', label: '创建设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '查看设备标签', label: '查看设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '更改设备标签', label: '更改设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
}, },
{ {
label: '删除设备标签', label: '删除设备标签',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]
}, },
{ {
label: '帮助', label: '帮助',
disabled: true,
handler: this.undeveloped handler: this.undeveloped
} }
] ]

3
src/jmapNew/theme/xian_02/menus/menuTrain.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" /> <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" pop-class="xian-02__pop_tip_station" disabledColor="#aaa" />
<notice-info ref="noticeInfo" pop-class="xian-02__system" /> <notice-info ref="noticeInfo" pop-class="xian-02__system" />
<train-destination ref="trainDestination" /> <train-destination ref="trainDestination" />
<train-del-destination ref="trainDelDestination" /> <train-del-destination ref="trainDelDestination" />
@ -62,7 +62,6 @@ export default {
data() { data() {
return { return {
topTip: '', topTip: '',
tipSubhead: '',
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [

2
src/jmapNew/theme/xian_02/menus/popStationStand.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<pop-menu ref="popMenu" :menu="menu" trigger="click" :tip-msg="topTip" text-align="left" pop-class="xian-02__pop_tip_station" /> <pop-menu ref="popMenu" :menu="menu" trigger="click" :tip-msg="topTip" text-align="left" pop-class="xian-02__pop_tip_station" disabledColor="#aaa" />
<notice-info ref="noticeInfo" pop-class="xian-02__system" /> <notice-info ref="noticeInfo" pop-class="xian-02__system" />
<update-stand-plan ref="updateStandPlan" :selected="selected" /> <update-stand-plan ref="updateStandPlan" :selected="selected" />
<warning-confirm ref="warningConfirm" :selected="selected" /> <warning-confirm ref="warningConfirm" :selected="selected" />

38
src/jmapNew/theme/xian_02/operationConfig.js
View File

@ -189,25 +189,25 @@ export default {
// { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } // { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
// ] // ]
// }, // },
// { {
// maxDuration: 15, maxDuration: 15,
// minDuration: 8, minDuration: 8,
// operateType: 'Section_Set_Limit_Speed', operateType: 'Section_Set_Limit_Speed',
// skinCode: '09', skinCode: '09',
// trainingName: '设置临时限速({8}{9})', trainingName: '设置临时限速({8}{9})',
// trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）', trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
// trainingType: 'Section', trainingType: 'Section',
// productTypes: ['02'], productTypes: ['02'],
// stepVOList: [ stepVOList: [
// { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' }, { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
// { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【不限速】', val: '0' }, { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【不限速】', val: '0' },
// { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' }, { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
// { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' }, { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
// { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' }, { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' }, { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
// { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' } { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
// ] ]
// }, },
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,