+
=0;an--){
actions["traindoor"].top[an].stop();
}
@@ -216,6 +218,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
actions["traindoor"].down[an].play();
}
}else if(trainmodel.openright == "1"){
+ updatedoorlight(true,false);
trainmodel.openright = "0";
for(let an=actions["traindoor"].down.length-1;an>=0;an--){
actions["traindoor"].down[an].stop();
@@ -429,6 +432,8 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
}
}else if(trainmodel.openleft != data.open && data.open == "1"){
trainmodel.openleft = "1";
+ console.log(data);
+ updatedoorlight(true,false);
for(let an=actions["traindoor"].top.length-1;an>=0;an--){
actions["traindoor"].top[an].reset();
actions["traindoor"].top[an].time = 0;
@@ -449,6 +454,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
}
} else if (trainmodel.openright != data.open && data.open == '1') {
trainmodel.openright = "1";
+ updatedoorlight(false,true);
for(let an=actions["traindoor"].down.length-1;an>=0;an--){
actions["traindoor"].down[an].reset();
actions["traindoor"].down[an].time = 0;
@@ -673,6 +679,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
}
function simulationreset(data){
+ updatedoorlight(false,false);
for(let i=0;i {
const code = elem.code;
const type = elem._type;
- if (elem.deviceType === 'TRAIN' && elem.type === 'HEAD') {
- elem.serviceNumber = '';
- } else if (elem.deviceType === 'TRAIN' && elem.type === 'MANUAL') {
- elem.serviceNumber = '';
- elem.tripNumber = '';
- elem.destinationCode = '';
- }
const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
this.hookHandle(oDevice, elem);
});
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 3d4386f49..78436a7a5 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -174,73 +174,41 @@ export default class Station extends Group {
const model = this.model;
if (model.visible && model.createControlMode) {
// 紧急站控
- if (this.style.Station.StationControl.lamp.emergencyControlShow) {
- this.emergencyControl = new ESingleControl({
- _subType: 'emergency',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x,
- y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
- },
- context: this.style.Station.StationControl.text.emergencyControlText,
- pop: false
- });
- this.add(this.emergencyControl);
- }
+ this.createEmergencyControl();
+
// 中控按钮
- if (this.style.Station.StationControl.lamp.centerControlShow) {
- this.centerControl = new ESingleControl({
- _subType: 'center',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
- y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
- },
- context: this.style.Station.StationControl.text.centerControlText,
- pop: false
- });
- this.add(this.centerControl);
- }
+ this.createCenterControl();
+
// 站控按钮
- if (this.style.Station.StationControl.lamp.substationControlShow) {
- this.substationControl = new ESingleControl({
- _subType: 'substation',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.lamp.offset.x,
- y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
- },
- context: this.style.Station.StationControl.text.substationControlText,
- pop: false
- });
- this.add(this.substationControl);
- }
+ this.createSubstationControl();
+
// 联锁控
- if (this.style.Station.StationControl.lamp.interconnectedControlShow) {
- this.interconnectedControl = new ESingleControl({
- _subType: 'interconnected',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.lamp.offset.x,
- y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
- },
- context: this.style.Station.StationControl.text.interconnectedControlText || '联锁控',
- pop: false
- });
- this.add(this.interconnectedControl);
- }
- // 箭头
- if (this.style.Station.StationControl.arrow.show) {
- const point = arrow(this.model.controlModePoint.x, this.model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
- this.arrowsControl = new EArrow({
+ this.createInterconnectedControl();
+ }
+ this.setState(model);
+ }
+
+ createEmergencyControl() { // 紧急站控
+ const model = this.model;
+ if (this.style.Station.StationControl.emergencyControl.show) {
+ this.emergencyControl = new ESingleControl({
+ _subType: 'emergency',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y
+ },
+ context: this.style.Station.StationControl.emergencyControl.text,
+ pop: false
+ });
+ this.add(this.emergencyControl);
+ if (this.style.Station.StationControl.emergencyControl.arrowShow) {
+ const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 2 + this.style.Station.StationControl.emergencyControl.offset.x;
+ const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
+ const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+ this.emergencyArrowsControl = new EArrow({
zlevel: this.zlevel,
z: this.z,
style: this.style,
@@ -249,44 +217,137 @@ export default class Station extends Group {
point: point,
x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
- fill: this.style.Station.StationControl.lamp.grayColor,
+ fill: this.style.Station.StationControl.emergencyControl.grayColor,
lineWidth: 1,
stroke: this.style.sidelineColor
});
- this.add(this.arrowsControl);
+ this.add(this.emergencyArrowsControl);
}
- // 中控按钮
- if (this.style.Station.StationControl.lamp.centerControlButtonShow) {
- this.centerControlButton = new ESingleControl({
- _subType: 'button',
- style: this.style,
- zlevel: this.zlevel,
- z: this.z,
- point: {
- x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
- y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
- },
- context: this.style.Station.StationControl.text.centerControlButton,
- pop: false
- });
- this.add(this.centerControlButton);
- const arcRect = this.centerControlButton.getArcBoundingRect();
- this.arcBorder = new Rect({
- zlevel: this.zlevel,
- z: this.z,
- silent: true,
- shape: arcRect,
- style: {
- lineDash: null,
- stroke: this.style.Station.StationControl.lamp.stroke,
- fill: this.style.Station.StationControl.lamp.fill
- }
- });
- this.add(this.arcBorder);
- }
-
}
- this.setState(model);
+ }
+
+ createCenterControl() { // 中控按钮
+ const model = this.model;
+ if (this.style.Station.StationControl.centerControl.show) {
+ this.centerControl = new ESingleControl({
+ _subType: 'center',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.centerControl.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.centerControl.offset.y
+ },
+ context: this.style.Station.StationControl.centerControl.text,
+ pop: false
+ });
+ this.add(this.centerControl);
+ if (this.style.Station.StationControl.centerControl.arrowShow) {
+ const x = model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.emergencyControl.offset.x;
+ const y = model.controlModePoint.y + this.style.Station.StationControl.emergencyControl.offset.y;
+ const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+ this.centerArrowsControl = new EArrow({
+ zlevel: this.zlevel,
+ z: this.z,
+ style: this.style,
+ count: this.count,
+ drict: 1,
+ point: point,
+ x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
+ fill: this.style.Station.StationControl.centerControl.grayColor,
+ lineWidth: 1,
+ stroke: this.style.sidelineColor
+ });
+ this.add(this.centerArrowsControl);
+ }
+ }
+ // 中控按钮
+ if (this.style.Station.StationControl.centerControl.buttonShow) { // 宁波一 显示
+ this.centerControlButton = new ESingleControl({
+ _subType: 'button',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.controlModePoint.x - this.style.Station.StationControl.lamp.distance * 3 / -2 + this.style.Station.StationControl.lamp.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.lamp.offset.y
+ },
+ context: this.style.Station.StationControl.centerControl.buttonText,
+ pop: false
+ });
+ this.add(this.centerControlButton);
+ const arcRect = this.centerControlButton.getArcBoundingRect();
+ this.arcBorder = new Rect({
+ zlevel: this.zlevel,
+ z: this.z,
+ silent: true,
+ shape: arcRect,
+ style: {
+ lineDash: null,
+ stroke: this.style.Station.StationControl.lamp.stroke,
+ fill: this.style.Station.StationControl.lamp.fill
+ }
+ });
+ this.add(this.arcBorder);
+ }
+ }
+
+ createSubstationControl() { // 站控按钮
+ const model = this.model;
+ if (this.style.Station.StationControl.substationControl.show) {
+ this.substationControl = new ESingleControl({
+ _subType: 'substation',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance / 2 + this.style.Station.StationControl.substationControl.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y
+ },
+ context: this.style.Station.StationControl.substationControl.text,
+ pop: false
+ });
+ this.add(this.substationControl);
+ if (this.style.Station.StationControl.substationControl.arrowShow) {
+ const x = this.model.controlModePoint.x + this.style.Station.StationControl.substationControl.offset.x;
+ const y = this.model.controlModePoint.y + this.style.Station.StationControl.substationControl.offset.y;
+ const point = arrow(x, y + this.style.Station.StationControl.lamp.radiusR / 2, this.style.Station.StationControl.lamp.distance / 6, this.style.Station.StationControl.lamp.radiusR * 0.8);
+ this.substationArrowsControl = new EArrow({
+ zlevel: this.zlevel,
+ z: this.z,
+ style: this.style,
+ count: this.count,
+ drict: 1,
+ point: point,
+ x: model.controlModePoint.x + this.style.Station.StationControl.lamp.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.lamp.radiusR / 2 + this.style.Station.StationControl.lamp.offset.y,
+ fill: this.style.Station.StationControl.substationControl.grayColor,
+ lineWidth: 1,
+ stroke: this.style.sidelineColor
+ });
+ this.add(this.substationArrowsControl);
+ }
+ }
+ }
+
+ createInterconnectedControl() { // 联锁控
+ const model = this.model;
+ if (this.style.Station.StationControl.interconnectedControl.show) { // 成都三会显示
+ this.interconnectedControl = new ESingleControl({
+ _subType: 'interconnected',
+ style: this.style,
+ zlevel: this.zlevel,
+ z: this.z,
+ point: {
+ x: model.controlModePoint.x + this.style.Station.StationControl.lamp.distance * 3 / 2 + this.style.Station.StationControl.interconnectedControl.offset.x,
+ y: model.controlModePoint.y + this.style.Station.StationControl.interconnectedControl.offset.y
+ },
+ context: this.style.Station.StationControl.interconnectedControl.text || '联锁控',
+ pop: false
+ });
+ this.add(this.interconnectedControl);
+ }
}
handleCenter() { // 中控
@@ -301,13 +362,15 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.yellowColor);
this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
- this.arrowsControl && this.arrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
+ this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
}
handleEmergency() { // 紧急站控
this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.redColor);
+ this.emergencyControl && this.emergencyControl.setTextColor(this.style.Station.StationControl.lamp.redColor); // 紧急 颜色
this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
+ this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
}
recover() {
@@ -317,6 +380,9 @@ export default class Station extends Group {
this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.text.fontColor);
this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor);
+
+ this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
+ this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
}
// 设置状态
diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js
index 15c259565..97842f76a 100644
--- a/src/jmapNew/shape/StationTurnBack/index.js
+++ b/src/jmapNew/shape/StationTurnBack/index.js
@@ -12,9 +12,10 @@ export default class StationTurnBack extends Group {
this.z = 40;
this.model = model;
this.style = style;
- // this.isShowShape = true;
+ this.isShowShape = true;
this.create();
this.setState(model);
+ this.setShowMode();
}
create() {
const model = this.model;
@@ -104,7 +105,7 @@ export default class StationTurnBack extends Group {
// 设置状态
setState(model, tbStrategyId = null) {
- // if (!this.isShowShape) return;
+ if (!this.isShowShape) return;
this.recover();
if (tbStrategyId) {
model.tbStrategyId = tbStrategyId;
@@ -114,23 +115,30 @@ export default class StationTurnBack extends Group {
}
});
}
- // console.log(model, '站后折返model')
+ // console.log(model, '站后折返model');
}
setShowMode() {
+ const showMode = this.model.showMode;
+ const showConditions = this.style.StationTurnBack.displayCondition;
+ if (!showConditions || showConditions == '01' || showMode === showConditions) {
+ this.eachChild(item => item.show() );
+ } else {
+ this.eachChild(item => item.hide() );
+ }
}
- setShowStation(flag) {
- // if (flag) {
- // this.eachChild(item => {
- // item.show();
- // });
- // this.isShowShape = true;
- // this.setState(this.model);
- // } else {
- // this.eachChild(item => {
- // item.hide();
- // });
- // this.isShowShape = false;
- // }
+ setShowStation(stationCode) {
+ if (!stationCode || this.model.stationCode === stationCode) {
+ this.eachChild(item => {
+ item.show();
+ });
+ this.isShowShape = true;
+ this.setState(this.model);
+ } else {
+ this.eachChild(item => {
+ item.hide();
+ });
+ this.isShowShape = false;
+ }
}
}
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index b4a218af1..6fc4e9df3 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -104,7 +104,7 @@ export default class TrainBody extends Group {
? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
: model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; // 车次号
const targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode) + ''; // 目的地码
- const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; // 车组号
+ const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (style.Train.trainTargetNumber.lineNumber || '') + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; // 车组号
this.textTrainServer = new ETextName({
zlevel: model.zlevel,
z: model.z + 1,
@@ -157,6 +157,22 @@ export default class TrainBody extends Group {
textAlign: 'left',
textVerticalAlign: 'top'
});
+ if (style.Train.trainTargetNumber.maskText) {
+ this.textTrainTargetNumberMask = new ETextName({
+ zlevel: model.zlevel,
+ z: model.z + 2,
+ x: parseInt(model.point.x + style.Train.trainTargetNumber.trainTargetNumberOffset.x),
+ y: parseInt(model.point.y + style.Train.trainTargetNumber.trainTargetNumberOffset.y),
+ text: style.Train.trainTargetNumber.maskText,
+ textFill: style.trainTextColor,
+ textStroke: style.trainTextColor,
+ textStrokeWidth: 0,
+ fontSize: model.fontSize,
+ fontFamily: style.Train.common.fontFamily,
+ textAlign: 'left',
+ textVerticalAlign: 'top'
+ });
+ }
this.formatChangePosition(model, style);
this.add(this.trainBodyBox);
if (style.Train.common.haveTextHSDA) {
@@ -338,8 +354,10 @@ export default class TrainBody extends Group {
this.style.Train.trainTarget.planTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.planTypeColor});
} else if (type === 'MANUAL') {
this.style.Train.trainTargetNumber.manualTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.manualTypeColor});
+ this.style.Train.trainNumber.headTypeColor && this.textTrainNumber && this.textTrainNumber.setStyle({textFill: this.style.Train.trainNumber.headTypeColor});
} else if (type === 'HEAD') {
this.style.Train.trainTargetNumber.headTypeColor && this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle({textFill: this.style.Train.trainTargetNumber.headTypeColor});
+ this.style.Train.trainNumber.headTypeColor && this.textTrainNumber && this.textTrainNumber.setStyle({textFill: this.style.Train.trainNumber.headTypeColor});
}
}
setSoonerOrLater(dt) {
@@ -392,8 +410,10 @@ export default class TrainBody extends Group {
this.add(this.textTrainTarget);
} else if (ele == 'groupNumber') {
!style.Train.common.fixedCoordinates && this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+ !style.Train.common.fixedCoordinates && this.textTrainTargetNumberMask && this.textTrainTargetNumberMask.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
widthText += this.textTrainTargetNumber.getBoundingRect().width;
this.add(this.textTrainTargetNumber);
+ this.textTrainTargetNumberMask && this.add(this.textTrainTargetNumberMask);
}
});
}
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 171df05c3..728d4de11 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -20,11 +20,9 @@ export default class Train extends Group {
this.z = 40;
this.section = null;
this.isShowShape = true;
- this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
- // this.fontSize = model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
+ this.fontSize = model.nameFontSize || style.Train.common.trainTextFontSize;
this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
- this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
- // this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
+ this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
if (style.Train.trainBody.specialTrainType.length > 0) {
style.Train.trainBody.specialTrainType.some((item) => {
if (model.type === item.type) {
@@ -86,6 +84,7 @@ export default class Train extends Group {
maLen: model.maLen,
hold:model.hold,
jump:model.jump,
+ stop:model.stop,
dt: model.dt,
model: model
});
@@ -165,7 +164,7 @@ export default class Train extends Group {
if (style.Train.common.haveTrainBorder) {
this.createTrainBorder();
}
- if (style.Train.directionArrow.hasArrow) {
+ if (style.Train.directionArrow.hasArrow) { // 列车运行上下方箭头（eg:宁波yi）
const arrowPoint = { x: 0, y: 0 };
if (model.trainWindowModel) {
arrowPoint.x = model.trainWindowModel.point.x;
@@ -216,60 +215,6 @@ export default class Train extends Group {
this.trainR && this.trainR.setArrowShow(false);
}
- // 设置服务号状态类型
- setServerNoType(type) {
- if (this.style.Train.trainStatusStyle.serverNoType.length > 0) {
- const flag = this.style.Train.trainStatusStyle.serverNoType.some((item) => {
- if (type === item.type) {
- this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
- return true;
- }
- });
- if (this.style.Train.trainStatusStyle.defaultServerNoColor && !flag) {
- this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultServerNoColor);
- }
- }
- }
-
- // 设置目的地状态
- setDestinationStatus(status) {
- if (this.style.Train.trainStatusStyle.destinationStatus.length > 0) {
- const flag = this.style.Train.trainStatusStyle.destinationStatus.some((item) => {
- if (status === item.status) {
- switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
- case 'trainTarget':
- this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
- break;
- case 'trainServer':
- this.trainB && this.trainB.setTextTrainServerColor(item.showColor);
- break;
- case 'trainWindowBorder':
- this.trainB && this.trainB.setBodyBoxShape('stroke', item.showColor);
- break;
- default:
- this.trainB && this.trainB.setTextTrainTargetColor(item.showColor);
- }
- return true;
- }
- });
- if (this.style.Train.trainStatusStyle.defaultDestinationColor && !flag) {
- switch (this.style.Train.trainStatusStyle.destinationStatusSetText) {
- case 'trainTarget':
- this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
- break;
- case 'trainServer':
- this.trainB && this.trainB.setTextTrainServerColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
- break;
- case 'trainWindowBorder':
- this.trainB && this.trainB.setBodyBoxShape('stroke', this.style.Train.trainStatusStyle.defaultDestinationColor);
- break;
- default:
- this.trainB && this.trainB.setTextTrainTargetColor(this.style.Train.trainStatusStyle.defaultDestinationColor);
- }
- }
- }
- }
-
// 设置运行方向状态类型
setDirectionType(right, flag) {
if (this.style.Train.trainStatusStyle.directionType.length > 0) {
@@ -384,18 +329,6 @@ export default class Train extends Group {
this.trainB && this.trainB.setAShow(false);
}
}
- setTrainTypeStatus(type) {
- if (this.style.Train.trainStatusStyle.trainTypeStatus) {
- this.style.Train.trainStatusStyle.trainTypeStatus.some((item) => {
- if (type === item.type) {
- item.serviceNumberColor && this.trainB && this.trainB.setTextTrainServerColor(item.serviceNumberColor);
- item.trainNumberColor && this.trainB && this.trainB.setTextTrainNumberColor(item.trainNumberColor);
- item.trainTargetColor && this.trainB && this.trainB.setTextTrainTargetColor(item.trainTargetColor);
- item.groupNumberColor && this.trainB && this.trainB.setTextTrainTargetNumberColor(item.groupNumberColor);
- }
- });
- }
- }
// 设置状态
setState(model, object) {
if (!this.isShowShape) return;
@@ -409,7 +342,6 @@ export default class Train extends Group {
}
this.setRunStatus(model.stop, flag);
this.setCommunicationStatus(model.runLevel);
- // this.setTrainTypeStatus(model.type); 配合早晚点设置
this.setDoorStatus(model.doorCloseLock);
this.setAlarmStatus(model.alarmStatus);
this.setHoldStatus(model.hold);
@@ -422,19 +354,6 @@ export default class Train extends Group {
this.updateSection(object);
}
}
- // let points = [];
- // if (model) {
- // this.recover();
- // this.setServerNoType(model.serverNoType); // 设置服务号状态类型
- // this.setDestinationStatus(model.destinationStatus); // 设置目的地状态
- // this.setRunStatus(model.runStatus, flag); // 设置运行状态
- // this.setRunMode(model.runMode); // 设置运行模式
- // this.setRunControlStatus(model.runControlStatus); // 设置运行控制状态类型
- // this.setDoorStatus(model.doorStatus); // 设置车门状态类型
- // this.setCommunicationStatus(model.communicationStatus); // 设置通信状态类型
- // this.setAlarmStatus(model.alarmStatus); // 设置报警状态
- // this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
- // }
}
setTrainTypeColor(type) {
this.trainB && this.trainB.setTrainTypeColor(type);
diff --git a/src/jmapNew/theme/beijing_01/model.js b/src/jmapNew/theme/beijing_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/beijing_01/model.js
+++ b/src/jmapNew/theme/beijing_01/model.js
@@ -35,8 +35,6 @@ class Model {
atsAutoTriggerShow: true // ATS自动触发表示灯显示
};
this['private'][deviceType.Train] = {
- nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式
- nameFontSize: 10 // 字体大小
};
this['private'][deviceType.TrainWindow] = {
trainWindowShow: true
diff --git a/src/jmapNew/theme/chengdu_01/model.js b/src/jmapNew/theme/chengdu_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/chengdu_01/model.js
+++ b/src/jmapNew/theme/chengdu_01/model.js
@@ -35,8 +35,6 @@ class Model {
atsAutoTriggerShow: true // ATS自动触发表示灯显示
};
this['private'][deviceType.Train] = {
- nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式
- nameFontSize: 10 // 字体大小
};
this['private'][deviceType.TrainWindow] = {
trainWindowShow: true
diff --git a/src/jmapNew/theme/chengdu_03/model.js b/src/jmapNew/theme/chengdu_03/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/chengdu_03/model.js
+++ b/src/jmapNew/theme/chengdu_03/model.js
@@ -35,8 +35,6 @@ class Model {
atsAutoTriggerShow: true // ATS自动触发表示灯显示
};
this['private'][deviceType.Train] = {
- nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式
- nameFontSize: 10 // 字体大小
};
this['private'][deviceType.TrainWindow] = {
trainWindowShow: true
diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
index c8577b263..55985dff9 100644
--- a/src/jmapNew/theme/components/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -130,6 +130,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '../../menus/childDialog/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '../../utils/menuOperate';
+import { mapGetters } from 'vuex';
export default {
name: 'StandDetainTrain',
@@ -161,6 +162,9 @@ export default {
};
},
computed: {
+ ...mapGetters('map', [
+ 'mapConfig'
+ ]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
@@ -213,7 +217,7 @@ export default {
}
}
this.radio = '2';
- if (this.selected.right) { // 判断站台行驶方向
+ if ((this.selected.right && this.mapConfig.upDirection === 'right') || (!this.selected.right && this.mapConfig.upDirection === 'left')) { // 判断站台行驶方向
this.radio = '1';
}
@@ -237,7 +241,7 @@ export default {
this.radio1 = '2';
} else if (this.operation == OperationEvent.StationStand.earlyDeparture.menu.operation) {
this.earlyDepar = true;
- if (!this.selected.right) {
+ if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.radio2 = '2';
} else {
this.radio2 = '1';
@@ -246,14 +250,14 @@ export default {
this.AutomaticBuckle = true;
this.autoRadio1 = '1';
this.autoRadio = '1';
- if (!this.selected.right) {
+ if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.autoRadio = '2';
}
} else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAuto.menu.operation) {
this.AutomaticBuckle = true;
this.autoRadio1 = '2';
this.autoRadio = '1';
- if (!this.selected.right) {
+ if ((!this.selected.right && this.mapConfig.upDirection === 'right') || (this.selected.right && this.mapConfig.upDirection === 'left')) {
this.autoRadio = '2';
}
}
@@ -303,30 +307,18 @@ export default {
}
},
setDetainTrainAuto() { // 区间自动扣车
- this.sendCommand(menuOperate.StationStand.setDetainTrainAuto, {
- leftDirection: this.autoRadio == '2', // 1 上行 2 下行
- rightDirection: this.autoRadio == '1'
- });
+ this.sendCommand(menuOperate.StationStand.setDetainTrainAuto);
},
cancelDetainTrainAuto() { // 取消区间自动扣车
- this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto, {
- leftDirection: this.autoRadio == '2', // 1 上行 2 下行
- rightDirection: this.autoRadio == '1'
- });
+ this.sendCommand(menuOperate.StationStand.cancelDetainTrainAuto);
},
// 设置扣车
setDetainTrain() {
- this.sendCommand(menuOperate.StationStand.setDetainTrain, {
- leftDirection: this.radio == '2', // 1 上行 2 下行
- rightDirection: this.radio == '1'
- });
+ this.sendCommand(menuOperate.StationStand.setDetainTrain);
},
// 取消扣车
cancelDetainTrain() {
- this.sendCommand(menuOperate.StationStand.cancelDetainTrain, {
- leftDirection: this.radio == '2', // 1 上行 2 下行
- rightDirection: this.radio == '1'
- });
+ this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
},
// 提前发车
earlyDeparture() {
diff --git a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
index 7a17f6bb6..0037b53cf 100644
--- a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
@@ -27,10 +27,10 @@
范围
@@ -38,10 +38,10 @@
@@ -130,6 +130,7 @@ export default {
operation: null,
trainList: [],
radio1: '',
+ isUpDirection: true,
model: {
val1: '',
val2: '',
@@ -140,7 +141,8 @@ export default {
},
computed: {
...mapGetters('map', [
- 'map'
+ 'map',
+ 'mapConfig'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -225,8 +227,9 @@ export default {
}
}
this.radio1 = operate.operation;
+ this.isUpDirection = (this.mapConfig.upDirection === 'right' && selected.right) || (this.mapConfig.upDirection === 'left' && !selected.right);
this.model.right = selected.right;
- this.model.val1 = selected.right ? '02' : '01'; // 站台的上下行方向, 01:下行 /02:上行
+ this.model.val1 = this.isUpDirection ? '02' : '01'; // 站台的上下行方向, 01:下行 /02:上行
this.model.val2 = '';
this.model.tripNumber = '';
diff --git a/src/jmapNew/theme/foshan_01/menus/menuBar.vue b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
index fe1e8f4f4..8be5a4bba 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
@@ -356,35 +356,36 @@ export default {
}
]
},
- {
- title: '批处理命令',
- operate: OperationEvent.Command.mBar.detainControl,
- children: [
- {
- title: '全线扣车',
- operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
- click: this.setDetainTrainAll
- },
- {
- title: '取消全线扣车',
- operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
- click: this.cancelDetainTrainAll
- },
- {
- title: '取消上行全线扣车',
- operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
- click: this.cancelUpDetainTrainAll
- },
- {
- title: '取消下行全线扣车',
- operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
- click: this.cancelDownDetainTrainAll
- }
- ]
- },
+ // {
+ // title: '批处理命令',
+ // operate: OperationEvent.Command.mBar.detainControl,
+ // click: this.undeveloped,
+ // children: [
+ // {
+ // title: '全线扣车',
+ // operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+ // click: this.setDetainTrainAll
+ // },
+ // {
+ // title: '取消全线扣车',
+ // operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+ // click: this.cancelDetainTrainAll
+ // },
+ // {
+ // title: '取消上行全线扣车',
+ // operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+ // click: this.cancelUpDetainTrainAll
+ // },
+ // {
+ // title: '取消下行全线扣车',
+ // operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+ // click: this.cancelDownDetainTrainAll
+ // }
+ // ]
+ // },
{
title: '信息管理',
- operate: '',
+ operate: OperationEvent.Command.mBar.detainControl,
children: [
{
title: '调度日志',
@@ -402,6 +403,7 @@ export default {
},
{
title: '帮助',
+ operate: OperationEvent.Command.mBar.detainControl,
children: [
{
title: '关于ITS GPC 工作站',
@@ -622,35 +624,36 @@ export default {
}
]
},
- {
- title: '批处理命令',
- operate: OperationEvent.Command.mBar.detainControl,
- children: [
- {
- title: '全线扣车',
- operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
- click: this.setDetainTrainAll
- },
- {
- title: '取消全线扣车',
- operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
- click: this.cancelDetainTrainAll
- },
- {
- title: '取消上行全线扣车',
- operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
- click: this.cancelUpDetainTrainAll
- },
- {
- title: '取消下行全线扣车',
- operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
- click: this.cancelDownDetainTrainAll
- }
- ]
- },
+ // {
+ // title: '批处理命令',
+ // operate: OperationEvent.Command.mBar.detainControl,
+ // click: this.undeveloped,
+ // children: [
+ // {
+ // title: '全线扣车',
+ // operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+ // click: this.setDetainTrainAll
+ // },
+ // {
+ // title: '取消全线扣车',
+ // operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+ // click: this.cancelDetainTrainAll
+ // },
+ // {
+ // title: '取消上行全线扣车',
+ // operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+ // click: this.cancelUpDetainTrainAll
+ // },
+ // {
+ // title: '取消下行全线扣车',
+ // operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+ // click: this.cancelDownDetainTrainAll
+ // }
+ // ]
+ // },
{
title: '信息管理',
- operate: '',
+ operate: OperationEvent.Command.mBar.detainControl,
children: [
{
title: '调度日志',
@@ -668,6 +671,7 @@ export default {
},
{
title: '帮助',
+ operate: OperationEvent.Command.mBar.detainControl,
children: [
{
title: '关于ITS GPC 工作站',
@@ -808,7 +812,7 @@ export default {
};
this.tempClassA = index;
this.tempClassB = -1;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -829,7 +833,7 @@ export default {
operation: item.operate.operation
};
this.tempClassB = index;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -847,7 +851,7 @@ export default {
const operate = {
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -862,7 +866,7 @@ export default {
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -876,7 +880,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -891,7 +895,7 @@ export default {
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -906,7 +910,7 @@ export default {
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -921,7 +925,7 @@ export default {
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -935,7 +939,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -949,7 +953,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -963,7 +967,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -977,7 +981,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -991,7 +995,7 @@ export default {
type: 'bar',
operation: order.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
index 3a3d9aca2..208b68b45 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
@@ -91,7 +91,7 @@ export default {
loading: false,
operate: null,
operation: '',
- planMode: 5,
+ planMode: 2,
headMode: 5,
fontSize: 19
};
diff --git a/src/jmapNew/theme/foshan_01/model.js b/src/jmapNew/theme/foshan_01/model.js
index 4920490ff..bd6829d9f 100644
--- a/src/jmapNew/theme/foshan_01/model.js
+++ b/src/jmapNew/theme/foshan_01/model.js
@@ -35,8 +35,8 @@ class Model {
atsAutoTriggerShow: true // ATS自动触发表示灯显示
};
this['private'][deviceType.Train] = {
- nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式
- nameFontSize: 10 // 字体大小
+ nameFormat: 'serviceNumber:groupNumber', // 字体格式
+ nameFontSize: 19 // 字体大小
};
this['private'][deviceType.TrainWindow] = {
trainWindowShow: true
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
index db0298ce5..00f07fa50 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
@@ -162,7 +162,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -182,7 +182,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -202,7 +202,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -222,7 +222,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -242,7 +242,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -262,7 +262,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -283,7 +283,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -304,7 +304,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -325,7 +325,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -341,7 +341,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index c4fe8cf20..0e99e8126 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -86,7 +86,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {
@@ -104,7 +104,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (valid) {
this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
index 258096dfb..cf1c92f0e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
@@ -279,7 +279,7 @@ export default {
this.setMessage(this.$t('tip.firstConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -299,7 +299,7 @@ export default {
this.setMessage(this.$t('tip.firstConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 1 });
@@ -325,7 +325,7 @@ export default {
this.setMessage(this.$t('tip.secondConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.timeCountCommand = -1;
@@ -355,7 +355,7 @@ export default {
}
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.timeCountCommand = -1;
this.timeCountConfirm = -1;
this.setButtonEnable({ step: -1 });
@@ -385,7 +385,7 @@ export default {
}
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 0 });
@@ -402,7 +402,7 @@ export default {
operation: OperationEvent.Command.close.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
index 63e732f6b..3fa93a827 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeControl.vue
@@ -40,7 +40,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
export default {
name: 'RouteControl',
@@ -144,172 +144,95 @@ export default {
},
// 取消列车进路
cancelTrainRoute() {
- if (this.$store.state.training.prdType == '01') {
- /** 现地工作站*/
- this.cancelTrainRouteByLocal();
- } else if (this.$store.state.training.prdType == '02') {
- /** 行调工作站*/
- this.cancelTrainRouteByCentral();
- }
- },
- // 现地工作站取消进路
- cancelTrainRouteByLocal() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.cancelTrainRoute, {}, 1).then(({valid, operate})=>{
this.loading = false;
if (valid) {
this.doClose();
+ if (this.$store.state.training.prdType === '02') {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ operate['messages'] = [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')];
+ this.$refs.confirmControl.doShow(operate);
+ }
}
- }).catch(() => {
+ }).catch((error) => {
+ console.log(error);
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate);
- });
- },
- // 行调工作站取消进路
- cancelTrainRouteByCentral() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
- messages: [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')]
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
- this.loading = false;
- if (valid) {
- this.doClose();
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.confirmControl.doShow(operate, this.selected);
- }
- }).catch(() => {
- this.loading = false;
+ this.$refs.noticeInfo.doShow();
});
},
// 信号关灯
signalClose() {
- const operate = {
- operation: OperationEvent.Signal.signalClose.menu.operation,
- messages: [this.$t('menu.menuSignal.signalOff') + this.$t('global.colon') + this.signalName]
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.signalClose, {}, 1).then(({valid, operate})=>{
this.loading = false;
if (valid) {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ operate['messages'] = [this.$t('menu.menuSignal.signalOff') + this.$t('global.colon') + this.signalName];
this.$refs.confirmControl.doShow(operate);
}
}).catch(() => {
this.loading = false;
+ this.doClose();
});
},
// 信号重开
reopenSignal() {
- const operate = {
- operation: OperationEvent.Signal.reopenSignal.menu.operation,
- messages: [this.$t('menu.menuSignal.signalReopen') + this.$t('global.colon') + this.signalName]
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.reopenSignal, {}, 1).then(({valid, operate})=>{
this.loading = false;
if (valid) {
this.doClose();
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ operate['messages'] = [this.$t('menu.menuSignal.signalReopen') + this.$t('global.colon') + this.signalName];
this.$refs.confirmControl.doShow(operate);
}
}).catch(() => {
this.loading = false;
+ this.doClose();
});
},
// 设置联锁自动进路
setAutoInterlock() {
- const operate = {
- over: true,
- cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
- operation: OperationEvent.Signal.setAutoInterlock.menu.operation
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.setAutoInterlock, {}, 2).then(({valid, operate}) => {
this.loading = false;
if (valid) {
this.doClose();
}
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate);
});
},
// 取消联锁自动进路
cancelAutoInterlock() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.cancelAutoInterlock, {}, 2).then(({valid, operate}) => {
this.loading = false;
if (valid) {
this.doClose();
}
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate);
});
},
// 设置联锁自动触发
setAutoTrigger() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.setAutoTrigger.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.setAutoTrigger, {}, 2).then(({valid, operate}) => {
this.loading = false;
if (valid) {
this.doClose();
}
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate);
});
+
},
// 取消联锁自动触发
cancelAutoTrigger() {
- const operate = {
- over: true,
- operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
- };
-
- this.doClose();
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.cancelAutoTrigger, {}, 2).then(({valid, operate}) => {
this.loading = false;
if (valid) {
this.doClose();
}
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(operate);
});
},
// 取消
@@ -317,8 +240,7 @@ export default {
const operate = {
operation: OperationEvent.Command.close.menu.operation
};
-
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
index 9b6715176..e1904156d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
@@ -36,14 +36,14 @@
>
-
- {{ $t('menu.automatic2') }}
+ {{ $t('menu.automatic2') }}
{{ $t('menu.artificial') }}
@@ -83,7 +83,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
export default {
name: 'RouteHandControl',
@@ -99,7 +99,9 @@ export default {
operation: null,
selection: [],
stationName: '',
- signalName: ''
+ signalName: '',
+ changeList: [],
+ commitDisabled: true
};
},
computed: {
@@ -132,24 +134,9 @@ export default {
return this.$t('menu.menuSignal.atsAutoControl');
}
return '';
- },
- commitDisabled() {
- let disabled = true;
- if (this.selection && this.selection.length) {
- disabled = false;
- }
-
- return disabled;
}
},
watch: {
- // 深度数据状态
- tempData: {
- handler(val, oldVal) {
- this.checkTableDataSelction(val);
- },
- deep: true
- }
},
mounted() {
this.$nextTick(() => {
@@ -161,7 +148,10 @@ export default {
// 如果不是断点激活，而是第一次显示则初始化
if (!this.dialogShow) {
this.signalName = '';
+ this.changeList = [];
+ this.commitDisabled = true;
this.stationName = '';
+ this.selection = [];
if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
this.signalName = selected.name;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
@@ -172,15 +162,18 @@ export default {
if (tempData && tempData.length > 0) {
tempData.forEach(elem => {
- elem.check = false;
+ // 设置禁用状态
+ this.changeList.push(false);
elem.disabled = false;
// 设置禁用状态
- if (operate.operation === OperationEvent.Signal.humanControl.menu.operation &&
- elem.controlType != '01') {
+ if (operate.operation == OperationEvent.Signal.humanControl.menu.operation &&
+ (elem.atsControl == 0)) {
elem.disabled = true;
- } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
- elem.controlType == '01') {
+ this.disabledLength++;
+ } if (operate.operation == OperationEvent.Signal.atsAutoControl.menu.operation &&
+ (elem.atsControl != 0)) {
elem.disabled = true;
+ this.disabledLength++;
}
});
}
@@ -199,29 +192,40 @@ export default {
this.$refs.tempTable.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
- checkTableDataSelction(data) {
- const selection = [];
- if (data && data.length > 0) {
- data.forEach(row => {
- if (row.check && !row.disabled) {
- selection.push(row);
- }
- });
+ changeCheck(check, code) {
+ if (check) {
+ this.selection.push(code);
+ } else {
+ this.selection.splice(this.selection.indexOf(code), 1);
+ }
+ if (this.selection.length > 0) {
+ this.commitDisabled = false;
+ } else {
+ this.commitDisabled = true;
}
- if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
- this.handleChooseChange(selection);
- this.selection = selection;
+ const operate = {val:code};
+ if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+ /** 进路交人工控*/
+ operate.operation = OperationEvent.Signal.humanControl.choose.operation;
+ } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+ /** 进路交自动控*/
+ operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
}
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ if (valid) {
+ this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ }
+ });
+
},
handleChooseChange(selection) {
this.selection = selection;
- const codeList = selection.map(elem => { return elem.code; });
- if (codeList && codeList.length) {
+ if (selection && selection.length) {
const operate = {
repeat: true,
operation: '',
- val: codeList.join('::')
+ selection: selection
};
if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
@@ -232,7 +236,7 @@ export default {
operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
}
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -250,20 +254,10 @@ export default {
this.atsAutoControl();
}
},
- // 自排关
+ // 进路交人工控
humanControl() {
- const codeList = this.selection.map(elem => { return elem.code; });
- const operate = {
- over: true,
- operation: OperationEvent.Signal.humanControl.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
- param: {
- Route_Code_List: codeList
- }
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.humanControl, {routeCodeList:this.selection}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
@@ -271,23 +265,13 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate);
+ this.$refs.noticeInfo.doShow();
});
},
- // 自排开
+ // 进路交自动控
atsAutoControl() {
- const codeList = this.selection.map(elem => { return elem.code; });
- const operate = {
- over: true,
- operation: OperationEvent.Signal.atsAutoControl.menu.operation,
- cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
- param: {
- Route_Code_List: codeList
- }
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList:this.selection}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
@@ -295,7 +279,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate);
+ this.$refs.noticeInfo.doShow();
});
},
cancel() {
@@ -303,7 +287,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
index eaa3d6027..27dbcb368 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
@@ -109,9 +109,10 @@ export default {
}
}
- /** status 04:封锁*/
- const signal = (selected || {}).status;
- this.tempData = [{ code: selected.code, name: selected.name, status: signal.status != '04' ? this.$t('menu.unblocked') : this.$t('menu.blocked') }];
+ this.tempData = [{
+ code: selected.code,
+ name: selected.name,
+ status: selected.blockade ? this.$t('menu.unblocked') : this.$t('menu.blocked') }];
const timer = setInterval(() => {
if (this.$refs.table) {
this.$refs.table.setCurrentRow(this.tempData[0]);
@@ -138,7 +139,7 @@ export default {
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -154,7 +155,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
index 0bc4ae654..2ea1016a7 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
@@ -51,6 +51,7 @@ import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import { deepAssign } from '@/utils/index';
import { mapGetters } from 'vuex';
+import {menuOperate, commitOperate} from '../utils/menuOperate';
export default {
name: 'RouteSelection',
@@ -225,30 +226,16 @@ export default {
},
commit() {
if (this.row && this.row.canSetting) {
- let names = '';
- if (this.row.overlapSectionList && this.row.overlapSectionList.length > 0) {
- names = names + this.row.overlapSectionList.map(elem => { return elem.name; }).join('');
- }
- if (this.row.overlapSwitchList && this.row.overlapSwitchList.length > 0) {
- names = names + this.row.overlapSwitchList.map(elem => { return elem.name; }).join('');
- }
- const operate = {
- operation: OperationEvent.Signal.arrangementRoute.menu.operation,
- messages: [this.$t('menu.accessSetting') + this.$t('global.colon') + `${this.row.name}${names}(${this.row.stationName})`]
- };
-
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(menuOperate.Signal.arrangementRoute, {routeCode: this.row.code}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.confirmControl.doShow(operate);
}
}).catch(() => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate);
+ this.$refs.noticeInfo.doShow();
});
}
},
@@ -257,7 +244,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
index 6d4a00fdb..d1a3d5739 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
@@ -274,7 +274,7 @@ export default {
this.setMessage(this.$t('tip.firstConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 1 });
@@ -303,7 +303,7 @@ export default {
this.setMessage(this.$t('tip.secondConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.timeCountCommand = -1;
@@ -318,7 +318,9 @@ export default {
});
},
confirm2() {
- const operate = {};
+ const operate = {
+ send: true
+ };
if (this.operation == OperationEvent.Section.unlock.menu.operation) {
/** 区段解封*/
@@ -336,7 +338,7 @@ export default {
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.timeCountCommand = -1;
this.timeCountConfirm = -1;
this.setButtonEnable({ step: -1 });
@@ -368,7 +370,7 @@ export default {
}
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 0 });
@@ -385,7 +387,7 @@ export default {
operation: OperationEvent.Command.close.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
index d66d41180..0be10840a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionControl.vue
@@ -29,6 +29,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
export default {
name: 'SectionControl',
@@ -112,49 +113,34 @@ export default {
},
// 区段单锁
lock() {
- const operate = {
- over: true,
- operation: OperationEvent.Section.lock.menu.operation,
- cmdType: CMD.Section.CMD_SECTION_BLOCK
- };
- this.sendCommand(operate);
+ this.sendCommand(menuOperate.Section.lock);
},
// 轨道区段切除
split() {
- const operate = {
- over: true,
- operation: OperationEvent.Section.split.menu.operation,
- cmdType: CMD.Section.CMD_SECTION_CUT_OFF
- };
- this.sendCommand(operate);
+ this.sendCommand(menuOperate.Section.split);
},
// 轨道区段激活
active() {
- const operate = {
- over: true,
- operation: OperationEvent.Section.active.menu.operation,
- cmdType: CMD.Section.CMD_SECTION_ACTIVE
- };
- this.sendCommand(operate);
+ this.sendCommand(menuOperate.Section.active);
},
sendCommand(operate) {
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ commitOperate(operate, {}, 2).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
}
}).catch(() => {
+ this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(operate);
+ this.$refs.noticeInfo.doShow();
});
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
};
-
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
index 0e4298f4b..f4cd11712 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/speedCmdControl.vue
@@ -24,8 +24,19 @@
-
-
+
@@ -95,9 +106,7 @@ export default {
speedSpace: 5,
stationName: '',
name: '',
- formData: {
- SpeedLimit_Value: ''
- }
+ speed: ''
};
},
computed: {
@@ -112,9 +121,10 @@ export default {
return null;
},
speedList() {
- const list = [];
- for (var i = 0; i * this.speedSpace <= this.maxSpeed; i++) {
- list.push(i * this.speedSpace);
+ const list = [{ name: '不限速', value: '0' }];
+ for (var i = 1; i * this.speedSpace <= this.maxSpeed; i++) {
+ const speed = String(i * this.speedSpace);
+ list.push({ name: speed, value: speed });
}
return list;
},
@@ -256,7 +266,7 @@ export default {
},
deep: true
},
- 'formData.SpeedLimit_Value': function (val) {
+ 'speed': function (val) {
if (val) this.cmdDisabled[0] = false;
}
},
@@ -286,7 +296,7 @@ export default {
this.timer = null;
},
methods: {
- doShow(operate, selected, tempData) {
+ doShow(operate, selected) {
if (!this.dialogShow) {
this.name = '';
this.stationName = '';
@@ -314,7 +324,7 @@ export default {
this.stationName = station.name;
}
- this.formData.SpeedLimit_Value = '';
+ this.speed = '';
this.tableData = [];
this.selected = selected;
this.timeCountCommand = -1;
@@ -325,7 +335,7 @@ export default {
this.operation = operate.operation;
this.setMessage(this.$t('tip.selectSpeedLimitValueTip'));
if (this.isCancelSpeed) {
- this.formData.SpeedLimit_Value = `${tempData}`;
+ this.speed = '0';
this.spdDisabled = true;
this.cmdDisabled = [false, true, true];
}
@@ -355,7 +365,7 @@ export default {
}
this.setMessage(this.$t('tip.releaseTip'));
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 0 });
@@ -368,24 +378,24 @@ export default {
if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
/** 区段设置限速*/
operate.operation = OperationEvent.Section.setSpeed.order.operation;
- operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+ operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
} else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
/** 区段取消限速*/
operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
- operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+ operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.sectionCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
} else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
/** 道岔设置限速*/
operate.operation = OperationEvent.Switch.setSpeed.order.operation;
- operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+ operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchSetLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
} else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
/** 道岔取消限速*/
operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
- operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.formData.SpeedLimit_Value}` + this.$t('menu.sectionLimitSuffix');
+ operate.message = this.$t('menu.in') + `【${this.name}】` + this.$t('menu.switchCancelLimitPrefix') + `${this.speed}` + this.$t('menu.sectionLimitSuffix');
}
this.setMessage(this.$t('tip.firstConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: this.$t('tip.executionSucceed') });
@@ -416,7 +426,7 @@ export default {
this.setMessage(this.$t('tip.secondConfirmTip'));
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.timeCountCommand = -1;
@@ -432,8 +442,12 @@ export default {
},
confirm2() {
const operate = {
- val: this.formData.SpeedLimit_Value,
- param: this.formData
+ over: true,
+ operation: '',
+ cmdType: '',
+ param: {
+ speedLimitValue: this.speed
+ }
};
if (this.operation == OperationEvent.Section.setSpeed.menu.operation) {
@@ -456,7 +470,7 @@ export default {
this.setMessage('');
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.timeCountCommand = -1;
this.timeCountConfirm = -1;
this.setButtonEnable({ step: -1 });
@@ -491,7 +505,7 @@ export default {
}
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.setButtonEnable({ step: 0 });
@@ -508,7 +522,7 @@ export default {
operation: OperationEvent.Command.close.menu.operation
};
this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickToClose'), result: '' });
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
index f3325f200..7e546a722 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
@@ -22,16 +22,14 @@
{{ $t('menu.upDirection') }}
{{ $t('menu.downDirection') }}
@@ -120,12 +118,14 @@ export default {
selection: [],
isSelect: true,
isConfirm: false,
- strategy: ''
+ strategy: '',
+ upRight: ''
};
},
computed: {
...mapGetters('map', [
- 'stationList'
+ 'stationList',
+ 'mapConfig'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -149,23 +149,25 @@ export default {
});
},
methods: {
- loadInitData(selected, opts) {
+ loadInitData(selected) {
this.tempData = [];
const station = this.stationList.find(n => n.code == selected.stationCode);
- this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy });
+ this.tempData.push({ name: station.name, station: selected.name, strategy: selected.reentryStrategy || '04' });
},
- doShow(operate, selected, opts) {
+ doShow(operate, selected) {
+ this.selected = selected;
if (!this.dialogShow) {
this.standStatus = '';
this.stationName = '';
+ this.upRight = this.mapConfig.upDirection === 'right';
if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
- this.standStatus = selected.direction;
+ this.standStatus = selected.right;
const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
if (station) {
this.stationName = station.name;
}
}
- this.loadInitData(selected, opts);
+ this.loadInitData(selected);
}
this.dialogShow = true;
@@ -197,7 +199,7 @@ export default {
this.strategy = strategy;
this.isSelect = false;
this.isConfirm = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -213,14 +215,13 @@ export default {
const operate = {
over: true,
operation: OperationEvent.StationStand.setBackStrategy.menu.operation,
- val: `${this.strategy}`,
cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
param:{
- Stand_ReentryStrategy:this.strategy
+ standReentryStrategy: this.strategy
}
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
index 185d399cf..1366f9f2d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
@@ -30,6 +30,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { menuOperate, commitOperate } from '../utils/menuOperate';
export default {
name: 'StandDetainTrain',
@@ -124,119 +125,31 @@ export default {
},
// 设置扣车
setDetainTrain() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
- this.loading = false;
- this.doClose();
- if (!valid) {
- this.$refs.noticeInfo.doShow(step);
- }
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(step);
- });
+ this.sendCommand(menuOperate.StationStand.setDetainTrain);
},
// 取消扣车
cancelDetainTrain() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
- this.loading = false;
- this.doClose();
- if (!valid) {
- this.$refs.noticeInfo.doShow(step);
- }
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(step);
- });
+ this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
},
// 强制取消扣车
cancelDetainTrainForce() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
- this.loading = false;
- this.doClose();
- if (!valid) {
- this.$refs.noticeInfo.doShow(step);
- }
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(step);
- });
+ this.sendCommand(menuOperate.StationStand.cancelDetainTrainForce);
},
// 提前发车
earlyDeparture() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.earlyDeparture.menu.operation,
- cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
- this.loading = false;
- if (valid) {
- this.doClose();
- }
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(step);
- });
+ this.sendCommand(menuOperate.StationStand.earlyDeparture);
},
// 设置跳停
setJumpStop() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.setJumpStop.menu.operation,
- val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
- cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
- };
-
- this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
- this.loading = false;
- if (valid) {
- this.doClose();
- }
- }).catch(() => {
- this.loading = false;
- this.doClose();
- this.$refs.noticeInfo.doShow(step);
- });
+ this.sendCommand(menuOperate.StationStand.setJumpStop, this.selected.direction);
},
// 取消跳停
cancelJumpStop() {
- const step = {
- over: true,
- operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
- val: this.selected.direction, // 站台的上下行方向, 01:下行 /02:上行
- cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
- };
-
+ this.sendCommand(menuOperate.StationStand.cancelJumpStop, this.selected.direction); // 站台的上下行方向, 01:下行 /02:上行
+ },
+ sendCommand(operate, val) { // 发送指令
this.loading = true;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
+ commitOperate(operate, {}, 2, val).then(({valid})=>{
this.loading = false;
if (valid) {
this.doClose();
@@ -244,16 +157,15 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
- this.$refs.noticeInfo.doShow(step);
+ this.$refs.noticeInfo.doShow();
});
},
cancel() {
const step = {
operation: OperationEvent.Command.cancel.menu.operation
};
-
this.loading = false;
- this.$store.dispatch('training/next', step).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
index cd0b5e891..3531f2fb9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
@@ -90,12 +90,11 @@ export default {
});
},
methods: {
- loadInitData(selected, opts) {
+ loadInitData(selected) {
this.tempData = [];
-
const index = this.stationList.findIndex(n => n.code == selected.stationCode);
let stationStand, station;
- if (selected.direction == '01') { // 下行
+ if (!selected.right) { // 下行
// 下行时，此站不是最后一站
if (index != 0) {
stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
@@ -110,18 +109,18 @@ export default {
}
/** 01: 未设置扣车 02: 车站扣车 03: 中心扣车 04: 中心+车站扣车*/
- this.tempData.push({ item: this.$t('menu.stationDetainTrain'), status: opts.holdStatus == '02' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
- this.tempData.push({ item: this.$t('menu.centerDetainTrain'), status: opts.holdStatus == '03' || opts.holdStatus == '04' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
- this.tempData.push({ item: this.$t('menu.stopTime'), status: opts.parkingTime != -1 ? opts.parkingTime : this.$t('menu.automatic2') });
+ this.tempData.push({ item: this.$t('menu.stationDetainTrain'), status: selected.stationHoldTrain ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+ this.tempData.push({ item: this.$t('menu.centerDetainTrain'), status: selected.centerHoldTrain ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+ this.tempData.push({ item: this.$t('menu.stopTime'), status: selected.parkingTime != -1 ? selected.parkingTime : this.$t('menu.automatic2') });
if (!stationStand || !station) {
this.tempData.push({ item: this.$t('menu.runLevel'), status: this.$t('menu.automatic2') });
} else {
- this.tempData.push({ item: this.$t('menu.runLevel'), status: opts.intervalRunTime > 0 ? this.$t('menu.to') + station.name + stationStand.name + this.$t('global.colon') + this.$t('menu.artificial') : this.$t('menu.to') + station.name + stationStand.name + this.$t('menu.automatic2') });
+ this.tempData.push({ item: this.$t('menu.runLevel'), status: selected.runLevelTime > 0 ? this.$t('menu.to') + station.name + stationStand.name + this.$t('global.colon') + this.$t('menu.artificial') : this.$t('menu.to') + station.name + stationStand.name + this.$t('menu.automatic2') });
}
- this.tempData.push({ item: this.$t('menu.jumpStop'), status: opts.jumpStopStatus != '01' ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
- this.tempData.push({ item: this.$t('menu.downSwitchbackStrategy'), status: this.strategyMap[opts.reentryStrategy] ? this.strategyMap[opts.reentryStrategy] : this.$t('menu.default') });
+ this.tempData.push({ item: this.$t('menu.jumpStop'), status: selected.assignSkip || selected.allSkip ? this.$t('menu.hasBeenSet') : this.$t('menu.notSet') });
+ this.tempData.push({ item: this.$t('menu.downSwitchbackStrategy'), status: this.strategyMap[selected.reentryStrategy] ? this.strategyMap[selected.reentryStrategy] : this.$t('menu.default') });
},
- doShow(operate, selected, opts) {
+ doShow(operate, selected) {
if (!this.dialogShow) {
this.standName = '';
this.stationName = '';
@@ -132,7 +131,7 @@ export default {
this.stationName = station.name;
}
}
- this.loadInitData(selected, opts);
+ this.loadInitData(selected);
}
this.dialogShow = true;
this.$nextTick(function () {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
index d5e3640f1..43198ba0e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
@@ -15,10 +15,10 @@
- {{ $t('menu.uplinkBroadly') }}
+ {{ $t('menu.uplinkBroadly') }}
- {{ $t('menu.downlinkBroadly') }}
+ {{ $t('menu.downlinkBroadly') }}
@@ -68,15 +68,17 @@ export default {
return {
dialogShow: false,
loading: false,
- upDown: '01',
+ upDown: true,
tempData: [],
disabled: true,
- operation: ''
+ operation: '',
+ rightUp: true
};
},
computed: {
...mapGetters('map', [
- 'stationStandList'
+ 'stationStandList',
+ 'mapConfig'
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -108,9 +110,10 @@ export default {
this.tempData = [];
this.stationStandList.forEach(elem => {
/** status 01: 未扣车*/
- const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {}).status;
+ const stand = (this.$store.getters['map/getDeviceByCode'](elem.code) || {});
const station = (this.$store.getters['map/getDeviceByCode'](elem.stationCode) || {});
- if (station && station.visible && stand && stand.holdStatus != '01' && Number(elem.direction) == Number(this.upDown)) {
+ console.log(stand, stand.centerHoldTrain);
+ if (station && station.visible && stand && stand.centerHoldTrain && elem.right == this.upDown) {
this.tempData.push({ stationName: station.name, standName: elem.name });
}
});
@@ -124,7 +127,8 @@ export default {
// 不是断点激活的菜单应该将状态初始化
if (!this.dialogShow) {
this.loading = false;
- this.upDown = selected.direction;
+ this.upDown = selected.right;
+ this.rightUp = this.mapConfig.upDirection === 'right';
this.loadTableData();
this.operation = operate.operation;
}
@@ -145,7 +149,7 @@ export default {
val: `${upDown}`
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -158,12 +162,12 @@ export default {
cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN,
val: this.upDown,
param: {
- Stand_AllLine: this.upDown
+ isRight: this.upDown
}
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -179,7 +183,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
index 958656680..7467d0388 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
@@ -112,8 +112,8 @@ export default {
},
timeList() {
const list = [
- { value: 0, label: this.$t('menu.automatic2') },
- { value: 1, label: '1' }
+ { value: 0, label: this.$t('menu.automatic2') }
+ // { value: 1, label: '1' }
];
for (var i = 60; i <= this.maxRunLevel; i++) {
list.push({ value: i, label: `${i}` });
@@ -137,7 +137,7 @@ export default {
});
},
methods: {
- loadInitData(selected, opts) {
+ loadInitData(selected) {
this.tempData = [];
const index = this.stationList.findIndex(n => n.code == selected.stationCode);
if (selected.direction == '01') { // 下行
@@ -145,18 +145,18 @@ export default {
if (index != 0) {
const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
- this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
+ this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeValidStatus });
}
} else {
// 上行时，此站不是最后一站
if (index != this.stationList.length) {
const stationStand = this.$store.getters['map/getDeviceByCode'](this.stationStandList[index + 1].code);
const station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
- this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: opts.intervalRunTime ? opts.intervalRunTime : 0, check: opts.intervalRunTimeValidStatus });
+ this.tempData.push({ name: `${stationStand.name}(${station.name})`, time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeValidStatus });
}
}
},
- doShow(operate, selected, opts) {
+ doShow(operate, selected) {
// 如果不是断点激活窗口，而是第一次显示窗口时，需要初始化窗口数据
if (!this.dialogShow) {
this.standName = '';
@@ -168,7 +168,7 @@ export default {
this.stationName = station.name;
}
}
- this.loadInitData(selected, opts);
+ this.loadInitData(selected);
}
this.dialogShow = true;
@@ -195,15 +195,13 @@ export default {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.choose.operation,
val: time.toString(),
- param: {
- Stand_RunLevel: time
- }
+ param: {}
};
this.time = time;
this.isSelect = false;
this.isConfirm = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -213,12 +211,10 @@ export default {
const operate = {
operation: OperationEvent.StationStand.setRunLevel.check.operation,
val: check.toString(),
- param: {
- Stand_AlwaysValid: !!this.tempData[0].check
- }
+ param: {}
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -231,19 +227,17 @@ export default {
},
commit() {
if (this.isConfirm) {
- const forver = !!this.tempData[0].check;
const operate = {
operation: OperationEvent.StationStand.setRunLevel.menu.operation,
- val: [this.time, forver].join('::'),
param:{
- Stand_AlwaysValid:forver,
- Stand_RunLevel:this.time
+ runLevelTimeForever: !!this.tempData[0].check,
+ runLevelTime: this.time
},
messages: [`${this.$t('menu.menuStationStand.setRunLevel')}${this.$t('global.colon')}${this.tempData[0].name}-${this.standName},${this.tempData[0].time == 0 ? this.$t('menu.runTimeAutomatically') : `${this.$t('menu.runningTimeIs')}${this.tempData[0].time}s`},${this.$t('menu.effectiveFrequencyIs')}${this.tempData[0].check ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -263,7 +257,7 @@ export default {
operation: OperationEvent.Command.cancel.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
index 11ec73b92..e3af32eb0 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
@@ -44,8 +44,8 @@
- {{ $t('menu.upDirection') }}
- {{ $t('menu.downDirection') }}
+ {{ $t('menu.upDirection') }}
+ {{ $t('menu.downDirection') }}
@@ -53,8 +53,8 @@
{{ $t('menu.effectiveNumber') }}
- {{ $t('menu.onceEffective') }}
- {{ $t('menu.alwaysEffective') }}
+ {{ $t('menu.onceEffective') }}
+ {{ $t('menu.alwaysEffective') }}
@@ -75,7 +75,7 @@
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import ConfirmControl from './childDialog/confirmControl';
import NoticeInfo from './childDialog/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { mapGetters } from 'vuex';
export default {
name: 'StandStopTime',
@@ -93,10 +93,14 @@ export default {
effective: false,
selected: null,
standName: '',
- stationName: ''
+ stationName: '',
+ upRight: true
};
},
computed: {
+ ...mapGetters('map', [
+ 'mapConfig'
+ ]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
@@ -143,7 +147,7 @@ export default {
});
},
methods: {
- doShow(operate, selected, tempDate) {
+ doShow(operate, selected) {
// 如果不是断点激活，则需要对初始值进行初始化
if (!this.dialogShow) {
this.standName = '';
@@ -156,10 +160,10 @@ export default {
}
}
- this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
- this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
- this.effective = !!tempDate.parkingValidStatus;
- this.direction = selected.direction;
+ this.control = selected.parkingTime ? '02' : '01';
+ this.time = selected.parkingTime ? selected.parkingTime : 15;
+ this.direction = selected.right;
+ this.upRight = this.mapConfig.upDirection === 'right';
this.selected = selected || {};
}
this.dialogShow = true;
@@ -175,19 +179,16 @@ export default {
chooseControl(control) {
/** 自动时的默认时间*/
if (control == '01') {
- this.inputTime = 15;
+ this.time = 15;
this.effective = true;
}
const operate = {
operation: OperationEvent.StationStand.setStopTime.choose1.operation,
- val: `${control}`,
- param: {
- Stand_StopControl: `${control}`
- }
+ param: {}
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -197,12 +198,10 @@ export default {
const operate = {
operation: OperationEvent.StationStand.setStopTime.choose2.operation,
val: `${effective}`,
- param: {
- Stand_AlwaysValid: `${effective}`
- }
+ param: {}
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -213,12 +212,10 @@ export default {
repeat: true,
operation: OperationEvent.StationStand.setStopTime.input.operation,
val: `${time}`,
- param: {
- Stand_StopTime: `${time}`
- }
+ param: {}
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
@@ -229,15 +226,14 @@ export default {
operation: OperationEvent.StationStand.setStopTime.menu.operation,
val: [`${this.control}`, this.time, this.effective].join('::'),
param:{
- Stand_StopControl:this.control,
- Stand_AlwaysValid:this.effective,
- Stand_StopTime:this.time
+ parkingTime: this.control === '01' ? -1 : this.time,
+ parkingAlwaysValid: this.control === '01' ? true : this.effective
},
messages: [`${this.$t('menu.stopTime') + this.$t('global.colon') + this.stationName} - ${this.standName}, ${this.$t('menu.stopTimeIs')}${this.control == '01' ? this.$t('menu.automatic2') : this.time + this.$t('global.second')}, ${this.$t('menu.effectiveFrequencyIs')}${this.effective == false ? this.$t('menu.alwaysEffective') : this.$t('menu.onceEffective')}`]
};
this.loading = true;
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
this.loading = false;
if (valid) {
this.doClose();
@@ -254,7 +250,7 @@ export default {
operation: OperationEvent.Command.close.menu.operation
};
- this.$store.dispatch('training/next', operate).then(({ valid }) => {
+ this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
}
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
index a25a8d7ac..a6e66771e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/stationCmdControl.vue
@@ -79,6 +79,7 @@
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue
deleted file mode 100644
index 4384bb801..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userAdd.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
- {{ $t('menu.menuChildDialog.determine') }}
-
-
- {{ $t('menu.menuChildDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue
deleted file mode 100644
index 7b6e8afa7..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userDelete.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
- {{ $t('menu.menuChildDialog.determine') }}
-
-
- {{ $t('menu.menuChildDialog.cancel') }}
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue
deleted file mode 100644
index 259982272..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/childDialog/userEdit.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
- {{ $t('menu.menuChildDialog.determine') }}
-
-
- {{ $t('menu.menuChildDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue
deleted file mode 100644
index f2cfc9478..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/helpAbout.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue
deleted file mode 100644
index d744e5b8d..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/manageUser.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue
deleted file mode 100644
index 5ab07f4b4..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/passwordBox.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue
deleted file mode 100644
index 5016c6205..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/stationControlConvert.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-
-
-
-
-
-
-
-
- {{ scope.row.operate }}
-
-
-
-
- {{ scope.row.control }}
-
-
-
-
- {{ scope.row.status }}
-
-
-
-
- {{ scope.row.result }}
-
-
-
-
-
- {{ $t('menu.menuDialog.forcedStationControl') }}
- {{ $t('menu.menuDialog.requestStationControl') }}
-
- {{ $t('menu.menuDialog.requestInTheControl') }}
-
-
-
- {{ $t('menu.menuDialog.close') }}
-
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue
deleted file mode 100644
index 435b2d971..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainAdd.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue
deleted file mode 100644
index 0ab971d50..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainDelete.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
- {{ $t('menu.menuDialog.terminalTwo') }}
-
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue
deleted file mode 100644
index 64b298f42..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/trainTranstalet.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue
deleted file mode 100644
index 35fef3db0..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewDevice.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue
deleted file mode 100644
index 6e14fb262..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewName.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-
-
-
-
-
- {{ $t('menu.menuDialog.signalName') }}
-
-
- {{ $t('menu.menuDialog.standTrackName') }}
-
-
-
-
- {{ $t('menu.menuDialog.buttonName') }}
-
-
- {{ $t('menu.menuDialog.reentryTrackName') }}
-
-
-
-
- {{ $t('menu.menuDialog.trackName') }}
-
-
- {{ $t('menu.menuDialog.transferTrackName') }}
-
-
-
-
- {{ $t('menu.menuDialog.turnoutName') }}
-
-
- {{ $t('menu.menuDialog.indicatorName') }}
-
-
-
-
- {{ $t('menu.menuDialog.turnoutSectionName') }}
-
-
- {{ $t('menu.menuDialog.destinationName') }}
-
-
-
-
- {{ $t('menu.menuDialog.axisSectionName') }}
-
-
- {{ $t('menu.menuDialog.kmPost') }}
-
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue
deleted file mode 100644
index 91f027b71..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/viewTrainId.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.cancel') }}
-
-
-
-
-
-
-
diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index 4920490ff..c7d80a99e 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -35,8 +35,6 @@ class Model {
atsAutoTriggerShow: true // ATS自动触发表示灯显示
};
this['private'][deviceType.Train] = {
- nameFormat: 'targetCode:serviceNumber:tripNumber', // 字体格式
- nameFontSize: 10 // 字体大小
};
this['private'][deviceType.TrainWindow] = {
trainWindowShow: true
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
index 7e724d24a..e3ff3be41 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
@@ -16,10 +16,10 @@
-
-
@@ -27,7 +27,7 @@
-
@@ -44,8 +44,9 @@
+
diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue
index 636ddd9d1..a1a1077d5 100644
--- a/src/views/iscs/iscsDesign/demonList.vue
+++ b/src/views/iscs/iscsDesign/demonList.vue
@@ -128,6 +128,18 @@ export default {
id: '22',
type: 'interface'
},
+ {
+ name: '小系统B端',
+ mode: 'bas',
+ id: '22-1',
+ type: 'interface'
+ },
+ {
+ name: '小系统A端(二)',
+ mode: 'bas',
+ id: '22-2',
+ type: 'interface'
+ },
{
name: '水系统',
mode: 'bas',
@@ -209,6 +221,12 @@ export default {
mode: 'cctv',
id: '43',
type: 'interface'
+ },
+ {
+ name: '车站控制-云台',
+ mode: 'cctv',
+ id: '44',
+ type: 'interface'
}
]
},
@@ -245,6 +263,20 @@ export default {
type: 'interface'
}
]
+ },
+ {
+ name: '网络状态',
+ mode: 'netState',
+ id: '7',
+ type: 'system',
+ children: [
+ {
+ name: '网络状态',
+ mode: 'netState',
+ id: '71',
+ type: 'interface'
+ }
+ ]
}
]
}
diff --git a/src/views/iscs/iscsDraw/IscsNetOperate/index.vue b/src/views/iscs/iscsDraw/IscsNetOperate/index.vue
new file mode 100644
index 000000000..c04214a99
--- /dev/null
+++ b/src/views/iscs/iscsDraw/IscsNetOperate/index.vue
@@ -0,0 +1,125 @@
+
+
+
+
+
+
diff --git a/src/views/iscs/iscsDraw/IscsNetOperate/iscsImage.vue b/src/views/iscs/iscsDraw/IscsNetOperate/iscsImage.vue
new file mode 100644
index 000000000..6f2bfe8a7
--- /dev/null
+++ b/src/views/iscs/iscsDraw/IscsNetOperate/iscsImage.vue
@@ -0,0 +1,159 @@
+
+
@@ -24,6 +25,7 @@ import IscsPsdOperate from './iscsPsdOperate/index';
import IscsCctvOperate from './iscsCctvOperate/index';
import IscsAfcOperate from './iscsAfcOperate/index';
import IscsAcsOperate from './iscsAcsOperate/index';
+import IscsNetOperate from './IscsNetOperate/index';
export default {
name: 'IscsView',
components: {
@@ -33,7 +35,8 @@ export default {
IscsPsdOperate,
IscsCctvOperate,
IscsAfcOperate,
- IscsAcsOperate
+ IscsAcsOperate,
+ IscsNetOperate
},
data() {
return {
diff --git a/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue b/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue
index 7001e4366..7a4a5166d 100644
--- a/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue
+++ b/src/views/iscs/iscsDraw/iscsAcsOperate/index.vue
@@ -18,6 +18,14 @@
@deleteDataModel="deleteDataModel"
/>
+
- 本站台上行跳停
+ 本站台上行跳停
- 本站台下行跳停
+ 本站台下行跳停
- 指定列车上行跳停
+ 指定列车上行跳停
- 指定列车下行跳停
+ 指定列车下行跳停
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ message }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.versionName') }}
- {{ $t('menu.menuDialog.confirm') }}
-
-
- {{ $t('menu.menuDialog.copyright') }}
-
-
-
-
-
-
- {{ $t('menu.menuDialog.userList') }}
-
-
-
-
-
- {{ scope.row.jobNumber }}
-
-
-
-
- {{ scope.row.userName }}
-
-
-
-
-
- {{ $t('menu.menuDialog.refresh') }}
-
- {{ $t('menu.menuDialog.add') }}
-
- {{ $t('menu.menuDialog.modify') }}
-
- {{ $t('menu.menuDialog.delete') }}
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.userNameLabel') }}
-
-
- {{ $t('menu.menuDialog.password') }}
-
-
-
-
-
- 1
- 2
- 3
- 4
- 5
-
-
- {{ $t('menu.menuDialog.back') }}
-
-
- 6
- 7
- 8
- 9
- 0
-
-
- {{ $t('menu.menuDialog.clear') }}
-
-
-
- {{ $t('menu.menuDialog.addLocation') }}
-
-
-
- {{ $t('menu.menuDialog.terminalOne') }}
-
-
-
-
- {{ $t('menu.menuDialog.frontTrainNumber') }}
-
-
-
- {{ $t('menu.menuDialog.purpose') }}
-
-
-
- {{ $t('menu.menuDialog.terminalTwo') }}
-
-
-
-
-
-
-
- {{ $t('menu.menuDialog.trainWindow') }}
-
-
- {{ $t('menu.menuDialog.sectionBoundary') }}
-
-
- {{ $t('menu.menuDialog.linkageAutoRouteShow') }}
-
-
- {{ $t('menu.menuDialog.atsAutoTriggerShow') }}
-
-
- {{ $t('menu.menuDialog.plantrainDisplayMode') }}
-
-
-
- {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
-
-
- {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
-
-
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
-
-
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.serviceNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
-
-
-
-
-
- {{ $t('menu.menuDialog.headCodeStationDisplayMode') }}
-
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.tripNumber') }}
-
-
- {{ $t('menu.menuDialog.targetNumber') }} + {{ $t('menu.menuDialog.groupNumber') }}
-
-
-
-
-
- {{ $t('menu.menuDialog.fontSize') }}
-
-
-
-
- {{ $t('menu.menuDialog.range') }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('ibp.save') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ buttonText }}
+ {{ $t('global.delete') }}
+ {{ $t('global.cancel') }}
+
+
+
+
+
+
+
+
diff --git a/src/views/iscs/iscsDraw/index.vue b/src/views/iscs/iscsDraw/index.vue
index 6fea410a7..a0483b4e4 100644
--- a/src/views/iscs/iscsDraw/index.vue
+++ b/src/views/iscs/iscsDraw/index.vue
@@ -11,6 +11,7 @@
{{ $route.query.stationName }}门禁站台层
-
{{ $route.query.stationName }}门禁站厅层
-
{{ $route.query.stationName }}机电小系统
-
{{ $route.query.stationName }}机电隧道通风
-
站厅
站台
- 云台
+ 云台
-
+
@@ -130,7 +130,11 @@ export default {
selectedCCTV: '41',
descriptionList: [],
textarea: '',
- value: ''
+ value: '',
+ width: 1490,
+ height: 330,
+ left: '-22px',
+ top: '-20px'
};
},
mounted() {
@@ -145,7 +149,15 @@ export default {
const cctvBtn = document.getElementById('cctv-' + id);
cctvBtn.setAttribute('class', 'cctv-box-content-btn active');
this.selectedCCTV = id;
- this.$refs.iscsPlate.show(id);
+ this.left = '0px';
+ this.top = '0px';
+ if (id == '41') {
+ this.width = 1490;
+ this.height = 330;
+ this.left = '-22px';
+ this.top = '-20px';
+ }
+ this.$refs.iscsPlate.iscsLoadData(id);
}
}
};
diff --git a/src/views/iscs/iscsSystem/config/fg/doorFG.vue b/src/views/iscs/iscsSystem/config/fg/doorFG.vue
index bd99993e6..af0d3df0c 100644
--- a/src/views/iscs/iscsSystem/config/fg/doorFG.vue
+++ b/src/views/iscs/iscsSystem/config/fg/doorFG.vue
@@ -1,7 +1,5 @@
-
- 防淹门
-
+
+
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index 79baead9d..17526dbff 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -175,7 +175,7 @@ export default {
this.copyModel.code && this.createDataModel(this.copyModel);
}
} break;
- case 'Delete': {
+ case 'Delete': {
const list = this.getSelectList();
if (list.length) {
list.forEach(item => {
@@ -215,33 +215,6 @@ export default {
},
// 点击选择事件
onSelected(em) {
- if (em.deviceModel.mean) {
- // switch (IscsOperation[em.deviceModel.mean].event) {
- // case 'UpHoldTrain':
- // case 'UpCancelHoldTrain':
- // case 'DownHoldTrain':
- // case 'DownCancelHoldTrain':
- // handlerIscsEvent(this.$route.query.group, {operate:IscsOperation[em.deviceModel.mean].operate, stationCode:this.stationCode});
- // break;
- // case 'BanUpOpenScreenDoor':
- // this.banUpOpenScreenDoor = !this.banUpOpenScreenDoor;
- // break;
- // case 'BanDownOpenScreenDoor':
- // this.banDownOpenScreenDoor = !this.banDownOpenScreenDoor;
- // break;
- // case 'UpOpenScreenDoor':
- // this.openScreenDoor(this.banUpOpenScreenDoor, IscsOperation[em.deviceModel.mean].operate);
- // break;
- // case 'DownOpenScreenDoor':
- // this.openScreenDoor(this.banDownOpenScreenDoor, IscsOperation[em.deviceModel.mean].operate);
- // break;
- // }
- }
- },
- openScreenDoor(flag, operate) {
- if (flag) {
- // handlerIscsEvent(this.$route.query.group, {operate: operate, stationCode:this.stationCode});
- }
},
// 右键点击事件
onContextMenu(em) {
diff --git a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
index beb282d7b..a26a30e31 100644
--- a/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/centerpane.vue
@@ -214,14 +214,14 @@
this.moveheight=159;
this.movex=153+"px";
}
- if(this.moveheight<82&&this.moveheight>73){
- this.movex=75+"px";
+ if(this.moveheight<86&&this.moveheight>73){
+ this.movex=72+"px";
this.move = 0;
}else if(this.moveheight<0&&this.moveheight>159){
}else{
- if(this.moveheight>=82){
+ if(this.moveheight>=86){
this.move = -(this.moveheight-82)/65;
}
if(this.moveheight<=73){
@@ -229,7 +229,7 @@
}
this.movex=this.moveheight-7+"px";
if(this.moveheight>=145){
- this.movex= 153+"px";
+ this.movex= 150+"px";
this.move = -2;
}
diff --git a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
index a0d17bfbe..98f5cb772 100644
--- a/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/toprightpane.vue
@@ -25,7 +25,7 @@
- ![]()
+ ![]()
@@ -116,7 +116,7 @@
{{ $t('jlmap3d.closeLeftDoor') }}
{{ $t('jlmap3d.openRightDoor') }}
- ![]()
+ ![]()
{{ $t('jlmap3d.closeRightDoor') }}
@@ -186,7 +186,9 @@
runLevel:null,
cbtcbuttonimg:"/static/jl3d/control/green.png",
doorleftstatus:false,
- doorleftstatus:false,
+ doorrightstatus:false,
+ doorleftimg:"/static/jl3d/control/green.png",
+ doorrightimg:"/static/jl3d/control/green.png",
}
},
@@ -207,6 +209,7 @@
},
mounted() {
window.updatabuttonlight = this.updatabuttonlight;
+ window.updatedoorlight = this.updatedoorlight;
},
beforeDestroy() {
@@ -372,14 +375,33 @@
// console.log(netdata);
});
},
+ updatedoorlight: function (doorleftmode,doorrightmode){
+ if(doorleftmode){
+ if(doorleftmode == true){
+ this.doorleftimg = this.greenlimg;
+ }else{
+ this.doorleftimg = this.greenimg;
+ }
+ }
+ if(doorrightmode){
+ if(doorrightmode == true){
+ this.doorrightimg = this.greenlimg;
+ }else{
+ this.doorrightimg = this.greenimg;
+ }
+ }
+
+ },
dloclick: function (e){
trainSimulationDoorControl(this.group,this.groupNum,false,true).then(netdata => {
// console.log(netdata);
});
},
dlcclick: function (e){
+
trainSimulationDoorControl(this.group,this.groupNum,false,false).then(netdata => {
// console.log(netdata);
+ this.doorleftimg = this.greenimg;
});
},
@@ -391,6 +413,7 @@
drcclick: function (e){
trainSimulationDoorControl(this.group,this.groupNum,true,false).then(netdata => {
// console.log(netdata);
+ this.doorrightimg = this.greenimg;
});
},
atoaclick: function (e){
diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
index 5ddeb11a9..6ac01be09 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue
@@ -105,7 +105,7 @@ export default {
}
},
created() {
- document.querySelector("link[rel*='icon']").href = ProjectIcon[this.$route.query.project];
+ document.querySelector("link[rel*='icon']").href = loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
},
mounted() {
window.updatefault = this.updatefault;
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index 2e0038961..e1c653a4d 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -36,7 +36,7 @@
+
diff --git a/src/views/jsxt/refereeList/display.vue b/src/views/jsxt/refereeList/display.vue
index 8195c8eb1..9cc8eb6d7 100644
--- a/src/views/jsxt/refereeList/display.vue
+++ b/src/views/jsxt/refereeList/display.vue
@@ -283,3 +283,13 @@ export default {
}
};
+
diff --git a/src/views/lesson/operateMenu.vue b/src/views/lesson/operateMenu.vue
index ba4b53670..d720110cd 100644
--- a/src/views/lesson/operateMenu.vue
+++ b/src/views/lesson/operateMenu.vue
@@ -118,3 +118,13 @@ export default {
}
};
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6078dda2d..a01040f70 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,8 +1,8 @@
![]()
@@ -91,8 +91,8 @@
-
@@ -311,6 +312,9 @@ export default {
'size.width': function(val) {
this.setWindowSize();
},
+ 'size.height': function(val) {
+ this.setWindowSize();
+ },
'$store.state.app.windowSizeCount': function() {
this.setWindowSize();
},
@@ -685,8 +689,23 @@ export default {
} else {
this.showStation = val;
}
- this.$store.dispatch('map/setShowCentralizedStationCode', this.showStation);
- this.$store.dispatch('map/setShowCentralizedStationNum');
+ const nameList = Object.keys(this.$store.state.map.map);
+ let list = [];
+ nameList.forEach(item => {
+ if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) {
+ if (item === 'trainList') {
+ this.$store.state.map.map[item].forEach(elem => {
+ elem && list.push(elem);
+ });
+ } else {
+ list = [...list, ...this.$store.state.map.map[item]];
+ }
+ }
+ });
+ this.$jlmap.updateShowStation(list, this.showStation);
+ this.setCenter(this.showStation);
+ // this.$store.dispatch('map/setShowCentralizedStationCode', this.showStation);
+ // this.$store.dispatch('map/setShowCentralizedStationNum');
}
},
setStationList(val) {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 68ed595d1..bc9c97560 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -19,7 +19,7 @@
{{ $t('display.demon.drivingByPlan') }}
- {{ $t('display.demon.exitPlan') }}
+ {{ $t('display.demon.initialize') }}
{{ $t('display.demon.back') }}
diff --git a/src/views/newMap/displayNew/menuPractice.vue b/src/views/newMap/displayNew/menuPractice.vue
index a11b241f4..7d1b638d9 100644
--- a/src/views/newMap/displayNew/menuPractice.vue
+++ b/src/views/newMap/displayNew/menuPractice.vue
@@ -13,7 +13,7 @@
按计划行车
- 退出计划
+ 初始化
返回
diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue
index 2a98e9db5..789431329 100644
--- a/src/views/newMap/displayNew/menuScript.vue
+++ b/src/views/newMap/displayNew/menuScript.vue
@@ -8,16 +8,20 @@
-->
{{ $t('scriptRecord.drivingByPlan') }}
- 退出计划
+ 初始化
{{ $t('scriptRecord.scriptBack') }}
+
+
diff --git a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
index 7a40c6460..3e8dd16ce 100644
--- a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
@@ -312,3 +312,13 @@ export default {
}
};
+
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index 34bc835b9..a9bd5d151 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -651,6 +651,14 @@ export default {
diff --git a/src/views/scriptManage/display/tipScriptRecordNew.vue b/src/views/scriptManage/display/tipScriptRecordNew.vue
new file mode 100644
index 000000000..46bee6261
--- /dev/null
+++ b/src/views/scriptManage/display/tipScriptRecordNew.vue
@@ -0,0 +1,296 @@
+
+
- ![]()
- {{ loginTitle }}
+ ![]()
+ {{ loginTitle==='jyd'?'':loginTitle }}
主体：北京玖琏科技有限公司 备案号：京ICP备18028522号
+ 主体：北京玖琏科技有限公司 备案号：京ICP备18028522号
+
+
+
+
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 46d315955..426c6f000 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -11,6 +11,7 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('scriptRecord.drivingPause') }}
+ 恢复
+ {{ $t('scriptRecord.resetScript') }}
+ {{ $t('scriptRecord.saveBackground') }}
+ {{ $t('scriptRecord.saveData') }}
+
+
+
+ 当前剧本角色:
+
+
+
+
+
+
+ {{ $t('scriptRecord.scriptRecordTitle') }}
+
+
+
+
+
+ {{ actionInfo.memberName }}
+ 邀请
+ {{ actionInfo.targetName }}
+
+
+ {{ actionInfo.memberName }}
+
+
+ :
+ {{ actionInfo.reply }}
+
+
+ {{ actionInfo.memberName }}
+ {{ $t('scriptRecord.executeCommandTips') }}
+ {{ actionInfo.command }}
+
+
+
+
+
+
+
+