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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
sheng 2020-02-20 21:05:32 +08:00
commit 4016e2d932
19 changed files with 308 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -361,6 +361,7 @@ class SkinCode extends defaultStyle {
rectShow: false // 道岔单锁 矩形框是否显示
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: true, // 道岔名称是否有包围框 显示
contentRectShow: false // 道岔封锁显示
},
@ -546,50 +547,45 @@ class SkinCode extends defaultStyle {
}
], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左
directionStopType: [
{ type: '01', lineLShow: false, lineRShow: false },
{ type: '02', lineLShow: false, lineRShow: true },
{ type: '03', lineLShow: true, lineRShow: false }
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
{ type: 1, lineLShow: false, lineRShow: true },
{ type: 0, lineLShow: true, lineRShow: false }
], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左
driveModeStatus: [
{
status: '01',
trainLColor: '#FFFFFF',
trainRColor: '#FFFFFF'
},
{
status: '02',
status: 'AM',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
},
{
status: '05',
status: 'NRM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
}
], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [
{ status: '01', hShow: false, sShow: false },
{ status: '02', hShow: true, sShow: false },
{ status: '03', hShow: false, sShow: true }
], // 设置运行控制状态类型 01正常 02扣车 03停跳
doorStatus: [
{ status: '01', dShow: false },
{ status: '02', dShow: true }
], // 设置车门状态类型 01关门 02开门
{status: true, dShow: false},
{status: false, dShow: true}
], // 设置车门状态类型 true车门关闭且锁闭
communicationStatus: [
{ status: '01', trainColor: '#725A64' },
{ status: '02', trainColor: '#C0C0C0' }
], // 设置通信状态 01正常 02故障
{status: 'CBTC', trainColor: '#725A64'},
{status: 'ITC', trainColor: '#C0C0C0'},
{status: 'IL', trainColor: '#C0C0C0'}
], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL
alarmStatus: [
{ status: '01', aShow: false },
{ status: '02', aShow: true }

42
src/jmapNew/config/skinCode/chengdu_01.js
View File

@ -355,6 +355,7 @@ class SkinCode extends defaultStyle {
rectBorderColor: '#fff' // 矩形边框颜色
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: false, // 道岔名称是否有包围框 显示
contentRectShow: true, // 道岔封锁显示
contentRectColor: 'red' // 道岔封锁边框颜色
@ -506,48 +507,38 @@ class SkinCode extends defaultStyle {
], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左
directionStopType: [
{
type: '01',
lineLShow: false,
lineRShow: false
},
{
type: '02',
type: 1,
lineLShow: false,
lineRShow: true
},
{
type: '03',
type: 0,
lineLShow: true,
lineRShow: false
}
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左
driveModeStatus: [
{
status: '01',
trainLColor: '#FFFFFF',
trainRColor: '#FFFFFF'
},
{
status: '02',
status: 'AM',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
},
{
status: '05',
status: 'NRM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
}
], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [
{
status: '01',
@ -566,13 +557,14 @@ class SkinCode extends defaultStyle {
}
], // 设置运行控制状态类型 01正常 02扣车 03停跳
doorStatus: [
{status: '01', dShow: false},
{status: '02', dShow: true}
], // 设置车门状态类型 01关门 02开门
{status: true, dShow: false},
{status: false, dShow: true}
], // 设置车门状态类型 true车门关闭且锁闭
communicationStatus: [
{status: '01', trainColor: '#725A64'},
{status: '02', trainColor: '#C0C0C0'}
], // 设置通信状态 01正常 02故障
{status: 'CBTC', trainColor: '#000099'},
{status: 'ITC', trainColor: '#747474'},
{status: 'IL', trainColor: '#747474'}
], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL
alarmStatus: [
{status: '01', aShow: false},
{status: '02', aShow: true}

46
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -360,6 +360,7 @@ class SkinCode extends defaultStyle {
rectBorderColor: '#fff' // 矩形边框颜色
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: false, // 道岔名称是否有包围框 显示
contentRectShow: true, // 道岔封锁显示
contentRectColor: 'red' // 道岔封锁边框颜色
@ -521,48 +522,38 @@ class SkinCode extends defaultStyle {
], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左
directionStopType: [
{
type: '01',
lineLShow: false,
lineRShow: false
},
{
type: '02',
type: 1,
lineLShow: false,
lineRShow: true
},
{
type: '03',
type: 0,
lineLShow: true,
lineRShow: false
}
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左
driveModeStatus: [
{
status: '01',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '02',
status: 'AM',
trainLColor: '#FF8000',
trainRColor: '#FF8000'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#C2C2C2',
trainRColor: '#C2C2C2'
},
{
status: '05',
trainLColor: '#C2C2C2',
trainRColor: '#C2C2C2'
status: 'NRM',
trainLColor: '#FF0000',
trainRColor: '#FF0000'
}
], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [
{
status: '01',
@ -581,13 +572,14 @@ class SkinCode extends defaultStyle {
}
], // 设置运行控制状态类型 01正常 02扣车 03停跳
doorStatus: [
{status: '01', dShow: false},
{status: '02', dShow: true}
], // 设置车门状态类型 01关门 02开门
{status: true, dShow: false},
{status: false, dShow: true}
], // 设置车门状态类型 true车门关闭且锁闭
communicationStatus: [
{status: '01', trainColor: '#725A64'},
{status: '02', trainColor: '#C0C0C0'}
], // 设置通信状态 01正常 02故障
{status: 'CBTC', trainColor: '#000099'},
{status: 'ITC', trainColor: '#747474'},
{status: 'IL', trainColor: '#747474'}
], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL
alarmStatus: [
{status: '01', aShow: false},
{status: '02', aShow: true}

20
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -339,6 +339,7 @@ class SkinCode extends defaultStyle {
length: 6 // 道岔单边长度
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: true, // 道岔名称是否有包围框 显示
contentRectShow: false // 道岔封锁显示
},
@ -527,35 +528,30 @@ class SkinCode extends defaultStyle {
{type: '02', lineLShow: false, lineRShow: true},
{type: '03', lineLShow: true, lineRShow: false}
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
driveModeStatus: [
{
status: '01',
trainLColor: '#EF0C08',
trainRColor: '#EF0C08'
},
{
status: '02',
status: 'AM',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#EA700D',
trainRColor: '#EA700D'
},
{
status: '05',
status: 'NRM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
}
], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false}
doorStatus: [], // 设置车门状态类型
communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'}
alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}

33
src/jmapNew/config/skinCode/haerbin_01.js
View File

@ -346,6 +346,7 @@ class SkinCode extends defaultStyle {
length: 6 // 道岔单边长度
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: true, // 道岔名称是否有包围框 显示
contentRectShow: false // 道岔封锁显示
},
@ -530,40 +531,38 @@ class SkinCode extends defaultStyle {
}
], // 运行方向状态类型对应车头显示状态 1从左往右 0从右往左
directionStopType: [
{ type: '01', lineLShow: false, lineRShow: false },
{ type: '02', lineLShow: false, lineRShow: true },
{ type: '03', lineLShow: true, lineRShow: false }
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
{ type: 1, lineLShow: false, lineRShow: true },
{ type: 0, lineLShow: true, lineRShow: false }
], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左
driveModeStatus: [
{
status: '01',
trainLColor: '#EF0C08',
trainRColor: '#EF0C08'
},
{
status: '02',
status: 'AM',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#EA700D',
trainRColor: '#EA700D'
},
{
status: '05',
status: 'NRM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
}
], // 列车运行模式对应车头颜色 01信号中断 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [], // 设置运行控制状态类型 eg:{status: '01', hShow: false, sShow: false}
doorStatus: [], // 设置车门状态类型 eg:{status: '01', dShow: false}
communicationStatus: [], // 设置通信状态 eg:{status: '01', trainColor:'#725A64'}
doorStatus: [], // 设置车门状态类型
communicationStatus: [
{status: 'CBTC', trainColor: '#000000'},
{status: 'ITC', trainColor: '#C0C0C0'},
{status: 'IL', trainColor: '#C0C0C0'}
], // 设置通信状态
alarmStatus: [], // 设置报警状态 eg:{status: '01', aShow: false}
serverNoType: []// 服务号状态类型 eg:{type: '01', showColor: '#FFFFFF'}
}

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

@ -349,13 +349,14 @@ class SkinCode extends defaultStyle {
length: 10 // 道岔单边长度
},
monolock: { // 道岔单锁配置
locationColor: '#FF0000', // 道岔单锁'定位'颜色 (绿色)
inversionColor: '#FF0000', // 道岔单锁'反位'颜色 (黄色)
locationColor: '#FF0000', // 道岔单锁'定位'颜色 (红色)
inversionColor: '#FF0000', // 道岔单锁'反位'颜色 (红色)
rectShow: false, // 道岔单锁 矩形框是否显示
rectWidth: 18, // 矩形框 宽高
rectBorderColor: '#fff' // 矩形边框颜色
},
block: { // 道岔封锁配置
blockName: 'ningbo_01', // 默认道岔封锁类型
nameBorderShow: true, // 道岔名称是否有包围框 显示
contentRectShow: false, // 道岔封锁显示
contentRectColor: 'red' // 道岔封锁边框颜色
@ -365,7 +366,7 @@ class SkinCode extends defaultStyle {
this[deviceType.LcControl] = {
text: {
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
fontWeight: 'normal', // 字体粗细
distance: 5 // 灯跟文字距离
},
lamp: {
@ -507,48 +508,38 @@ class SkinCode extends defaultStyle {
], // 列车运行方向状态类型对应车头显示状态 1从左往右 0从右往左
directionStopType: [
{
type: '01',
lineLShow: false,
lineRShow: false
},
{
type: '02',
type: 1,
lineLShow: false,
lineRShow: true
},
{
type: '03',
type: 0,
lineLShow: true,
lineRShow: false
}
], // 列车停止方向类型对应车头显示状态 01未知方向 02从左往右 上行 03从右往左 下行
runModeStatus: [
], // 列车停止方向类型对应车头显示状态 1从左往右 0从右往左
driveModeStatus: [
{
status: '01',
trainLColor: '#FFFFFF',
trainRColor: '#FFFFFF'
},
{
status: '02',
status: 'AM',
trainLColor: '#00FF00',
trainRColor: '#00FF00'
},
{
status: '03',
status: 'CM',
trainLColor: '#FFFF00',
trainRColor: '#FFFF00'
},
{
status: '04',
status: 'RM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
},
{
status: '05',
status: 'NRM',
trainLColor: '#A0522D',
trainRColor: '#A0522D'
}
], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM 03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
], // 列车运行模式对应车头颜色 ATO自动驾驶模式AM ATP监控下的人工驾驶模式CM 限制人工驾驶模式RM 非限制人工驾驶模式NRM
runControlStatus: [
{
status: '01',
@ -567,13 +558,14 @@ class SkinCode extends defaultStyle {
}
], // 设置运行控制状态类型 01正常 02扣车 03停跳
doorStatus: [
{status: '01', dShow: false},
{status: '02', dShow: true}
], // 设置车门状态类型 01关门 02开门
{status: true, dShow: false},
{status: false, dShow: true}
], // 设置车门状态类型 true车门关闭且锁闭
communicationStatus: [
{status: '01', trainColor: '#725A64'},
{status: '02', trainColor: '#C0C0C0'}
], // 设置通信状态 01正常 02故障
{status: 'CBTC', trainColor: '#000099'},
{status: 'ITC', trainColor: '#C0C0C0'},
{status: 'IL', trainColor: '#C0C0C0'}
], // 设置通信状态 cbtc级别CBTC 点式通信ITC 联锁级IL
alarmStatus: [
{status: '01', aShow: false},
{status: '02', aShow: true}

16
src/jmapNew/constant/deviceState.js
View File

@ -76,6 +76,9 @@ deviceState[deviceType.Station] = {
};
deviceState[deviceType.Psd] = {
close: 1, // 屏蔽门是否关闭
lock: 0, // 屏蔽门是否锁闭
interlockRelease: 0, // 是否互锁解除
/** 屏蔽门状态*/
// screenDoorStatus: {
// Default: '01', /** 关门（缺省值）*/
@ -83,13 +86,6 @@ deviceState[deviceType.Psd] = {
// State02: '02', /** 故障 */
// State03: '03' /** 切除 */
// },
// /** 屏蔽门开门状态*/
screenDoorOpenStatus: 0,
// screenDoorOpenStatus: {
// Default: '01', /** 关门（缺省值）*/
// State01: '01', /** 关门 */
// State02: '02' /** 开门 */
// },
/** 是否故障*/
fault: false /** 非故障*/
};
@ -210,6 +206,12 @@ deviceState[deviceType.Train] = {
// State01: '01', /** 无报警 */
// State02: '02' /** 有报警 */
// },
/** 车门是否关闭且锁闭 */
doorCloseLock: true,
/** 列车运行级别 */
runLevel: 'CBTC',
/** 驾驶模式 */
driveMode: 'AM',
/** 是否停车 */
stop: 1,
/** 所在区段code */

17
src/jmapNew/constant/stateTransition.js
View File

@ -1,5 +1,4 @@
import { deepAssign } from '@/utils/index';
import deviceType from './deviceType';
// 所有默认状态在这里都要有 用来转换后台发送的数据状态
class Status {
@ -61,7 +60,9 @@ class Status {
}
handlePsd(device) {
this.statusObj = {
screenDoorOpenStatus: device.screenDoorOpenStatus, // 屏蔽门是否开门
screenDoorOpenStatus: device.close, // 屏蔽门是否开门
lock: device.lock, // 屏蔽门是否锁闭
interlockRelease: device.interlockRelease, // 是否互锁解除
fault: device.fault /** 非故障*/
};
}
@ -72,6 +73,18 @@ class Status {
}
handleTrain(device) {
this.statusObj = {
groupNumber: device.groupNumber, /** 车组号 */
serviceNumber: device.serviceNumber, /** 服务号 */
tripNumber: device.tripNumber, /** 车次号 */
destinationCode: device.destinationCode, /** 目的地码 */
sectionCode: device.sectionCode, /** 列车所在区段 */
speed: device.speed, /** 列车速度 */
right: device.right, /** 列车方向 */
doorCloseLock: device.doorCloseLock, /** 车门是否关闭且锁闭 */
stop: device.stop, /** 列车是否停稳 */
type: device.type, /** 列车类型 */
runLevel: device.runLevel, /** 列车运行级别 */
driveMode: device.driveMode, /** 驾驶模式 */
fault: device.fault /** 非故障*/
};
}

12
src/jmapNew/shape/Psd/ESafeDoor.js
View File

@ -101,7 +101,17 @@ class ESafeDoor extends Group {
}
hasDoor(show) {
show ? this.safeC.hide() : this.safeC.show();
if (this.model.style.StationStand.common.special) {
if (show) {
this.stand1.hide();
this.stand2.hide();
} else {
this.stand1.show();
this.stand2.show();
}
} else {
show ? this.safeC.hide() : this.safeC.show();
}
}
setColor(color) {

8
src/jmapNew/shape/Psd/index.js
View File

@ -27,8 +27,8 @@ export default class Line2 extends Group {
x: model.position.x,
y: model.position.y - (model.height / 2),
width: model.width || style.StationStand.safetyDoor.width,
height: model.height || style.StationStand.safetyDoor.height,
show: model.hasDoor
height: model.height || style.StationStand.safetyDoor.height
// show: model.hasDoor
});
this.add(this.safeDoor);
}
@ -65,8 +65,8 @@ export default class Line2 extends Group {
setState(model) {
/** 设置屏蔽门开关*/
model.screenDoorOpenStatus != 0 && this.openDoor(); /** 开门*/
model.screenDoorOpenStatus == 0 && this.closeDoor(); /** 关门*/
model.screenDoorOpenStatus == 0 && this.openDoor(); /** 开门*/
model.screenDoorOpenStatus != 0 && this.closeDoor(); /** 关门*/
// /** 设置屏蔽门状态*/
// switch (model.screenDoorStatus) {

2
src/jmapNew/shape/StationStand/ESafeEmergent.js
View File

@ -35,7 +35,7 @@ class ESafeEmergent extends Group {
[width - 3, height + 3],
[width - 7, height + 3],
[width - 7, height],
[width, height - 3],
[width, height - 3]
]
},
style: {

6
src/jmapNew/shape/StationStand/index.js
View File

@ -241,9 +241,9 @@ class StationStand extends Group {
if (!this.style.StationStand.common.special) {
this.safeStand && this.safeStand.setColor(this.style.StationStand.stand.stopColor);
} else {
this.trainStop && this.trainStop.show();
this.trainDepart && this.trainDepart.show();
}
this.trainStop && this.trainStop.show();
this.trainDepart && this.trainDepart.show();
}
}
/** 站台紧急关闭*/

4
src/jmapNew/shape/Switch/index.js
View File

@ -302,7 +302,9 @@ export default class Switch extends Group {
/** 挤叉*/
setForkAction() {
this.setLossAction(true);
// this.sheltertriangle.show(); // 宁波线路挤叉特殊显示
if (this.style.Switch.block.blockName == 'ningbo_01') {
this.sheltertriangle.show(); // 宁波线路挤叉特殊显示
}
this.swCore.animateStyle(item => {
item.animateStyle(true)
.when(0, { stroke: this.style.backgroundColor })

11
src/jmapNew/shape/Train/index.js
View File

@ -227,9 +227,9 @@ export default class Train extends Group {
}
}
// 设置运行模式
setRunMode(status) {
if (this.style.Train.trainStatusStyle.runModeStatus.length > 0) {
this.style.Train.trainStatusStyle.runModeStatus.some((item) => {
setDriveMode(status) {
if (this.style.Train.trainStatusStyle.driveModeStatus.length > 0) {
this.style.Train.trainStatusStyle.driveModeStatus.some((item) => {
if (status === item.status) {
this.trainL && this.trainL.setColor(item.trainLColor);
this.trainR && this.trainR.setColor(item.trainRColor);
@ -300,8 +300,11 @@ export default class Train extends Group {
const flag = model.trainWindowModel ? model.trainWindowModel.reversal : false;
if (model) {
this.recover();
this.setRunMode('01');
this.setDriveMode(model.driveMode);
this.setRunStatus(model.stop, flag);
this.setCommunicationStatus(model.runLevel);
// this.setTrainTypeStatus(model.type); 配合早晚点设置
this.setDoorStatus(model.doorCloseLock);
}
// let points = [];
// if (model) {

99
src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue
View File

@ -6,39 +6,47 @@
<el-form-item label="车 组 号:" label-width="95px" prop="trainCode">
<!-- <el-input v-model="addModel.trainCode" /> -->
<el-select v-model="addModel.trainCode" filterable>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.code"
/>
</el-select>
<el-option
v-for="train in trainList"
:key="train.groupNumber"
:label="train.groupNumber"
:value="train.code"
/>
</el-select>
</el-form-item>
<el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
<!-- <el-input v-model="addModel.tripNumber" /> -->
<el-select v-model="addModel.tripNumber" @change="tripNumberChange">
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
</el-select>
<el-select v-model="addModel.tripNumber" @change="tripNumberChange">
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
</el-select>
</el-form-item>
<el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
<el-input v-model="addModel.serviceNumber" />
<!-- <el-input v-model="addModel.serviceNumber" /> -->
<el-select v-model="addModel.serviceNumber">
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
</div>
</el-form>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
<el-row justify="center" class="button-group">
<el-col :span="10" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
</template>
<script>
@ -57,6 +65,7 @@ export default {
trainNoList: [],
selected: null,
tripNumberList: [],
serviceNumberList: [],
addModel: {
trainCode: '', // 车组号
serviceNumber: '', // 服务号
@ -93,18 +102,30 @@ export default {
return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
},
title() {
return '创建计划车'
return '创建计划车';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
})
});
},
methods: {
tripNumberChange(tripNumber) {
getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
this.serviceNumber = resp.data;
this.serviceNumberList = [];
if (typeof resp.data == 'string') {
this.serviceNumberList.push(resp.data);
} else {
resp.data.forEach(item => {
if (!this.serviceNumberList.includes(item)) {
this.serviceNumberList.push(item);
}
});
}
if (this.serviceNumberList.length === 1) {
this.addModel.serviceNumber = this.serviceNumberList[0];
}
});
},
doShow(operate, selected) {
@ -125,6 +146,8 @@ export default {
this.tripNumberList.push(item);
}
});
}).catch(error => {
this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {
@ -141,7 +164,7 @@ export default {
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
let operate = {
const operate = {
over: true,
operation: OperationEvent.Train.createPlanTrain.menu.operation,
cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
@ -150,7 +173,7 @@ export default {
serviceNumber: this.addModel.serviceNumber, // 服务号
tripNumber: this.addModel.tripNumber // 车次号
}
}
};
this.loading = true;
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
@ -158,33 +181,33 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
})
});
} else {
return false;
}
});
},
cancel() {
let operate = {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation,
}
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
},
handerTrainSource() {
let operate = {
const operate = {
type: MapDeviceType.Train.type,
operation: OperationEvent.Train.trainSource.menu.operation,
val: this.addModel.trainSource
}
};
this.$store.dispatch('training/next', operate).then(({ valid }) => {
if (valid) {
@ -204,4 +227,4 @@ export default {
padding: 0 5px;
background-color: #F0F0F0;
}
</style>
</style>

41
src/jmapNew/theme/chengdu_01/menus/dialog/trainInitPlan.vue
View File

@ -35,7 +35,15 @@
</el-select>
</el-form-item>
<el-form-item label="服务号:" prop="serviceNumber">
<el-input v-model="serviceNumber" disabled="true"/>
<!-- <el-input v-model="serviceNumber" disabled="true"/> -->
<el-select v-model="addModel.serviceNumber">
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
</el-form>
</div>
@ -68,10 +76,11 @@ export default {
selected: null,
sectionName: '',
tripNumberList: [],
serviceNumber: '',
serviceNumberList: [],
addModel: {
trainCode:'',
tripNumber:''
tripNumber:'',
serviceNumber: ''
},
rules: {
trainCode: [
@ -117,16 +126,28 @@ export default {
},
tripNumberChange(tripNumber) {
getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
this.serviceNumber = resp.data;
this.serviceNumberList = [];
if (typeof resp.data == 'string') {
this.serviceNumberList.push(resp.data);
} else {
resp.data.forEach(item => {
if (!this.serviceNumberList.includes(item)) {
this.serviceNumberList.push(item);
}
});
}
if (this.serviceNumberList.length === 1) {
this.addModel.serviceNumber = this.serviceNumberList[0];
}
});
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
this.serviceNumber = '';
this.addModel = {
trainCode:'',
tripNumber:''
tripNumber:'',
serviceNumber:''
};
getTripNumberList(this.$route.query.group).then(resp => {
this.tripNumberList = [];
@ -135,6 +156,8 @@ export default {
this.tripNumberList.push(item);
}
});
}).catch(error => {
this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {
@ -158,7 +181,7 @@ export default {
param: {
sectionCode: this.trainWindowSectionCode,
trainCode: this.addModel.trainCode, // 车组号
serviceNumber: this.serviceNumber, // 服务号
serviceNumber: this.addModel.serviceNumber, // 服务号
tripNumber: this.addModel.tripNumber // 车次号
}
};
@ -168,7 +191,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
@ -188,7 +211,7 @@ export default {
if (valid) {
this.doClose();
}
}).catch(error => { this.doClose(); });
}).catch(() => { this.doClose(); });
}
}
};

43
src/jmapNew/theme/chengdu_03/menus/dialog/trainInitPlan.vue
View File

@ -34,9 +34,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="服务号:" prop="serviceNumber">
<el-input v-model="serviceNumber" disabled="true"/>
</el-form-item>
<el-form-item label="服务号:" prop="serviceNumber">
<el-select v-model="addModel.serviceNumber">
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
</el-form>
</div>
<el-row justify="center" class="button-group">
@ -68,17 +75,18 @@ export default {
selected: null,
sectionName: '',
tripNumberList: [],
serviceNumber: '',
serviceNumberList: [],
addModel: {
trainCode:'',
tripNumber:''
tripNumber:'',
serviceNumber: ''
},
rules: {
trainCode: [
{ required: true, message: '请输入列车编码', trigger: 'blur'}
],
serverNumber: [
{ required: true, message: '请输入服务号', trigger: 'blur'}
serviceNumber: [
{ required: true, message: '请输入服务号', trigger: 'change'}
],
tripNumber: [
{ required: true, message: '请输入车次号', trigger: 'blur'}
@ -113,20 +121,26 @@ export default {
});
},
methods: {
loadInitData(map) {
},
tripNumberChange(tripNumber) {
getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
this.serviceNumber = resp.data;
this.serviceNumberList = [];
resp.data.forEach(item => {
if (!this.serviceNumberList.includes(item)) {
this.serviceNumberList.push(item);
}
});
});
if (this.serviceNumberList.length === 1) {
this.addModel.serviceNumber = this.serviceNumberList[0];
}
},
doShow(operate, selected) {
this.selected = selected;
// 如果不是断点激活，则需要对初始值进行初始化
this.serviceNumber = '';
this.addModel = {
trainCode:'',
tripNumber:''
tripNumber:'',
serviceNumber: ''
};
getTripNumberList(this.$route.query.group).then(resp => {
this.tripNumberList = [];
@ -135,6 +149,8 @@ export default {
this.tripNumberList.push(item);
}
});
}).catch(error => {
this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {
@ -158,7 +174,7 @@ export default {
param: {
sectionCode: this.trainWindowSectionCode,
trainCode: this.addModel.trainCode, // 车组号
serviceNumber: this.serviceNumber, // 服务号
serviceNumber: this.addModel.serviceNumber, // 服务号
tripNumber: this.addModel.tripNumber // 车次号
}
};
@ -172,6 +188,7 @@ export default {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow(operate);
this.$messageBox(error.message);
});
} else {
return false;

43
src/jmapNew/theme/ningbo_01/menus/dialog/trainAddPlan.vue
View File

@ -26,16 +26,24 @@
<el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
<!-- <el-input v-model="addModel.tripNumber" /> -->
<el-select v-model="addModel.tripNumber" @change="tripNumberChange">
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
<el-option
v-for="tripNum in tripNumberList"
:key="tripNum"
:label="tripNum"
:value="tripNum"
/>
</el-select>
</el-form-item>
<el-form-item label="服 务 号:" label-width="95px" prop="serverNumber">
<el-input v-model="addModel.serverNumber" />
<el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
<!-- <el-input v-model="addModel.serviceNumber" /> -->
<el-select v-model="addModel.serviceNumber">
<el-option
v-for="serviceNumber in serviceNumberList"
:key="serviceNumber"
:label="serviceNumber"
:value="serviceNumber"
/>
</el-select>
</el-form-item>
</div>
</el-form>
@ -67,6 +75,7 @@ export default {
trainNoList: [],
selected: null,
tripNumberList: [],
serviceNumberList: [],
addModel: {
trainCode: '', // 车组号
serviceNumber: '', // 服务号
@ -115,7 +124,19 @@ export default {
methods: {
tripNumberChange(tripNumber) {
getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
this.serviceNumber = resp.data;
this.serviceNumberList = [];
if (typeof resp.data == 'string') {
this.serviceNumberList.push(resp.data);
} else {
resp.data.forEach(item => {
if (!this.serviceNumberList.includes(item)) {
this.serviceNumberList.push(item);
}
});
}
if (this.serviceNumberList.length === 1) {
this.addModel.serviceNumber = this.serviceNumberList[0];
}
});
},
doShow(operate, selected) {
@ -136,6 +157,8 @@ export default {
this.tripNumberList.push(item);
}
});
}).catch(error => {
this.$messageBox(error.message);
});
this.dialogShow = true;
this.$nextTick(function () {
@ -158,7 +181,7 @@ export default {
cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
param: {
trainCode: this.addModel.trainCode, // 车组号
serverNumber: this.addModel.serverNumber, // 服务号
serviceNumber: this.addModel.serviceNumber, // 服务号
tripNumber: this.addModel.tripNumber // 车次号
}
};

4
src/scripts/cmdPlugin/Handler.js
View File

@ -98,7 +98,7 @@ class Handler {
const valid = ValidateHandler.vaildate(this.getTrainingMode(), operation);
this.afterValid(operation, valid);
rtn.valid = valid;
if (operation.cmdType) {
const command = this.getCommand(operation);
if (command) {
@ -109,7 +109,7 @@ class Handler {
reject(error);
});
} else {
rtn.response = '获取指令失败，暂无指令，请检查指令字典';
rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典';
reject(rtn);
}
} else {