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:
sunzhenyu 2021-06-03 18:03:50 +08:00
commit 9ae1cf2ead
41 changed files with 1711 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<template>
<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" :allowedColor="allowedColor" :disabledColor="disabledColor" @close="close" />
<pop-menu-item v-for="(option, i) in menu" :key="i" :option="option" :pop-class="popClass" :allowed-color="allowedColor" :disabled-color="disabledColor" @close="close" />
</div>
</template>
@ -30,14 +30,14 @@ export default {
return '';
}
},
allowedColor: {
type: String,
default: '#000'
},
allowedColor: {
type: String,
default: '#000'
},
disabledColor: {
type: String,
default: '#ccc'
}
type: String,
default: '#ccc'
}
},
data() {
return {
@ -139,5 +139,6 @@ $item-border: #909399;
margin: 0px;
z-index: 9999;
border: 1px solid $item-border;
overflow: visible !important;
}
</style>

9
src/components/QueryListPage/QueryListPage.vue
View File

@ -379,7 +379,9 @@ export default {
// this.pageIndex = 1;
this.queryData[this.currentpagerConfig.pageSize] = this.pageSize;
this.queryData[this.currentpagerConfig.pageIndex] = this.pageIndex;
this.queryList.reload();
// this.queryList.reload();
this.choose = null;
this.commitQuery();
},
// 导出操作
queryExport(queryData) {
@ -455,7 +457,10 @@ export default {
}
// 加时间戳
// this.queryData._time = this.$moment()._d.getTime();
this.queryList.reload();
// this.queryList.reload();
this.choose = null;
this.commitQuery();
},
/**
* 改变分页大小回调函数，执行完毕后，iview会自动触发changePage事件，去查第一页数据

1
src/ibp/utils/parser.js
View File

@ -36,7 +36,6 @@ export function deviceFactory(type, elem) {
export function parser(data) {
var ibpDevice = {};
if (data) {
Object.assign(data.background);
ibpDevice[data.background.code] = deviceFactory(deviceType.Background, data.background);
store.dispatch('ibp/setIbpBgDevice', ibpDevice[data.background.code]);
zrUtil.each(data.textList || [], elem => {

13
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -137,8 +137,9 @@ class SkinCode extends defaultStyle {
standardLength: 6, // 高柱长度
standardHeight: 6, // 灯柱高度
standardColor: '#C0C0C0', // 灯柱颜色
standardVerticalWidth: 2, // 灯柱竖杆宽度
standardRailWidth: 2 // 灯柱横杆宽度
standardVerticalWidth: 2, // 灯柱竖杆宽度
standardRailWidth: 2, // 灯柱横杆宽度
approachLockColor: '#FFFF00' // 接近锁闭灯柱颜色
},
text: {
show: true, // 信号机名称显示
@ -256,7 +257,7 @@ class SkinCode extends defaultStyle {
yellowColor: 'yellow', // 控制模式黄色
stroke: '#FFFFFF', // 框的颜色
fill: 'rgba(0,0,0,0)', // 填充色
textColorNoChange: true
textColorNoChange: true
},
emergencyControl: { // 紧急站控
show: true,
@ -353,8 +354,8 @@ class SkinCode extends defaultStyle {
borderBackgroundColor: '#22DFDF', // 边框背景色
borderColor: '#fff', // 边框颜色
textShadowColor: '#22DFDF', // 字体阴影颜色
coreBackgroundColor: '#00BFFF', // 岔芯颜色 浅蓝色
coreBackgroundColorOver: '#001AFC', // 岔芯颜色 深蓝色
coreBackgroundColor: '#00BFFF', // 岔芯颜色 浅蓝色
coreBackgroundColorOver: '#001AFC' // 岔芯颜色 深蓝色
}
};
@ -858,7 +859,7 @@ class SkinCode extends defaultStyle {
};
this[deviceType.FloodGate] = {};
this[deviceType.DirectionRod] = {};
this[deviceType.IndicatorLight] = {};
this[deviceType.IndicatorLight] = {};
}
}

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

@ -663,10 +663,12 @@ class SkinCode extends defaultStyle {
directionArrow: {
},
soonerOrLater: {
level: 3,
level: 5,
serviceNumber: true,
severeEarlyColor: '#FF00FF',
earlyColor: '#00FF00',
lateColor: '#800000',
lateColor: '#FFFF00',
severeLateColor: '#800000',
normalColor: '#FFF'
},
hsda: {

2
src/jmapNew/map.js
View File

@ -46,6 +46,7 @@ class Jlmap {
this.stationCode = '';
this.isUpdateShowTrainList = false;
this.isUpdateRunLineTrain = false;
this._disposeFlag = false;
}
// 初始化属性有鼠标事件 缩放等
@ -668,6 +669,7 @@ class Jlmap {
this.$keyboardController.dispose();
this.$zr && zrender.dispose(this.$zr);
this.$painter.dispose();
this._disposeFlag = true;
}
on(eventname, cb, context) {

8
src/jmapNew/shape/graph/Signal/index.js
View File

@ -733,7 +733,12 @@ class Signal extends Group {
// this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
// this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.blueColor);
// }
// 信号机接近锁闭
handleApproachLock() {
if (this.style.Signal.post.approachLockColor) { // 设置底座颜色
this.sigPost.setColor(this.style.Signal.post.approachLockColor);
}
}
fault() {
if (this.style.Signal.lamp.faultType == 'flash') {
this.lamps[0].faultShow();
@ -1032,6 +1037,7 @@ class Signal extends Group {
if (model.hasSelected) {
this.sigName && this.sigName.setAnimationStart(this.style.Signal.text.defaultColor);
}
model.approachLock && this.handleApproachLock();
// 信号机故障
model.fault && this.fault();
if (model.guideTime) {

10
src/jmapNew/shape/graph/Station/index.js
View File

@ -169,7 +169,6 @@ export default class Station extends Group {
this.createInterconnectedControl(); // 联锁控
}
}
}
this.setState(model);
}
@ -775,13 +774,14 @@ export default class Station extends Group {
}
setShowMode() {
if (this.model.showMode === '05') {
this.createTroButton(); // 创建轨道预览按钮
if (this.troButton) {
this.troButton.show();
} else {
this.createTroButton(); // 创建轨道预览按钮
}
} else {
this.troButton && this.troButton.hide();
// this.troButton && this.troButton.dirty();
this.dirty();
}
console.log(this.model.showMode, '==', this.troButton);
}
setShowStation(flag) {
if (flag) {

18
src/jmapNew/shape/graph/Train/EMouse.js
View File

@ -53,7 +53,7 @@ class EMouse extends Group {
text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
} else {
if (this.device.style.Train.moreTrainDetail) {
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}${this.parseDt(this.device.model.dt)}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
} else {
text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
}
@ -111,7 +111,21 @@ class EMouse extends Group {
this.trainBorder.hide();
}
}
parseDt(dt) {
const time = Math.abs(dt);
if (time < 120) {
return '';
} else if (time < 3600) {
const m = Math.floor(time / 60);
const s = time % 60;
return m + '分' + s + '秒';
} else {
const h = Math.floor(time / 3600);
const m = Math.floor( time % 3600 / 60);
const s = time % 60;
return h + '小时' + m + '分' + s + '秒';
}
}
mouseover() {
if (this.device.model.style.Train.common.trainTip) {
this.device.deviceModel.__down = true;

12
src/jmapNew/shape/graph/Train/TrainBody.js
View File

@ -381,7 +381,17 @@ export default class TrainBody extends Group {
}
}
setSoonerOrLater(dt) {
if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 5) {
if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 5 && this.style.Train.soonerOrLater.serviceNumber) {
if (dt > 240) {
this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.severeEarlyColor});
} else if (dt > 120) {
this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.earlyColor});
} else if (dt < -240) {
this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.severeLateColor});
} else if (dt < -120) {
this.style.Train.soonerOrLater.serviceNumber && this.textTrainServer && this.textTrainServer.setStyle({textFill: this.style.Train.soonerOrLater.lateColor});
}
} else if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 5) {
if (dt > 120) {
this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.severeEarlyColor});
this.delayTime && this.delayTime.setStyle({textFill: this.style.Train.soonerOrLater.severeEarlyColor});

150
src/jmapNew/theme/beijing_01/menus/menuTrain.vue
View File

@ -12,6 +12,7 @@
<train-set-head ref="trainSetHead" />
<train-set-work ref="trainSetWork" />
<train-flag ref="trainFlag" />
<speed-limit ref="speedLimit" pop-class="beijing-01__systerm" />
<set-fault ref="setFault" pop-class="beijing-01__systerm" />
</div>
</template>
@ -36,6 +37,7 @@ import TrainFlag from './dialog/trainFlag';
// import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
// import CMD from '@/scripts/cmdPlugin/CommandEnum';
@ -54,7 +56,8 @@ export default {
TrainSetHead,
TrainSetWork,
TrainFlag,
SetFault
SetFault,
SpeedLimit
},
props: {
selected: {
@ -227,10 +230,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -238,6 +237,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -342,19 +378,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -381,6 +404,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const operate = {

150
src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
View File

@ -2,6 +2,7 @@
<div>
<pop-menu ref="popMenu" :menu="menu" />
<notice-info ref="noticeInfo" pop-class="chengdou-01__system" />
<speed-limit ref="speedLimit" pop-class="chengdou-01__system" />
<set-fault ref="setFault" pop-class="chengdou-01__system" />
</div>
</template>
@ -16,6 +17,7 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import CMD from '@/scripts/cmdPlugin/CommandEnum';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import CancelMouseState from '@/mixin/CancelMouseState';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -23,7 +25,8 @@ export default {
components: {
PopMenu,
NoticeInfo,
SetFault
SetFault,
SpeedLimit
},
mixins: [
CancelMouseState
@ -140,10 +143,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -151,6 +150,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -252,19 +288,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -291,6 +314,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const operate = {

150
src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
View File

@ -8,6 +8,7 @@
<train-move-number ref="trainMoveNumber" />
<train-delete-number ref="trainDeleteNumber" />
<train-detail-info ref="trainDetailInfo" />
<speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
<set-fault ref="setFault" pop-class="chengdou-03__systerm" />
</div>
</template>
@ -29,6 +30,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
export default {
name: 'MenuTrain',
@ -41,7 +43,8 @@ export default {
TrainCreateNumber,
TrainDeleteNumber,
TrainDetailInfo,
SetFault
SetFault,
SpeedLimit
},
mixins: [
CancelMouseState
@ -123,10 +126,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -134,6 +133,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -223,19 +259,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -262,6 +285,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const operate = {

46
src/jmapNew/theme/components/menus/dialog/setFault.vue
View File

@ -17,7 +17,7 @@
<el-form ref="form" :model="formModel" :rules="rules">
<el-col :span="24">
<el-form-item prop="targetDeviceCode" label="目的地:">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" size="small" style="width: 165px;height: 32px;line-height: 32px;" placeholder="请选择">
<el-select ref="faultSelect1" v-model="formModel.targetDeviceCode" size="small" style="height: 32px;line-height: 32px;" placeholder="请选择">
<el-option
v-for="item in selectedList"
:key="item.code"
@ -25,11 +25,11 @@
:value="item.code"
/>
</el-select>
<el-button
:type="field == 'selectedCode' ? 'danger' : 'primary'"
size="small"
@click="hover('selectedCode')"
>激活</el-button>
<!--<el-button-->
<!--:type="field == 'selectedCode' ? 'danger' : 'primary'"-->
<!--size="small"-->
<!--@click="hover('selectedCode')"-->
<!--&gt;激活</el-button>-->
</el-form-item>
</el-col>
</el-form>
@ -109,7 +109,7 @@ export default {
targetDeviceCode: ''
},
groupNumber: '',
field: '',
field: 'selectedCode',
selected: null,
rules: {
faultType: [
@ -125,11 +125,7 @@ export default {
]),
selectedList() {
let list = [];
let sectionList = [];
if (this.sectionList && this.sectionList.length) {
sectionList = this.sectionList.filter(elem => { return (elem.standTrack || elem.reentryTrack || elem.transferTrack); });
}
list = [...sectionList, ...this.trainList];
list = [...this.sectionList, ...this.trainList];
return list;
},
show() {
@ -147,7 +143,7 @@ export default {
} else if (this.operation == OperationEvent.MixinCommand.cancelStoppage.menu.operation) {
return '取消故障';
} else if (this.operation == OperationEvent.MixinCommand.collocation.menu.operation) {
return '设置托管';
return '驾驶至';
}
return '';
}
@ -160,7 +156,7 @@ export default {
},
'$store.state.menuOperation.selectedCount':function(em) {
const device = this.$store.state.menuOperation.selected;
if (device && device.code && this.judge && this.field) {
if (device && device.code && this.judge && this.field && this.show) {
if (device._type == 'Section' || device._type == 'Train') {
this.deviceSelect(device);
}
@ -168,9 +164,9 @@ export default {
}
},
methods: {
hover(field) {
this.field = field == this.field ? '' : field;
},
// hover(field) {
// this.field = field == this.field ? '' : field;
// },
doShow(operate, selected, judge) {
this.$root.$emit('dialogOpen', selected);
this.selected = selected;
@ -189,12 +185,12 @@ export default {
this.deviceName = deviceType[selected._type];
}
this.faultList = deviceFaultType[selected._type];
if (selected._type == 'Switch' && this.popClass == 'xian-01__systerm' ) {
// && this.$route.query.lineCode == '11'
this.faultList = this.faultList.filter(fault=>{
return fault.value != 'NORMAL_SPLIT' && fault.value != 'REVERSE_SPLIT';
});
}
// if (selected._type == 'Switch' && this.popClass == 'xian-01__systerm' ) {
// // && this.$route.query.lineCode == '11'
// this.faultList = this.faultList.filter(fault=>{
// return fault.value != 'NORMAL_SPLIT' && fault.value != 'REVERSE_SPLIT';
// });
// }
if (this.faultList && this.faultList.length) {
this.form.faultType = this.faultList[0].value;
}
@ -302,10 +298,10 @@ export default {
deviceSelect(em) {
if (this.field == 'selectedCode' && em._type == 'Section') {
this.formModel.targetDeviceCode = em.code;
this.field = '';
// this.field = '';
} else if (this.field == 'selectedCode' && em._type == 'Train') {
this.formModel.targetDeviceCode = em.code;
this.field = '';
// this.field = '';
}
}
}

4
src/jmapNew/theme/components/menus/dialog/trainSpeedLimit.vue
View File

@ -98,7 +98,7 @@ export default {
}
},
doShow(selected) {
this.$root.$emit('dialogOpen', selected);
this.$root.$emit('dialogOpen', selected);
this.selected = selected;
this.addModel = {
speedLimit:''
@ -112,7 +112,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.$root.$emit('dialogClose', this.selected);
this.$root.$emit('dialogClose', this.selected);
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('map/setTrainWindowShow', false);
},

153
src/jmapNew/theme/foshan_01/menus/menuTrain.vue
View File

@ -14,6 +14,7 @@
<train-set-work ref="trainSetWork" />
<trainSetWorkATP ref="trainSetWorkATP" />
<set-fault ref="setFault" pop-class="foshan-01__systerm" />
<speed-limit ref="speedLimit" pop-class="foshan-01__systerm" />
</div>
</template>
@ -24,15 +25,12 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import TrainDelete from './dialog/trainDelete';
import TrainDefine from './dialog/trainDefine';
import TrainMove from './dialog/trainMove';
// import TrainEdit from './dialog/trainEdit';
import TrainSetPlan from './dialog/trainSetPlan';
import TrainControl from '@/jmapNew/theme/components/menus/dialog/trainControl';
// import TrainMoveEvently from './dialog/trainMoveEvently';
// import TrainDeletePlan from './dialog/trainDeletePlan';
import TrainSetHead from './dialog/trainSetHead';
import TrainSetWork from './dialog/trainSetWork';
import trainSetWorkATP from './dialog/trainSetWorkATP';
// import TrainFlag from './dialog/trainFlag';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@ -57,7 +55,8 @@ export default {
TrainSetWork,
trainSetWorkATP,
SetFault,
TrainControl
TrainControl,
SpeedLimit
},
props: {
selected: {
@ -135,10 +134,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -146,6 +141,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -242,18 +274,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -278,6 +298,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const step = {

150
src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
View File

@ -7,6 +7,7 @@
<train-move ref="trainMove" />
<train-switch ref="trainSwitch" />
<train-edit-number ref="trainEditNumber" />
<speed-limit ref="speedLimit" pop-class="fuzhou-01__systerm" />
<set-fault ref="setFault" pop-class="fuzhou-01__systerm" />
</div>
</template>
@ -25,6 +26,7 @@ import TrainMove from './dialog/trainMove';
import TrainSwitch from './dialog/trainSwitch';
import TrainEditNumber from './dialog/trainEditNumber';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -37,7 +39,8 @@ export default {
TrainMove,
TrainSwitch,
TrainEditNumber,
SetFault
SetFault,
SpeedLimit
},
props: {
selected: {
@ -100,10 +103,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -111,6 +110,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -214,19 +250,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -253,6 +276,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const step = {

150
src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
View File

@ -7,6 +7,7 @@
<!-- <train-move ref="trainMove" /> -->
<!-- <train-switch ref="trainSwitch" /> -->
<!-- <train-edit-number ref="trainEditNumber" /> -->
<speed-limit ref="speedLimit" pop-class="haerbin-01__systerm" />
<set-fault ref="setFault" pop-class="haerbin-01__systerm" />
</div>
</template>
@ -25,6 +26,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import TrainSwitch from './dialog/trainSwitch';
// import TrainEditNumber from './dialog/trainEditNumber';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -37,7 +39,8 @@ export default {
// TrainMove,
// TrainSwitch,
// TrainEditNumber,
SetFault
SetFault,
SpeedLimit
},
props: {
selected: {
@ -76,10 +79,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -87,6 +86,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -208,19 +244,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -247,6 +270,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
}

148
src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
View File

@ -7,6 +7,7 @@
<!-- <train-move ref="trainMove" /> -->
<!-- <train-switch ref="trainSwitch" /> -->
<!-- <train-edit-number ref="trainEditNumber" /> -->
<speed-limit ref="speedLimit" pop-class="haerbin-01__systerm" />
<set-fault ref="setFault" pop-class="haerbin-01__systerm" />
</div>
</template>
@ -25,6 +26,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import TrainSwitch from './dialog/trainSwitch';
// import TrainEditNumber from './dialog/trainEditNumber';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -32,6 +34,7 @@ export default {
components: {
PopMenu,
NoticeInfo,
SpeedLimit,
// TrainControl,
// TrainDelete,
// TrainMove,
@ -76,10 +79,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -87,6 +86,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -207,19 +243,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_Ahead',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -246,6 +269,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
triggerFaultManagement() {
this.$store.dispatch('training/setTriggerFaultCount', this.selected);
}

147
src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
View File

@ -9,7 +9,7 @@
<train-set-head ref="trainSetHead" />
<train-set-work ref="trainSetWork" />
<trainSetWorkATP ref="trainSetWorkATP" />
<SpeedLimit ref="speedLimit" pop-class="ningbo-01__systerm" />
<speed-limit ref="speedLimit" pop-class="ningbo-01__systerm" />
<set-fault ref="setFault" pop-class="ningbo-01__systerm" />
</div>
</template>
@ -214,33 +214,50 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: 'URM模式驾驶',
handler: this.handleURMTrain
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开/关门',
handler: this.handleOpenCloseDoor
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handlerTurnDirection
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -331,19 +348,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -370,45 +374,92 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
handleURMTrain() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_In_Urm_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 操作列车 开/关门
handleOpenCloseDoor() {
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 列车换端
handlerTurnDirection() {
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();

137
src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
View File

@ -215,29 +215,50 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: 'URM模式驾驶',
handler: this.handleURMTrain
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开/关门',
handler: this.handleOpenCloseDoor
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -327,19 +348,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -366,14 +374,15 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
handleURMTrain() {
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_In_Urm_Mode',
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
@ -382,15 +391,75 @@ export default {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 操作列车 开/关门
handleOpenCloseDoor() {
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();

121
src/jmapNew/theme/race_01/menus/menuTrain.vue
View File

@ -225,10 +225,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '限速指令',
handler: this.handleSpeedLimit
@ -237,10 +233,6 @@ export default {
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: 'URM模式驾驶',
handler: this.handleURMTrain
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
@ -248,6 +240,35 @@ export default {
{
label: '开/关门',
handler: this.handleOpenCloseDoor
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -361,19 +382,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -400,21 +408,60 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
handleURMTrain() {
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Drive_In_Urm_Mode',
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 操作列车 开/关门
handleOpenCloseDoor() {
@ -430,6 +477,28 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 限速行驶
limitSpeed() {
const operate = {

227
src/jmapNew/theme/xian_01/menus/menuTrain.vue
View File

@ -1,6 +1,6 @@
<template>
<div>
<pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" />
<pop-menu ref="popMenu" :menu="menu" pop-menu-class="xian-01__systerm" disabled-color="#aaa" />
<notice-info ref="noticeInfo" pop-class="xian-01__systerm" />
<train-control ref="trainControl" pop-class="xian-01__systerm" />
<train-delete ref="trainDelete" />
@ -8,6 +8,7 @@
<train-switch ref="trainSwitch" />
<train-edit-number ref="trainEditNumber" />
<train-detail ref="trainDetail" />
<speed-limit ref="speedLimit" pop-class="xian-01__systerm" />
<set-fault ref="setFault" pop-class="xian-01__systerm" />
<!-- <select-station ref="selectStation" @selectStationCode="selectStationCode" /> -->
</div>
@ -29,6 +30,7 @@ import TrainSwitch from './dialog/trainSwitch';
import TrainEditNumber from './dialog/trainEditNumber';
import TrainDetail from './dialog/trainDetail';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
@ -42,7 +44,8 @@ export default {
TrainSwitch,
TrainEditNumber,
TrainDetail,
SetFault
SetFault,
SpeedLimit
// SelectStation
},
props: {
@ -118,24 +121,58 @@ export default {
],
menuDirective: [
{
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '换端',
handler: this.handlerTurnDirection
label: '故障处理',
children: [
{
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
},
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
]
}
],
menuSpeed: [
@ -175,11 +212,13 @@ export default {
this.menu = MenuContextHandler.covert(this.menuNormal);
if (this.operatemode === OperateMode.ADMIN) {
this.menu = [...this.menu, ...this.menuForce];
} else {
this.menu = [...this.menu, ...this.menuDirective];
}
// 故障模式菜单列表
if (this.operatemode === OperateMode.FAULT) {
if (!this.$store.state.scriptRecord.bgSet) {
this.menu = [...this.menuForce, ...this.menuDirective];
this.menu = [...this.menuForce];
} else {
this.menu = [...this.menuForce];
}
@ -332,61 +371,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 列车换端
handlerTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
// 处理显示车站列表
// const list = [];
// let direction = this.selected.right == 1;
// if (!this.$store.state.map.mapConfig.upRight) {
// direction = this.selected.right != 1;
// }
// let parentModel = this.selected.sectionModel;
// if (this.selected.sectionModel.parentCode) {
// parentModel = this.$store.getters['map/getDeviceByCode'](this.selected.sectionModel.parentCode);
// }
// this.stationList.forEach((item, index) => {
// const data = this.$store.getters['map/getDeviceByCode'](item.code);
// if (data.sectionCode) {
// const model = this.$store.getters['map/getDeviceByCode'](data.sectionCode);
// if (!direction && model.points[model.points.length - 1].x < parentModel.points[parentModel.points.length - 1].x) {
// list.push(item);
// } else if (direction && model.points[model.points.length - 1].x > parentModel.points[parentModel.points.length - 1].x) {
// list.push(item);
// }
// } else {
// if (!direction && index == 0) {
// list.push(item);
// } else if (direction && index == this.stationList.length - 1) {
// list.push(item);
// }
// }
// });
// this.$refs.selectStation.doShow(this.stationList);
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// selectStationCode(code) {
// const group = this.$route.query.group;
// const param = {
@ -427,6 +411,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
undeveloped() {
this.doClose();
this.$alert('实现中......', '提示', {

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

@ -11,6 +11,7 @@
<idle-running-mode ref="idleRunningMode" />
<train-mode ref="trainMode" />
<train-detail ref="trainDetail" />
<speed-limit ref="speedLimit" pop-class="xian-02__system" />
<set-fault ref="setFault" pop-class="xian-02__system" />
</div>
</template>
@ -28,6 +29,7 @@ import TrainUpdatePlan from './dialog/trainUpdatePlan';
import IdleRunningMode from './dialog/idleRunningMode';
import TrainMode from './dialog/trainMode';
import TrainDetail from './dialog/trainDetail';
import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@ -49,7 +51,8 @@ export default {
TrainUpdatePlan,
IdleRunningMode,
TrainMode,
TrainDetail
TrainDetail,
SpeedLimit
},
props: {
selected: {
@ -238,10 +241,6 @@ export default {
label: '确认运行至前方站',
handler: this.nextStation
},
{
label: '进路闭塞法行车',
handler: this.routeBlockRun
},
{
label: '越引导信号行驶',
handler: this.handleOverFuideSignal
@ -249,6 +248,43 @@ export default {
{
label: '越红灯行驶',
handler: this.handleOverEedLight
},
{
label: '开关门',
handler: this.handleOpenOrCloseDoor
},
{
label: '限速指令',
handler: this.handleSpeedLimit
},
{
label: '换端',
handler: this.handleTurnDirection
},
{
label: '驾驶至',
handler: this.handleDriveTo
},
{
label: '切换驾驶模式',
children: [
{
label: '转URM模式',
handler: this.handleApplyUrmMode
},
{
label: '转RM模式',
handler: this.handleApplyRmMode
},
{
label: '转CM模式',
handler: this.handleApplyCmMode
},
{
label: '转AM模式',
handler: this.handleApplyAmMode
}
]
}
],
menuSpeed: [
@ -349,19 +385,6 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
routeBlockRun() {
const group = this.$route.query.group;
const param = {
commandType: 'Route_Block_Drive',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate})=>{
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleOverFuideSignal() {
const group = this.$route.query.group;
const param = {
@ -388,6 +411,97 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
// 开关门
handleOpenOrCloseDoor() {
const group = this.$route.query.group;
const param = {
commandType: 'Open_Or_Close_Door',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleSpeedLimit() { // 限速指令
this.$refs.speedLimit.doShow(this.selected);
},
// 驾驶至（托管）
handleDriveTo() {
commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
}
});
},
// 换端
handleTurnDirection() {
const group = this.$route.query.group;
const param = {
commandType: 'Turn_Direction',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error)=> {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyUrmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_URM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyRmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_RM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyCmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_CM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) =>{
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
handleApplyAmMode() {
const group = this.$route.query.group;
const param = {
commandType: 'Apply_AM_Mode',
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
params: {}
};
commitTrainSend(group, param).then(({valid, operate}) => {
}).catch((error) => {
console.error(error);
this.$refs.noticeInfo.doShow();
});
},
// 取消停车命令
trainCancleOrderStop() {
this.trainOrder(true);

5
src/scripts/ConstConfig.js
View File

@ -222,6 +222,11 @@ export default {
{ name: '固定应答器', value: 'FB'},
{ name: '可变应答器', value: 'VB'},
{ name: '填充应答器', value: 'IB'}
],
loadRuleList: [
{ label: '每日加载', value:'EVERY_DAY' },
{ label: '周内加载', value: 'WITHIN_A_WEEK' },
{ label: '周末加载', value: 'WEEKEND' }
]
}
};

13
src/views/drts/scene/modify.vue
View File

@ -394,12 +394,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
resultData = member.label + '对【' + targetName.label + '】下达【' + CommandList[element.commandInitiateVO.commandType] + '】指令';
} else if (element.type == 'Drive') {

13
src/views/drts/scene/trainingResult.vue
View File

@ -312,12 +312,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
resultData = member.label + '对【' + targetName.label + '】下达【' + CommandList[element.commandInitiateVO.commandType] + '】指令';
} else if (element.type == 'Drive') {

13
src/views/drts/scene/voiceTraining.vue
View File

@ -250,12 +250,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
resultData = member.label + '对【' + targetName.label + '】下达【' + CommandList[element.commandInitiateVO.commandType] + '】指令';
} else if (element.type == 'Drive') {

4
src/views/newMap/displayBaSiDi/baSiDi.vue
View File

@ -110,7 +110,7 @@
<div class="display-draft">
<el-button-group class="button-group-box">
<template v-if="!dataError">
<el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<el-button type="success" :disabled="isRunPlan" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
<el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
</template>
<el-button type="primary" size="small" @click="back">{{ $t('display.demon.back') }}</el-button>
@ -137,7 +137,7 @@ export default {
type: Boolean,
required: true
},
isDisable: {
isRunPlan: {
type: Boolean,
required: true
}

10
src/views/newMap/displayBaSiDi/index.vue
View File

@ -2,17 +2,17 @@
<div class="main" :style="{width: '100%',height:'100%',position:'absolute',overflow:'hidden'}" style="background: #000;">
<ba-si-di
ref="baSiDi"
:is-disable="isDisable"
:is-run-plan="isRunPlan"
:data-error="dataError"
@handleDialogShow="handleDialogShow"
@end="end"
@back="back"
@selectBeginTime="selectBeginTime"
/>
<rps-dialog ref="rpsDialog" :train-list="trainList" />
<tro-dialog ref="troDialog" :train-list="trainList" :station-list="stationList" />
<rps-dialog ref="rpsDialog" :is-run-plan="isRunPlan" :train-list="trainList" />
<tro-dialog ref="troDialog" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" />
<car-pack ref="carPack" />
<tro-detail ref="troDetail" :train-list="trainList" :station-list="stationList" @goTroDialog="troClick" />
<tro-detail ref="troDetail" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" @goTroDialog="troClick" />
<tra-dialog ref="traDialog" />
<ttl-dialog ref="ttlDialog" />
<tmt-dialog ref="tmtDialog" />
@ -98,7 +98,7 @@ export default {
projectDevice() {
return this.$route.query.projectDevice;
},
isDisable() {
isRunPlan() {
return this.$store.state.training.started;
}
},

13
src/views/newMap/displayBaSiDi/rps.vue
View File

@ -25,6 +25,10 @@ export default {
trainList: {
type: Array,
required: true
},
isRunPlan: {
type: Boolean,
required: true
}
},
data() {
@ -63,7 +67,7 @@ export default {
}
},
beforeDestroy() {
if (!this.dialogShow) {
if (this.selfJmap && this.selfJmap._disposeFlag) {
this.destroy();
}
},
@ -71,7 +75,6 @@ export default {
doShow() {
this.dialogShow = true;
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$jlmap && this.$jlmap.clearTrainView();
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.$nextTick(function() {
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
@ -82,12 +85,11 @@ export default {
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
!this.isRunPlan && this.$jlmap.clearTrainView();
});
},
destroy() {
if (this.selfJmap) {
this.selfJmap.dispose();
}
this.selfJmap.dispose();
},
handleUpdateScreen() {
this.maskOpen = false;
@ -116,6 +118,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
// this.$jlmap && this.$jlmap.clearTrainView();
this.selfJmap = Vue.prototype.$jlmap;
}
}

28
src/views/newMap/displayBaSiDi/tro.vue
View File

@ -34,6 +34,10 @@ export default {
trainList: {
type: Array,
required: true
},
isRunPlan: {
type: Boolean,
required: true
}
},
data() {
@ -76,14 +80,13 @@ export default {
}
},
beforeDestroy() {
if (!this.dialogShow) {
if (this.selfJmap && this.selfJmap._disposeFlag) {
this.destroy();
}
},
methods: {
doShow() {
this.dialogShow = true;
this.$jlmap && this.$jlmap.clearTrainView();
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.$nextTick(function() {
@ -95,28 +98,13 @@ export default {
}
this.$jlmap.updateShowMode(list, '05');
this.$store.dispatch('training/updateMapState', list);
!this.isRunPlan && this.$jlmap.clearTrainView();
});
},
destroy() {
if (this.selfJmap) {
this.selfJmap.dispose();
}
this.selfJmap.dispose();
},
showTroMode() {
// const nameList = Object.keys(this.$store.state.map.map || {});
// let list = [];
// nameList.forEach(item => {
// if (item !== 'skinVO') {
// const data = this.$store.state.map.map[item];
// if (data && data.constructor === Array) {
// list = [...list, ...data];
// }
// }
// });
// const trainList = [];
// this.trainList.forEach(item => {
// trainList.push({ code: item.groupNumber, deviceType:'TRAIN' });
// });
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
@ -124,7 +112,6 @@ export default {
}
this.handleUpdateScreen();
this.$jlmap.updateShowMode(list, '05'); // 二次过滤
// this.$store.dispatch('training/updateMapState', trainList);
},
handleUpdateScreen() {
this.maskOpen = false;
@ -148,6 +135,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.$jlmap && this.$jlmap.clearTrainView();
this.selfJmap = Vue.prototype.$jlmap;
}
}

12
src/views/newMap/displayBaSiDi/troDetail.vue
View File

@ -39,6 +39,10 @@ export default {
trainList: {
type: Array,
required: true
},
isRunPlan: {
type: Boolean,
required: true
}
},
data() {
@ -84,7 +88,7 @@ export default {
}
},
beforeDestroy() {
if (!this.dialogShow) {
if (this.selfJmap && !this.selfJmap._disposeFlag) {
this.destroy();
}
},
@ -92,7 +96,6 @@ export default {
doShow(deviceCode) {
this.dialogShow = true;
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$jlmap && this.$jlmap.clearTrainView();
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.deviceCode = deviceCode;
this.$nextTick(function() {
@ -104,6 +107,7 @@ export default {
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
!this.isRunPlan && this.$jlmap.clearTrainView();
});
},
doClose() {
@ -112,9 +116,7 @@ export default {
this.selfJmap = Vue.prototype.$jlmap;
},
destroy() {
if (this.selfJmap) {
this.selfJmap.dispose();
}
this.selfJmap.dispose();
},
goTroDialog() {
this.doClose();

13
src/views/newMap/displayNew/dispatherContest/testResult.vue
View File

@ -177,12 +177,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
resultData = member.label + '对【' + targetName.label + '】下达【' + CommandList[element.commandInitiateVO.commandType] + '】指令';
} else if (element.type == 'Drive') {

13
src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue
View File

@ -58,12 +58,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
this.scriptTipMessage = '请对【' + targetName.labelName + '】下达【' + CommandList[val.commandInitiateVO.commandType] + '】指令';
} else if (val.type == 'Drive') {

5
src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
View File

@ -267,8 +267,9 @@ export default {
methods: {
doShow(showType, codeType) {
this.show = true;
// this.reloadTable();
this.$refs.queryListPage.commitQuery();
this.$nextTick(() => {
this.$refs.queryListPage && this.$refs.queryListPage.commitQuery();
});
if (showType && codeType) {
this.showType = showType;
this.codeType = codeType;

1
src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
View File

@ -52,7 +52,6 @@ export default {
},
methods: {
initProtectData() {
debugger;
getOverlapAllList(this.$route.params.mapId).then(resp => {
this.overlapList = resp.data;
});

4
src/views/newMap/newMapdraft/mapoperate/signal/index.vue
View File

@ -64,7 +64,9 @@ export default {
{ code: 'BLOCKING', name: '阻挡信号机'},
{ code: 'PASSING', name: '通过信号机'},
{ code: 'TRANSMISSION', name: '传输信号机' },
{ code: 'SHUNTING', name: '调车信号机' }
{ code: 'SHUNTING', name: '调车信号机' },
{ code: 'ARRIVAL', name: '进站信号机' },
{ code: 'EXIT', name: '出站信号机' }
],
field:'',
editModel: getModel('Signal'),

16
src/views/publish/runPlanCommon/draft.vue
View File

@ -22,6 +22,11 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item label="加载规则" prop="loadRule">
<el-select v-model="model.loadRule">
<el-option v-for="item in loadRuleList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-form>
</div>
</div>
@ -39,6 +44,7 @@
import { getPublishMapListOnline } from '@/api/jmap/map';
import { createRunPlanCommon } from '@/api/runplan';
import ChooseTemplatePlan from './chooseTemplatePlan';
import ConstConfig from '@/scripts/ConstConfig';
export default {
name: 'CommonPlanDraft',
@ -50,10 +56,12 @@ export default {
display: 1,
loading: false,
mapList: [],
loadRuleList: ConstConfig.ConstSelect.loadRuleList,
model: {
mapId: '',
planId: '',
planName: ''
planName: '',
loadRule: ''
}
};
},
@ -71,6 +79,9 @@ export default {
],
planId: [
{ required: true, message: this.$t('rules.inputTemplateRunPlan'), trigger: 'change' }
],
loadRule: [
{ required: true, message: '请选择加载规则', trigger: 'change' }
]
};
@ -98,7 +109,8 @@ export default {
buildModel() {
return {
mapId: this.model.mapId,
templatePlanId: this.model.planId
templatePlanId: this.model.planId,
loadRule: this.model.loadRule
};
},
create() {

8
src/views/publish/runPlanCommon/index.vue
View File

@ -10,6 +10,7 @@ import { superAdmin } from '@/router/index';
import { getRunPlanLoadList, listAllTempLateRunPlan, deleteDailyRunPlanLoad, postDailyRunPlanLoadGenerate, postSchedulingCommonGenerate } from '@/api/runplan';
import { UrlConfig } from '@/scripts/ConstDic';
import CopyMap from './copyMap';
import ConstConfig from '@/scripts/ConstConfig';
import { getPublishMapListOnline } from '@/api/jmap/map';
export default {
@ -57,6 +58,13 @@ export default {
columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
tagType: (row) => { return 'success'; }
},
{
title: '加载规则',
prop: 'loadRule',
type: 'tag',
columnValue: (row) => { return this.$convertField(row.loadRule, ConstConfig.ConstSelect.loadRuleList, ['value', 'label']); },
tagType: (row) => { return 'success'; }
},
{
type: 'button',
title: this.$t('global.operate'),

13
src/views/scriptManage/getAction.vue
View File

@ -197,12 +197,17 @@ export default {
const CommandList = {
Drive_Ahead:'确认运行至前方站',
Route_Block_Drive:'进路闭塞法行车',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Switch_Hook_Lock: '道岔钩锁',
Drive_Through_The_Red_Light:'越红灯行驶',
Drive_In_Urm_Mode:'URM模式驾驶',
Set_Speed_Limit:'设置限速',
Drive_Through_The_Guide_Signal:'越引导信号行驶',
Open_Or_Close_Door:'开关门',
Switch_Hook_Lock: '道岔钩锁'
Set_Speed_Limit:'设置限速',
Turn_Direction: '换端',
Drive_To: '驾驶至',
Apply_URM_Mode: '转URM模式',
Apply_RM_Mode: '转RM模式',
Apply_CM_Mode: '转CM模式',
Apply_AM_Mode: '转AM模式'
};
this.actionInfoList.push({id: element.id, isCommand: true, memberName: memberName, command: CommandList[element.commandInitiateVO.commandType], targetName:targetName.name, row: element, visible: false, condition: element.condition});
break;