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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
lVAL 2021-02-01 17:56:15 +08:00
commit 26a82237b1
11 changed files with 177 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/components/menus/dialog/standStopTime.vue
View File

@ -152,9 +152,9 @@ export default {
this.stationName = station.name; this.stationName = station.name;
} }
} }
// this.control = selected.parkingTime == 0 ? '01' : '02'; this.control = selected.parkingTime == 0 ? '01' : '02';
// this.time = selected.parkingTime ? Number(selected.parkingTime) : 30; this.time = selected.parkingTime ? Number(selected.parkingTime) : 30;
// this.effective = selected.parkingAlwaysValid == '1'; this.effective = selected.parkingAlwaysValid == '1';
} }
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {

109
src/jmapNew/theme/foshan_01/menus/menuStation.vue
View File

@ -47,36 +47,12 @@ export default {
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
{
label: '全站设置联锁自动触发',
handler: this.setAutoTrigger
},
{
label: '全站取消联锁自动触发',
handler: this.cancelAutoTrigger
},
{ {
label: '上电解锁', label: '上电解锁',
handler: this.powerUnLock handler: this.powerUnLock
},
{
label: '执行关键操作测试',
handler: this.execKeyOperationTest
} }
], ],
Center: [ Center: [
{
label: '所有进路自排关',
handler: this.humanControlALL
},
{
label: '所有进路自排开',
handler: this.atsAutoControlALL
},
{
label: '执行关键操作测试',
handler: this.execKeyOperationTest
}
] ]
}, },
menuForce: [ menuForce: [
@ -123,7 +99,6 @@ export default {
}, },
initMenu() { initMenu() {
// 编辑模式菜单列表 // 编辑模式菜单列表
if (this.selected.centralized) { if (this.selected.centralized) {
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
@ -165,42 +140,6 @@ export default {
} }
}); });
}, },
// 全站设置联锁自动触发
setAutoTrigger() {
const operate = {
start: true,
send: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.setAutoTrigger.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
// 全站取消联锁自动触发
cancelAutoTrigger() {
const operate = {
start: true,
send: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
// 上电解锁 // 上电解锁
powerUnLock() { powerUnLock() {
const operate = { const operate = {
@ -217,54 +156,6 @@ export default {
} }
}); });
}, },
// 执行关键操作测试
execKeyOperationTest() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.execKeyOperationTest.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationCmdControl.doShow(operate, this.selected);
}
});
},
// 所有进路自排关
humanControlALL() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.humanControlALL.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationHumanControlAll.doShow(operate, this.selected);
}
});
},
// 所有进路自排开
atsAutoControlALL() {
const operate = {
start: true,
code: this.selected.code,
type: MapDeviceType.Station.type,
label: MapDeviceType.Station.label,
operation: OperationEvent.Station.stationSetRouteControlAll.menu.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
}
});
},
triggerFaultManagement() { triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected); this.$store.dispatch('training/setTriggerFaultCount', this.selected);
} }

4
src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
View File

@ -172,12 +172,12 @@ export default {
// cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
// }, // },
{ {
label: this.$t('menu.menuSignal.humanControl'), label: '进路交人工控',
handler: this.humanControl, handler: this.humanControl,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
}, },
{ {
label: this.$t('menu.menuSignal.atsAutoControl'), label: '进路交ATS自动控',
handler: this.atsAutoControl, handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
}, },

4
src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
View File

@ -70,12 +70,12 @@ export default {
], ],
Center: [ Center: [
{ {
label: this.$t('menu.menuStation.allHumanControl'), label: '全站进路交人工控',
handler: this.humanControlALL, handler: this.humanControlALL,
cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
}, },
{ {
label: this.$t('menu.menuStation.allATSAutoControl'), label: '全站进路ATS自排',
handler: this.atsAutoControlALL, handler: this.atsAutoControlALL,
cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
}, },

35
src/jmapNew/theme/fuzhou_01/operationConfig.js
View File

@ -94,11 +94,10 @@ export default {
{ deviceType: '05', orderNum: 8, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' } { deviceType: '05', orderNum: 8, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
] ]
}, },
// 未生成
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: 'CMD_STATION_SET_CI_AUTO_TRIGGER', operateType: 'Station_Set_CI_Auto_Trigger',
skinCode: '07', skinCode: '07',
trainingName: '全站设置联锁自动触发({26})', trainingName: '全站设置联锁自动触发({26})',
trainingRemark: '全站设置联锁自动触发', trainingRemark: '全站设置联锁自动触发',
@ -108,11 +107,10 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】' } { deviceType: '04', orderNum: 1, operateCode: '601', tip: '鼠标右键菜单选择【全站设置联锁自动触发】' }
] ]
}, },
// 未生成
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: 'CMD_STATION_CANCEL_CI_AUTO_TRIGGER', operateType: 'Station_Cancel_CI_Auto_Trigger',
skinCode: '07', skinCode: '07',
trainingName: '全站取消联锁自动触发({26})', trainingName: '全站取消联锁自动触发({26})',
trainingRemark: '全站取消联锁自动触发', trainingRemark: '全站取消联锁自动触发',
@ -917,6 +915,35 @@ export default {
{ deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' }, { deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' },
{ deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' } { deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
] ]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Close_Auto_Setting',
skinCode: '07',
trainingName: '全站进路交人工控({26})',
trainingRemark: '全站进路交人工控',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '605', tip: '鼠标右键菜单选择【全站进路交人工控】' },
{ deviceType: '04', orderNum: 2, operateCode: '605', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Station_Open_Auto_Setting',
skinCode: '07',
trainingName: '全站进路ATS自排({26})',
trainingRemark: '全站进路ATS自排',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【全站进路ATS自排】' },
{ deviceType: '04', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】按钮', val: 'true' }
]
} }
] ]
}; };

3
src/jmapNew/theme/ningbo_01/menus/menuStation.vue
View File

@ -130,11 +130,13 @@ export default {
}; };
}, },
initMenu() { initMenu() {
if (this.selected.centralized) {
this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce; this.menu = this.menuForce;
} }
}
}, },
doShow(point) { doShow(point) {
this.clickEvent(); this.clickEvent();
@ -142,6 +144,7 @@ export default {
if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) { if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
this.$refs.popMenu.resetShowPosition(point); this.$refs.popMenu.resetShowPosition(point);
} }
}, },
doClose() { doClose() {
if (this.$refs && this.$refs.popMenu) { if (this.$refs && this.$refs.popMenu) {

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

@ -124,15 +124,15 @@ export default {
label: '设置临时限速', label: '设置临时限速',
handler: this.setSpeed, handler: this.setSpeed,
cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
},
{
type: 'separator'
},
{
label: '查看公里标',
handler: this.undeveloped,
cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
} }
// {
// type: 'separator'
// },
// {
// label: '查看公里标',
// handler: this.undeveloped,
// cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
// }
] ]
}, },
menuForce: [ menuForce: [

2
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -789,7 +789,7 @@ export default {
trainingType: 'ControlConvertMenu', trainingType: 'ControlConvertMenu',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击【系统】' }, { deviceType: 'bar', orderNum: 1, operateCode: '002', codeType:'NULL', tip: '鼠标左键点击【系统】' },
{ deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' }, { deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' },
{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '选择车站-【{1}】', val: '{2}'}, { deviceType: '05', orderNum: 3, operateCode: '0071', tip: '选择车站-【{1}】', val: '{2}'},
{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '选择【紧急站控】', val: '{2}' }, { deviceType: '05', orderNum: 4, operateCode: '007', tip: '选择【紧急站控】', val: '{2}' },

3
src/jmapNew/theme/race_01/menus/menuStation.vue
View File

@ -130,11 +130,14 @@ export default {
}; };
}, },
initMenu() { initMenu() {
if (this.selected.centralized) {
this.menu = MenuContextHandler.covert(this.menuNormal); this.menu = MenuContextHandler.covert(this.menuNormal);
// 故障模式菜单列表 // 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) { if (this.operatemode === OperateMode.FAULT) {
this.menu = this.menuForce; this.menu = this.menuForce;
} }
}
}, },
doShow(point) { doShow(point) {
this.clickEvent(); this.clickEvent();

111
src/jmapNew/theme/xian_02/menus/menuDialog/speedLimit.vue Normal file
View File

@ -0,0 +1,111 @@
<template>
<el-dialog
v-dialogDrag
class="xian-02__system manage-user"
:title="title"
:visible.sync="show"
width="850"
:before-close="doClose"
:z-index="2000"
:modal="false"
:close-on-click-modal="false"
>
<div style="height: 430px;">
<el-row>
<el-col :span="4">编号</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="4">内部名称</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
<el-col :span="4">内部起始点(kp)</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
<el-col :span="4">内部终止点(kp)</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="4">CBTC轨道ID</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
<el-col :span="4">CBTC起始点</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
<el-col :span="4">CBTC终止点</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="4">限速(kph)</el-col>
<el-col :span="4"><el-input size="mini" /></el-col>
<el-col :span="8">
<div>
<div>方向</div>
<el-checkbox-group v-model="checkList1">
<el-checkbox value="southwest" label="西/南" />
<el-checkbox value="northeast" label="东/北" />
</el-checkbox-group>
</div>
</el-col>
<el-col :span="8">
<div>
<div>区域</div>
<el-checkbox-group v-model="checkList2">
<el-checkbox value="constructionArea" label="施工区域" />
<el-checkbox value="closed" label="区域关闭" />
</el-checkbox-group>
</div>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<span>原因</span>
<el-input size="mini" />
</el-row>
<el-row style="margin-top: 10px;">
<div>注释</div>
<el-input type="textarea" :rows="3" />
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="3">创建人</el-col>
<el-col :span="5"><el-input size="mini" /></el-col>
<el-col :span="1">开</el-col>
<el-col :span="3"><el-input size="mini" /></el-col>
<el-col :span="1">在</el-col>
<el-col :span="3"><el-input size="mini" /></el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="3">修改</el-col>
<el-col :span="5"><el-input size="mini" /></el-col>
<el-col :span="1">开</el-col>
<el-col :span="3"><el-input size="mini" /></el-col>
<el-col :span="1">在</el-col>
<el-col :span="3"><el-input size="mini" /></el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-input type="textarea" :rows="3" />
</el-row>
</div>
</el-dialog>
</template>
<script>
export default {
name: 'SpeedLimit',
data() {
return {
show: false,
title: '临时限速',
checkList1: [],
checkList2: []
};
},
methods: {
doClose() {
this.show = false;
},
doShow() {
this.show = true;
}
}
};
</script>
<style scoped>
</style>

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

@ -8,6 +8,7 @@
<set-fault ref="setFault" pop-class="xian-02__system" /> <set-fault ref="setFault" pop-class="xian-02__system" />
<train-add-plan ref="trainAddPlan" pop-class="xian-02__system" /> <train-add-plan ref="trainAddPlan" pop-class="xian-02__system" />
<load-spare-train ref="loadSpareTrain" pop-class="xian-02__system" /> <load-spare-train ref="loadSpareTrain" pop-class="xian-02__system" />
<speed-limit ref="speedLimit" />
</div> </div>
</template> </template>
@ -26,6 +27,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate'; 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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import SpeedLimit from './menuDialog/speedLimit';
export default { export default {
name: 'SectionMenu', name: 'SectionMenu',
@ -37,7 +39,8 @@ export default {
NoticeInfo, NoticeInfo,
TrainAddPlan, TrainAddPlan,
SetFault, SetFault,
LoadSpareTrain LoadSpareTrain,
SpeedLimit
}, },
props: { props: {
selected: { selected: {
@ -298,7 +301,7 @@ 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.speedLimitControl.doShow(operate, this.selected); this.$refs.speedLimit.doShow(operate, this.selected);
} }
}); });
}, },