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

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

Browse Source
This commit is contained in:
sunzhenyu 2020-12-22 14:08:33 +08:00
commit af7e9d8dbf
78 changed files with 971 additions and 652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/learn.js
View File

@ -98,3 +98,11 @@ export function createPost(data) {
data
});
}
// 修改留言板
export function updatePost(postId, data) {
return request({
url: `/api/learn/${postId}`,
method: 'put',
data
});
}

12
src/components/QueryListPage/DataForm.vue
View File

@ -329,6 +329,18 @@
</el-table>
</div>
</template>
<template v-else-if="checkFieldType(item, 'switchBox')">
<el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
<el-switch
v-model="formModel[item.prop]"
:active-color="item.activeColor || '#13ce66'"
:inactive-color="item.inactiveColor || '#ff4949'"
/>
<!-- <el-radio-group v-model="formModel[item.prop]">
<el-radio v-for="item in item.children" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
</el-radio-group> -->
</el-form-item>
</template>
</template>
</el-form>

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

@ -116,7 +116,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#7F7F7F', // 尽头分隔符颜色
color: '#7F7F7F', // 区段边界符颜色

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

@ -124,7 +124,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: 'white', // 区段边界符颜色

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

@ -124,7 +124,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: '#FFFFFF', // 区段边界符颜色

3
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -108,7 +108,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度
width: 1.2, // 物理区段分隔符宽度
logicWidth:1.2, // 逻辑区段分隔符宽度
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3', // 区段边界符颜色

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

@ -108,7 +108,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度
width: 1.2, // 物理区段分隔符宽度
logicWidth:1.2, // 逻辑区段分隔符宽度
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3', // 区段边界符颜色

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

@ -128,14 +128,6 @@ class SkinCode extends defaultStyle {
drogueWidth: 15, // 浮标宽度
drogueHeight: 12 // 浮标高度
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3', // 区段边界符颜色
halfHeight: 5 // 区段分隔符高度的一半
},
trainPosition:{
display: false // 列车实时位置显示
}

21
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -6,7 +6,7 @@ class SkinCode extends defaultStyle {
super();
this.fontFamily = '宋体';
this[deviceType.Section] = {
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'speedLimitName'],
elemnetType:['name', 'logicText', 'standTrackText', 'reentryTrackText', 'transferTrackText', 'line', 'lineBorder', 'sectionBlock', 'separator', 'speedLimitName'],
active: {
routeColor: false // 进路触发颜色
},
@ -130,11 +130,14 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度
width: 3, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3', // 区段边界符颜色
halfHeight: 5 // 区段分隔符高度的一半
endColor: '#C0C0C0', // 尽头分隔符颜色
color: '#000', // 区段边界符颜色
halfHeight: 5, // 区段分隔符高度的一半
sepical:true, // 特殊类型 道岔C区段 分隔符为横向
isLikeT:true // 特殊类型尽头分隔 类似与右躺着的T
},
trainPosition:{
display: false // 列车实时位置显示
@ -172,7 +175,7 @@ class SkinCode extends defaultStyle {
stopWidth: 2, // 禁止线宽度
borderWidth: 0, // 信号灯边框线宽度
borderColor: '#FF0000', // 信号灯边框线颜色 (虚拟信号机)
radiusR: 4, // 信号灯半径
radiusR: 5, // 信号灯半径
blockColor: '#EF0C08', // 信号灯锁闭
grayColor: '#7F7F7F', // 信号灯灰色
redColor: '#FF0000', // 信号灯红色
@ -686,7 +689,7 @@ class SkinCode extends defaultStyle {
},
travelSigns: {
trainTravelLeftSignsOffset: { x:3, y: 3},
trainTravelRightSignsOffset: { x: 62, y: 3}
trainTravelRightSignsOffset: { x: 65, y: 3}
},
delayTime: {
trainDelayTimeOffset: { x:5, y: 14}
@ -706,14 +709,14 @@ class SkinCode extends defaultStyle {
trainServer: {
serviceNumberPrefix: '000', // 服务号(表号)前缀
defaultServiceNumber: 'BBB', // 默认服务号（表号）
trainServerOffset: { x: 33, y: 3 }, // 列车服务号偏移
trainServerOffset: { x: 36, y: 3 }, // 列车服务号偏移
fontColor: '#00C300'
},
trainTarget: {
tripNumberPrefix: '00', // 车次号前缀
defaultDirectionCode: '', // 默认车次号1
defaultTripNumber: 'CC', // 默认车次号2
trainTargetOffset: { x: 53, y: 3 }, // 列车车次号偏移
trainTargetOffset: { x: 56, y: 3 }, // 列车车次号偏移
fontColor: '#00C300'
},
trainTargetNumber: {

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

@ -108,7 +108,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: 'white', // 区段边界符颜色

3
src/jmapNew/config/skinCode/ningbo_03.js
View File

@ -139,7 +139,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: -1, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#000000', // 尽头分隔符颜色
color: '#000000', // 区段边界符颜色

3
src/jmapNew/config/skinCode/race_01.js
View File

@ -132,7 +132,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#7F7F7F', // 尽头分隔符颜色
color: '#7F7F7F', // 区段边界符颜色

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

@ -116,7 +116,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.2, // 分隔符宽度
width: 1.2, // 物理区段分隔符宽度
logicWidth:1.2, // 逻辑区段分隔符宽度
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3', // 区段边界符颜色

3
src/jmapNew/config/skinCode/xian_02.js
View File

@ -125,7 +125,8 @@ class SkinCode extends defaultStyle {
},
separator: {
z: 3, // 分割符层级
width: 1.5, // 分隔符宽度
width: 1.5, // 物理区段分隔符宽度
logicWidth:1.5, // 逻辑区段分隔符宽度
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: '#AAA9A9', // 区段边界符颜色

46
src/jmapNew/shape/Arrow/index.js
View File

@ -1,4 +1,3 @@
import Line from 'zrender/src/graphic/shape/Line';
import Group from 'zrender/src/container/Group';
import {isShowThePrdType} from '../../utils/handlePath';
import Polygon from 'zrender/src/graphic/shape/Polygon';
@ -11,7 +10,7 @@ export default class Arrow extends Group {
this.zlevel = model.zlevel;
this.z = 0;
this.model = model;
this.style = style;
// this.style = style;
this.isShowShape = true;
if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
this.create();
@ -24,36 +23,25 @@ export default class Arrow extends Group {
create() {
const model = this.model;
this.triangle = new Polygon({
this.arrow = new Polygon({
zlevel: this.zlevel,
z: this.z,
shape: {
points: [
[model.position.x, model.position.y],
[model.position.x + model.triangleLength, model.position.y + model.triangleHeight / 2],
[model.position.x + model.triangleLength, model.position.y - model.triangleHeight / 2]
[model.position.x + model.triangleLength, model.position.y - model.triangleHeight / 2],
[model.position.x + model.triangleLength, model.position.y - model.lineWidth / 2],
[model.position.x + model.length, model.position.y - model.lineWidth / 2],
[model.position.x + model.length, model.position.y + model.lineWidth / 2],
[model.position.x + model.triangleLength, model.position.y + model.lineWidth / 2],
[model.position.x + model.triangleLength, model.position.y + model.triangleHeight / 2]
]
},
style: {
fill: model.color
}
});
this.line = new Line({
zlevel: this.zlevel,
z: this.z,
shape: {
x1: model.position.x + model.triangleLength,
y1: model.position.y,
x2: model.position.x + model.length,
y2: model.position.y
},
style: {
lineWidth: model.lineWidth,
stroke: model.color
}
});
this.add(this.triangle);
this.add(this.line);
this.add(this.arrow);
}
setState(model) {
@ -64,26 +52,18 @@ export default class Arrow extends Group {
const showMode = this.model.showMode;
const showConditions = this.model.showConditions;
if (!showConditions || showConditions === '01' || showMode === showConditions) {
this.eachChild((child) => {
child.show();
});
this.arrow.show();
} else {
this.eachChild((child) => {
child.hide();
});
this.arrow.hide();
}
}
setShowStation(stationCode) {
if (!stationCode || this.model.stationCode === stationCode) {
this.eachChild((child) => {
child.show();
});
this.arrow.show();
this.isShowShape = true;
this.setState(this.model);
} else {
this.eachChild((child) => {
child.hide();
});
this.arrow.hide();
this.isShowShape = false;
}
}

63
src/jmapNew/shape/Line/index.js
View File

@ -1,6 +1,6 @@
import Line from 'zrender/src/graphic/shape/Line';
import Group from 'zrender/src/container/Group';
import {isShowThePrdType} from '../../utils/handlePath';
import Polyline from 'zrender/src/graphic/shape/Polyline';
export default class Line2 extends Group {
constructor(model, style) {
@ -10,7 +10,7 @@ export default class Line2 extends Group {
this.zlevel = model.zlevel;
this.z = 0;
this.model = model;
this.style = style;
this.style = style.Line;
this.isShowShape = true;
if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
this.create();
@ -23,24 +23,25 @@ export default class Line2 extends Group {
create() {
const model = this.model;
const style = this.style;
if (model && model.points.length > 1) {
for (let i = 0; i < (model.points.length - 1); i++) {
this.add(new Line({
zlevel: model.zlevel,
z: this.z,
shape: {
x1: model.points[i].x,
y1: model.points[i].y,
x2: model.points[i + 1].x,
y2: model.points[i + 1].y
},
style: {
lineWidth: model.width,
stroke: model.lineColor || style.Line.lineColor
}
}));
const points = [];
const modelPoints = model.points;
const length = modelPoints.length;
for (let i = 0; i < length; i++) {
points.push([modelPoints[i].x, modelPoints[i].y]);
}
this.segment = new Polyline({
zlevel: this.zlevel,
z:this.z,
shape: {
points:points
},
style: {
lineWidth: model.width,
stroke: model.lineColor || this.style.lineColor
}
});
this.add(this.segment);
}
}
@ -48,13 +49,17 @@ export default class Line2 extends Group {
switch (type) {
case '01': break;
case '02':
this.eachChild((child) => {
child.setStyle('lineDash', this.style.Line.lineDash || [4]);
});
this.segment.setStyle('lineDash', this.style.lineDash || [4]);
break;
}
}
getBoundingRect() {
if (this.segment) {
return this.segment.getBoundingRect().clone();
}
}
setState(model) {
if (!this.isShowShape) return;
this.setLineType(model.type);
@ -64,26 +69,18 @@ export default class Line2 extends Group {
const showMode = this.model.showMode;
const showConditions = this.model.showConditions;
if (!showConditions || showConditions === '01' || showMode === showConditions) {
this.eachChild((child) => {
child.show();
});
this.segment && this.segment.show();
} else {
this.eachChild((child) => {
child.hide();
});
this.segment && this.segment.hide();
}
}
setShowStation(stationCode) {
if (!stationCode || this.model.stationCode === stationCode) {
this.eachChild((child) => {
child.show();
});
this.segment && this.segment.show();
this.isShowShape = true;
this.setState(this.model);
} else {
this.eachChild((child) => {
child.hide();
});
this.segment && this.segment.hide();
this.isShowShape = false;
}
}

4
src/jmapNew/shape/Psd/EHorizontal2Door.js
View File

@ -70,6 +70,10 @@ class EHorizontal2Door extends Group {
this.stand2.setStyle('fill', style.Psd.horizontal2Door.defaultColor);
}
}
if (model.noStatus) {
this.stand1.setStyle('fill', '#7F7F7F');
this.stand2.setStyle('fill', '#7F7F7F');
}
}
}

59
src/jmapNew/shape/Section/ESeparator.js
View File

@ -28,7 +28,8 @@ export default class ESeparator extends Group {
y: model.points[0].y
},
sepType: model.sepTypeLeft,
drict: -1 // 方向
drict: -1, // 方向
type:model.type // 区段类型
});
/** 创建右侧分隔符*/
@ -40,25 +41,27 @@ export default class ESeparator extends Group {
y: model.points[model.points.length - 1].y
},
sepType: model.sepTypeRight,
drict: 1 // 方向
drict: 1, // 方向
type:model.type // 区段类型
});
this.add(this.lPartition);
this.add(this.rPartition);
}
}
createModel(modelData, points, lineWidth, stroke) {
createModel(modelData, points, lineWidth, stroke, rotation) {
const partition = new Polyline({
zlevel: this.zlevel,
z: this.z,
origin: [modelData.point.x, modelData.point.y],
rotation: Math.PI * 2 - Math.atan2(modelData.traingle.absy, modelData.traingle.absx) * modelData.traingle.drictx * modelData.traingle.dricty,
rotation: rotation || Math.PI * 2 - Math.atan2(modelData.traingle.absy, modelData.traingle.absx) * modelData.traingle.drictx * modelData.traingle.dricty,
shape: {
points: points
},
style: {
lineWidth: lineWidth || this.style.Section.separator.width,
stroke: stroke || this.style.Section.separator.color
// fill:stroke || this.style.Section.separator.color
}
});
return partition;
@ -112,11 +115,27 @@ export default class ESeparator extends Group {
if (modelData && style && modelData.traingle) {
let partition = null;
if (type === '01') { // 普通分割
const points = [
[modelData.point.x, modelData.point.y - (style.Section.separator.halfHeight)],
[modelData.point.x, modelData.point.y + (style.Section.separator.halfHeight)]
];
partition = this.createModel(modelData, points);
let points = [];
let lineWidth = 0;
const tanRate = modelData.traingle.getTanRate();
if (style.Section.separator.sepical && modelData.type == '03' && tanRate != 0 && tanRate != 1) {
// 转换坐标系计算
const dataDirection = modelData.traingle.getRotation() > 0 ? 1 : -1;
points = [
[modelData.point.x - (style.Section.separator.halfHeight) * modelData.traingle.getCosRate(),
modelData.point.y + dataDirection * (style.Section.separator.halfHeight) * modelData.traingle.getSinRate()],
[modelData.point.x + (style.Section.separator.halfHeight) * modelData.traingle.getCosRate(),
modelData.point.y - dataDirection * (style.Section.separator.halfHeight) * modelData.traingle.getSinRate()]
];
partition = this.createModel(modelData, points);
} else {
points = [
[modelData.point.x, modelData.point.y - (style.Section.separator.halfHeight)],
[modelData.point.x, modelData.point.y + (style.Section.separator.halfHeight)]
];
lineWidth = modelData.type == '02' ? style.Section.separator.logicWidth : style.Section.separator.width;
partition = this.createModel(modelData, points, lineWidth);
}
} else if (type === '02') { // 单侧分割符
const points = [
[modelData.point.x + modelData.drict * (style.Section.separator.halfHeight), modelData.point.y - (style.Section.separator.halfHeight * 1.5)],
@ -125,12 +144,22 @@ export default class ESeparator extends Group {
];
partition = this.createModel(modelData, points);
} else if (type === '03') { // 尽头分隔符
const points = [
[modelData.point.x + modelData.drict * (style.Section.separator.halfHeight) * 1.2, modelData.point.y - (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x, modelData.point.y - (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x, modelData.point.y + (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x + modelData.drict * (style.Section.separator.halfHeight) * 1.2, modelData.point.y + (style.Section.separator.halfHeight * 1.2)]
];
let points = [];
if (style.Section.separator.isLikeT) {
points = [
[modelData.point.x + modelData.drict * style.Section.separator.width, modelData.point.y],
[modelData.point.x + modelData.drict * (style.Section.separator.width + style.Section.separator.halfHeight * 1.2), modelData.point.y],
[modelData.point.x + modelData.drict * (style.Section.separator.width + style.Section.separator.halfHeight * 1.2), modelData.point.y - style.Section.separator.halfHeight * 1.2],
[modelData.point.x + modelData.drict * (style.Section.separator.width + style.Section.separator.halfHeight * 1.2), modelData.point.y + style.Section.separator.halfHeight * 1.2]
];
} else {
points = [
[modelData.point.x + modelData.drict * (style.Section.separator.halfHeight) * 1.2, modelData.point.y - (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x, modelData.point.y - (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x, modelData.point.y + (style.Section.separator.halfHeight * 1.2)],
[modelData.point.x + modelData.drict * (style.Section.separator.halfHeight) * 1.2, modelData.point.y + (style.Section.separator.halfHeight * 1.2)]
];
}
const lineWidth = style.Section.separator.endWidth;
const stroke = style.Section.separator.endColor;
partition = this.createModel(modelData, points, lineWidth, stroke);

6
src/jmapNew/shape/Section/ETextName.js
View File

@ -144,7 +144,9 @@ class ETextName extends Group {
hide() {
this.text && this.text.hide();
}
setStyle(styles) {
this.text && this.text.setStyle(styles);
}
getBoundingRect() {
if (this.text) {
return this.text.getBoundingRect().clone();
@ -153,6 +155,8 @@ class ETextName extends Group {
recover() {
// 暂时不做状态初始化
const styleModel = this.model.style.Section[this.model.type];
this.text && this.text.setStyle({textFill: this.model.approach && this.model.type === 'name' ? styleModel.approachColor : styleModel.fontColor });
}
setState() {

14
src/jmapNew/shape/Section/index.js
View File

@ -81,6 +81,7 @@ export default class Section extends Group {
lineWidth: this.style.Section.line.width
});
}
this.name && this.name.recover();
this.speedLimit && this.speedLimit.hide();
this.speedLimitName && this.speedLimitName.hide();
@ -238,7 +239,11 @@ export default class Section extends Group {
this.speedLimitName && this.speedLimitName.show(speedUpLimit);
}
}
/** 设置灰显 */
setAshShow() {
this.line && this.line.setStyle({stroke: '#7F7F7F'});
this.name && this.name.setStyle({textFill: '#7F7F7f'});
}
/** 设置状态*/
setState(model, flag = false) {
if (!this.isShowShape) return;
@ -246,12 +251,12 @@ export default class Section extends Group {
// 哈尔滨线路 道岔相关区段设置 默认颜色
if (this.style.Switch.sectionAction.flag && model.relSwitchCode && !flag) {
const switchModel = Vue.prototype.$jlmap.mapDevice[model.relSwitchCode];
if (switchModel.normalPosition != 0) { // 定位情况
if (switchModel && switchModel.normalPosition != 0) { // 定位情况
const sectionC = Vue.prototype.$jlmap.mapDevice[switchModel.sectionCCode];
sectionC && sectionC.instance && sectionC.instance.line.setStyle({ stroke: this.style.Switch.sectionAction.spareColor });
const sectionB = Vue.prototype.$jlmap.mapDevice[switchModel.sectionBCode];
sectionB && sectionB.instance && sectionB.instance.setState(sectionB, true);
} else if (switchModel.normalPosition == 0) { // 反位情况
} else if (switchModel && switchModel.normalPosition == 0) { // 反位情况
const sectionB = Vue.prototype.$jlmap.mapDevice[switchModel.sectionBCode];
sectionB && sectionB.instance && sectionB.instance.line.setStyle({ stroke: this.style.Switch.sectionAction.spareColor });
const sectionC = Vue.prototype.$jlmap.mapDevice[switchModel.sectionCCode];
@ -278,7 +283,8 @@ export default class Section extends Group {
// 区段计轴预复位状态 (未处理)
// 区段故障锁闭 之前是fault 暂时设置为faultLock
model.faultLock && this.faultLock();
// 设置灰显
model.noStatus && this.setAshShow();
/** 道岔区段更新岔心颜色 */
if (model.type === '03' && model.switch) {
const sectionSwitch = store.getters['map/getDeviceByCode'](model.switch.code);

1
src/jmapNew/shape/Signal/ESigPost.js
View File

@ -79,6 +79,7 @@ class ESigPost extends Group {
setColor(color) {
if (color) {
this.ver && this.ver.setStyle({ stroke: color });
this.ver && this.ver.setStyle({ fill: color });
this.hor && this.hor.setStyle({ stroke: color });
}
}

3
src/jmapNew/shape/Signal/EVirtualSignal.js
View File

@ -11,15 +11,12 @@ class EVirtualSignal extends Group {
create() {
const model = this.model;
const style = this.model.style;
// const rotation = model.drict != 1 ? -Math.PI / 180 * Number(30) : Math.PI / 180 * Number(30);
const drict = model.drict !== 1 ? -1 : 1;
this.lamp = new Polygon({
name: model.index,
zlevel: model.zlevel,
z: model.z,
// origin: [model.x, model.y],
// rotation: rotation,
shape: {
points: [
[model.x - (3 * drict), model.y + Math.sqrt(3) * 3],

9
src/jmapNew/shape/Signal/index.js
View File

@ -597,7 +597,12 @@ class Signal extends Group {
this.remainTImeName.show();
this.remainTImeName && this.remainTImeName.setStyle({ text: number });
}
setAshShow() {
this.lamps.forEach(item=> { item.setStyle({fill: '#7F7F7F', stroke: '#7F7F7F'}); });
this.sigName && this.sigName.setStyle({ textFill: '#7F7F7F' });
this.sigPost && this.sigPost.setColor('#7F7F7F');
this.virtualSignal && this.virtualSignal.setColor('#7F7F7F');
}
// 恢复状态
recover() {
this.lamps.forEach(item=> { item.show(); });
@ -705,6 +710,8 @@ class Signal extends Group {
});
}
}
// 设置灰显
model.noStatus && this.setAshShow();
}
getBoundingRect() {

62
src/jmapNew/shape/SplitStation/index.js
View File

@ -34,62 +34,50 @@ export default class SplitStation extends Group {
stroke: style.SplitStation.strokeColor
}
});
this.triangleLeft = new Polygon({
this.arrowLeft = new Polygon({
zlevel: this.zlevel,
z: this.z,
shape: {
points: [
[model.position.x, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2],
[model.position.x - style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height],
[model.position.x - style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance]
[model.position.x - style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance],
[model.position.x - style.SplitStation.horizontalDistance,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 - style.SplitStation.lineWidth / 2],
[model.position.x - style.SplitStation.horizontalDistance - style.SplitStation.lineLength,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 - style.SplitStation.lineWidth / 2],
[model.position.x - style.SplitStation.horizontalDistance - style.SplitStation.lineLength,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 + style.SplitStation.lineWidth / 2],
[model.position.x - style.SplitStation.horizontalDistance,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 + style.SplitStation.lineWidth / 2],
[model.position.x - style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height]
]
},
style: {
fill: style.SplitStation.triangleFillColor
}
});
this.triangleRight = new Polygon({
this.arrowRight = new Polygon({
zlevel: this.zlevel,
z: this.z,
shape: {
points: [
[model.position.x, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2],
[model.position.x + style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height],
[model.position.x + style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance]
[model.position.x + style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance],
[model.position.x + style.SplitStation.horizontalDistance,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 - style.SplitStation.lineWidth / 2],
[model.position.x + style.SplitStation.horizontalDistance + style.SplitStation.lineLength,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 - style.SplitStation.lineWidth / 2],
[model.position.x + style.SplitStation.horizontalDistance + style.SplitStation.lineLength,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 + style.SplitStation.lineWidth / 2],
[model.position.x + style.SplitStation.horizontalDistance,
model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2 + style.SplitStation.lineWidth / 2],
[model.position.x + style.SplitStation.horizontalDistance, model.position.y + style.SplitStation.height]
]
},
style: {
fill: style.SplitStation.triangleFillColor
}
});
this.leftLine = new Line({
zlevel: this.zlevel,
z: this.z,
shape: {
x1: model.position.x - style.SplitStation.horizontalDistance,
y1: model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2,
x2: model.position.x - style.SplitStation.horizontalDistance - style.SplitStation.lineLength,
y2: model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2
},
style: {
lineWidth: style.SplitStation.lineWidth,
stroke: style.SplitStation.strokeColor
}
});
this.rightLine = new Line({
zlevel: this.zlevel,
z: this.z,
shape: {
x1: model.position.x + style.SplitStation.horizontalDistance,
y1: model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2,
x2: model.position.x + style.SplitStation.horizontalDistance + style.SplitStation.lineLength,
y2: model.position.y + style.SplitStation.height - style.SplitStation.verticalDistance / 2
},
style: {
lineWidth: style.SplitStation.lineWidth,
stroke: style.SplitStation.strokeColor
}
});
this.leftText = new Text({
zlevel: this.zlevel,
z: this.z,
@ -125,10 +113,8 @@ export default class SplitStation extends Group {
this.leftText.setStyle('x', model.position.x - style.SplitStation.horizontalDistance - style.SplitStation.lineLength - leftTextWidth / 2);
this.rightText.setStyle('x', model.position.x + style.SplitStation.horizontalDistance + style.SplitStation.lineLength + rightTextWidth / 2);
this.add(this.verticalLine);
this.add(this.triangleLeft);
this.add(this.triangleRight);
this.add(this.leftLine);
this.add(this.rightLine);
this.add(this.arrowLeft);
this.add(this.arrowRight);
this.add(this.leftText);
this.add(this.rightText);
}

7
src/jmapNew/shape/StationStand/ETrainSetButton.js
View File

@ -43,11 +43,16 @@ class ETime extends Group {
showMode() {
this.trainSetButton && this.trainSetButton.show();
}
setColor(color) {
this.trainSetButton && this.trainSetButton.setStyle({textFill: color});
}
recover() {
const style = this.model.style;
this.setColor(style.StationStand.trainSetButton.textColor);
}
setState(model) {
model.noStatus && this.setColor('#7F7F7F');
}
}

13
src/jmapNew/shape/StationStand/safeStand/EGapStand.js
View File

@ -74,10 +74,19 @@ class EGapStand extends Group {
}
recover() {
const style = this.model.style;
this.stand1 && this.stand1.setStyle({ fill:style.StationStand.gapStand.spareColor });
this.stand2 && this.stand2.setStyle({ fill:style.StationStand.gapStand.spareColor });
this.standText && this.standText.setStyle({ textFill:style.StationStand.gapStand.textFill });
}
setColor(color) {
this.stand1 && this.stand1.setStyle({ fill:color });
this.stand2 && this.stand2.setStyle({ fill:color });
this.standText && this.standText.setStyle({ textFill:color });
}
setState(model) {
// 设置灰显
model.noStatus && this.setColor('#7F7F7F');
}
}

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

@ -512,7 +512,12 @@ export default class Switch extends Group {
section.hide();
}
}
setAshShow() {
this.shapeModelA.setColor('#7F7F7F');
this.shapeModelB.setColor('#7F7F7F');
this.shapeModelC.setColor('#7F7F7F');
this.name.getNameText().setStyle({textFill: '#7F7F7F'});
}
setState(model) {
if (!this.isShowShape) return;
this.recover();
@ -545,6 +550,7 @@ export default class Switch extends Group {
sectionB && sectionB.instance && sectionB.instance.setState(sectionB);
}
}
model.noStatus && this.setAshShow();
}
getBoundingRect() {

14
src/jmapNew/theme/beijing_01/menus/menuStation.vue
View File

@ -172,16 +172,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

4
src/jmapNew/theme/beijing_01/operationConfig.js
View File

@ -283,7 +283,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '15' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -331,7 +331,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '35' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},

14
src/jmapNew/theme/chengdu_01/menus/menuStation.vue
View File

@ -108,16 +108,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

14
src/jmapNew/theme/chengdu_03/menus/menuStation.vue
View File

@ -110,16 +110,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

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

@ -181,13 +181,6 @@ export default {
this.stationName = '';
this.operation = operate.operation;
this.cmdType = operate.cmdType;
if (selected._type == 'Station') {
if (selected.zcCode) {
selected = this.$store.getters['map/getDeviceByCode'](selected.zcCode);
} else {
selected._type = '';
}
}
let name = selected.name;
if (selected._type == 'Train') {
name = selected.serviceNumber;

2
src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
View File

@ -116,7 +116,7 @@ export default {
over: true,
operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
val: this.mode,
val: `${!!this.mode}`,
param: {
CheckConflict: this.mode
}

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

@ -146,16 +146,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

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

@ -271,7 +271,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确定】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '15' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},

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

@ -164,16 +164,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

2
src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
View File

@ -65,7 +65,7 @@
<div>
<div style="display: inline-block;width: 150px;">新的车次号：</div>
<el-input v-model="newTripNum" style="display: inline-block;width: 200px;" size="small" />
<div v-if="newTripNumError" style="font-size: 10px;color: #F00;margin-left: 160px;height: 10px;line-height: 10px"> 请输入正确的车次号</div>
<div v-if="newTripNumError" style="font-size: 10px;color: #F00;margin-left: 160px;height: 10px;line-height: 10px;"> 请输入正确的车次号</div>
</div>
<div>
<div style="display: inline-block;width: 150px;">自动排列：</div>

14
src/jmapNew/theme/haerbin_01/menus/menuButton.vue
View File

@ -727,11 +727,19 @@ export default {
}
},
initMenus() {
this.basicParamList = [
this.basicParamList = this.$store.state.training.prdType === '01' ? [
{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
{ name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true },
// { name: '重启另解', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menu, show:false, securityCommand: true },
{ name: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate:OperationEvent.Station.stationRestart.menuButton, show: false, securityCommand: true},
{ name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
{ name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false },
{ name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false },
{ name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false },
{ name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false }
] : [{ name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
{ name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
{ name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true },
{ name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
{ name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false },
{ name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false },
@ -795,7 +803,7 @@ export default {
{ name: '扣车', cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false },
{ name: '取消扣车', cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, operate: OperationEvent.StationStand.cancelDetainTrain.menuButton, show: false },
{ name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false },
{ name: '取消越站', cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, operate: OperationEvent.StationStand.cancelJumpStop.menuButton, show: false, securityCommand: true }
{ name: '取消越站', cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, operate: OperationEvent.StationStand.cancelJumpStop.menuButton, show: false }
];
this.directionRodParamList = [
{ name: '切换左向', cmdType: CMD.DirectionRod.CMD_DIRECTION_CHANGE, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false },

4
src/jmapNew/theme/haerbin_01/menus/menuDialog/logDetail.vue
View File

@ -183,10 +183,8 @@ export default {
}
};
</script>
<style scoped>
<style lang="scss" scoped>
/deep/ .el-dialog .el-input {
border: 0 !important;
}
</style>

34
src/jmapNew/theme/haerbin_01/menus/menuStation.vue
View File

@ -52,6 +52,16 @@ export default {
handler: this.cancelStoppage,
cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
},
{
label: '设置车站故障',
handler: this.setStationStoppage,
cmdType: CMD.Station.CMD_STATION_ADD_FAULT
},
{
label: '取消车站故障',
handler: this.cancelStationStoppage,
cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
},
{
label: '触发故障管理',
handler: this.triggerFaultManagement,
@ -111,16 +121,36 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
setStationStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
}
});
},
cancelStationStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

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

@ -108,7 +108,7 @@ export default {
// { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
// { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
// { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
// { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
// { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
// ]
// },

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

@ -151,16 +151,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

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

@ -297,7 +297,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -316,7 +316,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -520,7 +520,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '10' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -539,7 +539,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -798,8 +798,8 @@ export default {
minDuration: 8,
operateType: 'Signal_Cancel_Auto_Turn_Back',
skinCode: '06',
trainingName: ' 取消自动折返({3})',
trainingRemark: ' 取消自动折返',
trainingName: '取消自动折返({3})',
trainingRemark: '取消自动折返',
trainingType: 'Signal',
productTypes: ['02'],
stepVOList: [
@ -812,8 +812,8 @@ export default {
minDuration: 15,
operateType: 'Cancel_All_Limit_Speed',
skinCode: '06',
trainingName: ' 取消全线临时限速',
trainingRemark: ' 取消全线临时限速',
trainingName: '取消全线临时限速',
trainingRemark: '取消全线临时限速',
trainingType: 'LimitControl',
productTypes: ['02'],
stepVOList: [
@ -830,8 +830,8 @@ export default {
minDuration: 8,
operateType: 'Station_Close_Auto_Setting',
skinCode: '06',
trainingName: ' 所有进路自排关({26})',
trainingRemark: ' 所有进路自排关',
trainingName: '所有进路自排关({26})',
trainingRemark: '所有进路自排关',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
@ -844,13 +844,13 @@ export default {
minDuration: 8,
operateType: 'Station_Open_Auto_Setting',
skinCode: '06',
trainingName: ' 所有进路自排开({26})',
trainingRemark: ' 所有进路自排开',
trainingName: '所有进路自排开({26})',
trainingRemark: '所有进路自排开',
trainingType: 'Station',
productTypes: ['02'],
stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '606', tip: '鼠标右键菜单选择【所有进路自排开】'},
{ deviceType: '05', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】' }
{ deviceType: '05', orderNum: 2, operateCode: '606', tip: '鼠标左键点击【确定】', val: 'true' }
]
},
{
@ -858,8 +858,8 @@ export default {
minDuration: 8,
operateType: 'Station_Cancel_CI_Auto_Trigger',
skinCode: '06',
trainingName: ' 全站取消联锁自动触发({26})',
trainingRemark: ' 全站取消联锁自动触发',
trainingName: '全站取消联锁自动触发({26})',
trainingRemark: '全站取消联锁自动触发',
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [
@ -872,8 +872,8 @@ export default {
minDuration: 8,
operateType: 'Station_Set_CI_Auto_Trigger',
skinCode: '06',
trainingName: ' 全站设置联锁自动触发({26})',
trainingRemark: ' 全站设置联锁自动触发',
trainingName: '全站设置联锁自动触发({26})',
trainingRemark: '全站设置联锁自动触发',
trainingType: 'Station',
productTypes: ['01'],
stepVOList: [

14
src/jmapNew/theme/ningbo_03/menus/menuStation.vue
View File

@ -146,16 +146,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

8
src/jmapNew/theme/ningbo_03/operationConfig.js
View File

@ -282,7 +282,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -301,7 +301,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -506,7 +506,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '10' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -525,7 +525,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},

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

@ -151,16 +151,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

4
src/jmapNew/theme/race_01/operationConfig.js
View File

@ -520,7 +520,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '10' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -539,7 +539,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},

14
src/jmapNew/theme/xian_01/menus/menuStation.vue
View File

@ -165,16 +165,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

34
src/jmapNew/theme/xian_02/menus/dialog/platformDwell.vue
View File

@ -74,7 +74,7 @@
</el-form>
<el-row justify="center" class="button-group">
<el-col :span="12" :offset="7">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确认</el-button>
<el-button :id="domIdConfirm" type="primary" @click="commit">确认</el-button>
<el-button :id="domIdCancel" @click="cancel">取消</el-button>
<el-button>帮助</el-button>
</el-col>
@ -85,6 +85,7 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'PlatformDwell',
@ -101,7 +102,6 @@ export default {
maximumDwell: '60',
notes: ''
},
loading: false,
rules: {},
dialogShow: false
};
@ -133,7 +133,6 @@ export default {
},
methods: {
doClose() {
this.loading = false;
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
@ -156,29 +155,14 @@ export default {
commit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation:{ code: OperationEvent.StationStand.setStopTime.menu.operation, name: '设置站台停站时间'}});
this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.StationStand.setStopTime.menu.operation, name: '设置站台停站时间'},
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
param: { parkingTime: this.addModel.defaultDwellTime, parkingAlwaysValid: true }
});
this.doClose();
}
// if (valid) {
// const operate = {
// send: true,
// operation: OperationEvent.Command.planTrain.addPlanTrain.operation
// };
// this.loading = true;
// this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
// this.loading = false;
// if (valid) {
// this.doClose();
// } else {
// this.$refs.noticeInfo.doShow();
// }
// }).catch(() => {
// this.loading = false;
// this.doClose();
// this.$refs.noticeInfo.doShow();
// });
// } else {
// return false;
// }
});
}
}

8
src/jmapNew/theme/xian_02/menus/menuRequest.vue
View File

@ -13,10 +13,10 @@
</el-table>
<el-row justify="center" class="button-group">
<el-col :span="2" :offset="4" class="button-top">
<el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" @click="commit">重做</el-button>
<el-button size="mini" style="float: left;" :loading="loading" @click="commit">重做</el-button>
</el-col>
<el-col :span="2" :offset="12" class="button-top">
<el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">撤销</el-button>
<el-button size="mini" style="float: right;" @click="cancel">撤销</el-button>
</el-col>
</el-row>
<el-row justify="center" class="button-group">
@ -60,10 +60,10 @@ export default {
'requestList'
]),
domIdConfirm() {
return OperationEvent.Signal.arrangementRoute.menu.domId;
return OperationEvent.Command.commandXian.confirm.domId;
},
domIdCancel() {
return OperationEvent.Command.cancel.menu.domId;
return OperationEvent.Command.commandXian.cancel.domId;
}
},
watch: {

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

@ -301,6 +301,7 @@ export default {
});
step = {
code: `${this.selected.code}`,
val: `${routeCode}`,
operation: OperationEvent.Signal.arrangementRoute.menu.operation,
param: {
routeCode: routeCode

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

@ -231,16 +231,22 @@ export default {
// 设置故障
setStoppage() {
commitOperate(menuOperate.Common.setFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.setFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},
// 取消故障
cancelStoppage() {
commitOperate(menuOperate.Common.cancelFault, { code: this.selected.zcCode }, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
if (valid && this.selected.zcCode) {
const zcSelected = this.$store.getters['map/getDeviceByCode'](this.selected.zcCode);
this.$refs.setFault.doShow(menuOperate.Common.cancelFault, zcSelected);
} else if (!this.selected.zcCode) {
console.error('该车站无zc设备');
}
});
},

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

@ -253,11 +253,12 @@ export default {
},
clickEvent(val) {
this.dialogShow = true;
if (val === 'adjustDwell') {
if (val == 'adjustDwell') {
this.setAdjustDwell();
}
event.stopPropagation();
},
// 停站时间
setAdjustDwell() {
const step = {
start: true,

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

@ -28,48 +28,48 @@ export default {
{ deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 8,
minDuration: 5,
operateType: 'Stand_Set_Hold_Train_Batch',
skinCode: '06',
trainingName: '批量扣车({10}-{12} 站台)',
trainingRemark: '批量扣车功能',
trainingType: 'Stand',
productTypes: ['02'], // 产品类型 01 现地 02 行调
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】' },
{ deviceType: '06', orderNum: 2, operateCode: '515', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 8,
minDuration: 5,
operateType: 'Stand_Cancel_Hold_Train_Batch',
skinCode: '06',
trainingName: '取消批量扣车({10}-{12} 站台)',
trainingRemark: '取消批量扣车功能',
trainingType: 'Stand',
productTypes: ['02'], // 产品类型 01 现地 02 行调
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】' },
{ deviceType: '06', orderNum: 2, operateCode: '516', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Early_Depart',
skinCode: '06',
trainingName: '提前发车({10}-{12}站台)',
trainingRemark: '提前发车功能',
trainingType: 'Stand',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
{ deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
]
},
// {
// maxDuration: 8,
// minDuration: 5,
// operateType: 'Stand_Set_Hold_Train_Batch',
// skinCode: '06',
// trainingName: '批量扣车({10}-{12} 站台)',
// trainingRemark: '批量扣车功能',
// trainingType: 'Stand',
// productTypes: ['02'], // 产品类型 01 现地 02 行调
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】' },
// { deviceType: '06', orderNum: 2, operateCode: '515', tip: '鼠标左键点击【确定】按钮' }
// ]
// },
// {
// maxDuration: 8,
// minDuration: 5,
// operateType: 'Stand_Cancel_Hold_Train_Batch',
// skinCode: '06',
// trainingName: '取消批量扣车({10}-{12} 站台)',
// trainingRemark: '取消批量扣车功能',
// trainingType: 'Stand',
// productTypes: ['02'], // 产品类型 01 现地 02 行调
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】' },
// { deviceType: '06', orderNum: 2, operateCode: '516', tip: '鼠标左键点击【确定】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Early_Depart',
// skinCode: '06',
// trainingName: '提前发车({10}-{12}站台)',
// trainingRemark: '提前发车功能',
// trainingType: 'Stand',
// productTypes: ['01', '02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
// { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
// ]
// },
{
maxDuration: 15,
minDuration: 8,
@ -98,115 +98,115 @@ export default {
{ deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Park_Time',
skinCode: '06',
trainingName: '设置停站时间({10}-{12}站台)',
trainingRemark: '设置停站时间(自动, 一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
{ deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Park_Time',
skinCode: '06',
trainingName: '设置停站时间({10}-{12}站台)',
trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
{ deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Park_Time',
skinCode: '06',
trainingName: '设置停站时间({10}-{12}站台)',
trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
{ deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
{ deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
{ deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
{ deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Run_Time',
skinCode: '06',
trainingName: '设置运行等级({10}-{12} 站台)',
trainingRemark: '设置运行等级(设置区间 运行等级1，运行时间为115，一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
{ deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【1】', val: '1' },
{ deviceType: '06', orderNum: 3, operateCode: '5101', tip: '鼠标左键点击，选择【115】', val: '115' },
{ deviceType: '06', orderNum: 4, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
{ deviceType: '06', orderNum: 5, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Run_Time',
skinCode: '06',
trainingName: '设置运行等级({10}-{12} 站台)',
trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
{ deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
{ deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
{ deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Set_Hold_Train_Auto',
skinCode: '06',
trainingName: '区间列车数量限制({10}-{12}站台)',
trainingRemark: '区间列车数量限制',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '517', tip: '鼠标右键菜单选择【区间列车数量限制】' },
{ deviceType: '06', orderNum: 2, operateCode: '517', tip: '鼠标左键点击【确认】按钮' }
]
},
{
maxDuration: 15,
minDuration: 8,
operateType: 'Stand_Cancel_Hold_Train_Auto',
skinCode: '06',
trainingName: '取消区间列车数量限制({10}-{12}站台)',
trainingRemark: '取消区间列车数量限制',
trainingType: 'Stand',
productTypes: ['02'],
stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '518', tip: '鼠标右键菜单选择【取消区间列车数量限制】' },
{ deviceType: '06', orderNum: 2, operateCode: '518', tip: '鼠标左键点击【确认】按钮' }
]
},
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Park_Time',
// skinCode: '06',
// trainingName: '设置停站时间({10}-{12}站台)',
// trainingRemark: '设置停站时间(自动, 一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
// { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【自动】', val: '01' },
// { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Park_Time',
// skinCode: '06',
// trainingName: '设置停站时间({10}-{12}站台)',
// trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
// { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
// { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
// { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Park_Time',
// skinCode: '06',
// trainingName: '设置停站时间({10}-{12}站台)',
// trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
// { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
// { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
// { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
// { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Run_Time',
// skinCode: '06',
// trainingName: '设置运行等级({10}-{12} 站台)',
// trainingRemark: '设置运行等级(设置区间 运行等级1，运行时间为115，一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
// { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【1】', val: '1' },
// { deviceType: '06', orderNum: 3, operateCode: '5101', tip: '鼠标左键点击，选择【115】', val: '115' },
// { deviceType: '06', orderNum: 4, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
// { deviceType: '06', orderNum: 5, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Run_Time',
// skinCode: '06',
// trainingName: '设置运行等级({10}-{12} 站台)',
// trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
// { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
// { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
// { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Set_Hold_Train_Auto',
// skinCode: '06',
// trainingName: '区间列车数量限制({10}-{12}站台)',
// trainingRemark: '区间列车数量限制',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '517', tip: '鼠标右键菜单选择【区间列车数量限制】' },
// { deviceType: '06', orderNum: 2, operateCode: '517', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
// {
// maxDuration: 15,
// minDuration: 8,
// operateType: 'Stand_Cancel_Hold_Train_Auto',
// skinCode: '06',
// trainingName: '取消区间列车数量限制({10}-{12}站台)',
// trainingRemark: '取消区间列车数量限制',
// trainingType: 'Stand',
// productTypes: ['02'],
// stepVOList: [
// { deviceType: '06', orderNum: 1, operateCode: '518', tip: '鼠标右键菜单选择【取消区间列车数量限制】' },
// { deviceType: '06', orderNum: 2, operateCode: '518', tip: '鼠标左键点击【确认】按钮' }
// ]
// },
{
maxDuration: 8,
minDuration: 5,
@ -282,7 +282,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -301,7 +301,7 @@ export default {
{ deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -366,7 +366,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' },
{ deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -380,7 +380,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' },
{ deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -394,7 +394,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
{ deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -408,7 +408,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
{ deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -440,7 +440,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -471,7 +471,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
{ deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -506,7 +506,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '10' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -525,7 +525,7 @@ export default {
{ deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
{ deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
{ deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
{ deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '0' },
{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
]
},
@ -540,9 +540,9 @@ export default {
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
{ deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【始端/终端选择】', codeType:'START_SIGNAL' },
{ deviceType: '04', orderNum: 2, operateCode: '301', tip: '鼠标左键选择进路名称【{3}】', val: '{4}', codeType:'END_SIGNAL' },
{ deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -556,7 +556,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -570,7 +570,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
{ deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -585,7 +585,7 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -600,7 +600,7 @@ export default {
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
{ deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -614,7 +614,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' },
{ deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -628,7 +628,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' },
{ deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -642,7 +642,7 @@ export default {
productTypes: ['02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' },
{ deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -656,7 +656,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' },
{ deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -670,7 +670,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
{ deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -684,7 +684,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
{ deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -698,7 +698,7 @@ export default {
productTypes: ['01'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
{ deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},
{
@ -729,7 +729,7 @@ export default {
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
{ deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
{ deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
]
},

4
src/scripts/ConstConfig.js
View File

@ -169,8 +169,8 @@ export default {
ControlConvertMenu: {enlabel: 'Control mode training', label:'控制模式实训'},
LimitControl: {enlabel: 'Control mode limit', label:'全线限速实训'},
TrainWindow: {enlabel: 'TrainWindow training', label:'车次窗实训'},
Driver:{enlabel: 'Driver training', label:'司机实训'},
DirectionRod:{enlabel: 'Direction rod training', label:'方向杆实训'}
Driver: {enlabel: 'Driver training', label:'司机实训'},
DirectionRod: {enlabel: 'Direction rod training', label:'方向杆实训'}
},
interfaceErrorConfig: {
'500000': { type: '权限错误:', message: '您尚未有该操作权限！'},

2
src/scripts/ProjectConfig.js
View File

@ -489,7 +489,7 @@ export const goOtherPlatformMenu = { // 导航栏快速切换平台
designsdy: '/login?project=sdy',
ntyl: '/design/login?project=ntyl',
designntyl: '/login?project=ntyl',
ntyc: '/design/login?project=ntyl',
ntyc: '/design/login?project=ntyc',
designntyc: '/login?project=ntyc'
};
export const ProjectList = [

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

@ -204,7 +204,9 @@ export default {
/** 关站信号 */
CMD_STATION_CLOSE_ALLSIGNAL: {value: 'Station_Close_AllSignal', label:'关站信号'},
/** 关区信号 */
CMD_STATION_CIAREA_CLOSE_ALLSIGNAL: {value: 'Station_CIArea_Close_AllSignal', label: '关区信号'}
CMD_STATION_CIAREA_CLOSE_ALLSIGNAL: {value: 'Station_CIArea_Close_AllSignal', label: '关区信号'},
/** 重启令解 */
CMD_STATION_RESTART: {value: 'Station_Restart', label: '重启令解'}
},
// 列车

3
src/scripts/cmdPlugin/Config.js
View File

@ -48,6 +48,9 @@ export const deviceFaultType = {
ZcControl:[
{label: 'zc故障', value: 'FAULT'}
],
Station: [
{label: '联锁机故障', value: 'INTERLOCK_MACHINE_FAULT'}
],
Train: [
{label: '通信异常', value: 'COMMUNICATION_ABNORMAL'},
{label: '驾驶故障', value: 'DRIVE_FAULT'}

16
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -234,6 +234,16 @@ export const OperationEvent = {
operation: '0082',
domId: '_Tips-commandHaerbin-confirmCr2{BOTTOM}'
}
},
commandXian: {
confirm: {
operation: '009',
domId: '_Tips-commandXian-confirm{TOP}'
},
cancel: {
operation: '0091',
domId: '_Tips-commandXian-cancel{TOP}'
}
}
},
@ -2052,6 +2062,12 @@ export const OperationEvent = {
operation: '6124',
domId: '_Tips-Station-ciAreaCloseAllSignal-menu{BOTTOM}'
}
},
stationRestart: {
menuButton: {
operation: '613',
domId: '_Tips-Station-stationRestart'
}
}
},

1
src/views/designPlatform/demonList.vue
View File

@ -58,7 +58,6 @@ export default {
},
getMapByCode() {
const project = getSessionStorage('project');
console.log(project, GetMapListByProjectList.includes(project));
return GetMapListByProjectList.includes(project);
}
},

48
src/views/ibp/copy.vue
View File

@ -1,41 +1,6 @@
<template>
<el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
<!--<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />-->
<el-form ref="form" :model="formModel" label-width="120px" :rules="rules">
<el-form-item label="发布数据地图" prop="dataMapId">
<el-select v-model="formModel.dataMapId" placeholder="请选择" @change="changeMapId">
<el-option
v-for="item in mapList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="发布地图车站" prop="dataStationCode">
<el-select v-model="formModel.dataStationCode" placeholder="请选择">
<el-option
v-for="item in dataStationList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="公共数据" prop="common">
<el-switch v-model="formModel.common" />
</el-form-item>
<el-form-item v-if="!formModel.common" label="关联车站" prop="stationCode">
<el-select v-model="formModel.stationCode" placeholder="请选择">
<el-option
v-for="item in stationList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
<el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
@ -61,7 +26,7 @@ export default {
common: false,
stationCode: ''
},
mapList: [],
mapList: [], // 上线地图列表
dataStationList: [],
ibpStationMap: {},
ibpMap: {}
@ -74,6 +39,7 @@ export default {
items: [
{ prop: 'dataMapId', label: '发布数据地图:', type: 'select', options: this.mapList, change: true, onChange: this.changeMapId},
{ prop: 'dataStationCode', label: '发布地图车站:', type: 'select', options: this.dataStationList },
{ prop: 'common', label: '公共数据:', type: 'switchBox' },
{ prop: 'stationCode', label: '关联车站:', type: 'select', options: this.stationList }
]
};
@ -96,7 +62,6 @@ export default {
},
async created () {
this.getIbpList();
this.getStationLIst();
},
methods: {
async getIbpList() {
@ -145,9 +110,10 @@ export default {
},
doShow() {
this.dialogVisible = true;
this.getStationLIst();
},
doCreate() {
this.$refs.form.validate(() => {
this.$refs.dataform.validateForm(() => {
const param = {
mapId: this.$route.params.mapId,
ibpId: this.ibpMap[this.formModel.dataMapId + '-' + this.formModel.dataStationCode],
@ -163,13 +129,13 @@ export default {
});
},
doClose() {
this.$refs.form.resetFields();
this.$refs.dataform.resetForm();
this.dialogVisible = false;
},
async changeMapId(val) {
try {
const res = await getStationList(val);
this.dataStationList = [];
this.dataStationList = []; // 发布地图车站列表
this.formModel.dataStationCode = '';
if (res.code == 200 || this.ibpStationMap[val]) {
res.data.forEach(station => {

34
src/views/ibp/home.vue
View File

@ -89,26 +89,30 @@ export default {
watch: {
'$route' () {
this.reloadTable();
this.getStationLists();
}
},
async created () {
try {
const res = await getStationList(this.$route.params.mapId);
this.stationList = [];
if (res.code == 200) {
res.data.forEach(station => {
const param = {
name: station.name,
code: station.code
};
this.stationList.push(param);
});
}
} catch (error) {
console.log(error);
}
this.getStationLists();
},
methods: {
async getStationLists() {
try {
const res = await getStationList(this.$route.params.mapId);
this.stationList = [];
if (res.code == 200) {
res.data.forEach(station => {
const param = {
name: station.name,
code: station.code
};
this.stationList.push(param);
});
}
} catch (error) {
console.log(error);
}
},
queryFunction(params) {
const param = {
...params,

20
src/views/ibp/ibpDraw/ibpOperate/index.vue
View File

@ -141,14 +141,18 @@ export default {
this.$store.dispatch('ibp/deleteIbpDevices', model);
},
async handleSave() {
try {
const param = {
drawData: this.$store.state.ibp.ibp
};
await putIbpDrawData(this.$route.query.ibpId, param);
this.$message.success('保存成功');
} catch (error) {
this.$message.success('保存失败:' + error.message);
if (this.$store.state.ibp.ibp.background) {
try {
const param = {
drawData: this.$store.state.ibp.ibp
};
await putIbpDrawData(this.$route.query.ibpId, param);
this.$message.success('保存成功');
} catch (error) {
this.$message.success('保存失败:' + error.message);
}
} else {
this.$message.error('ibp盘背景错误，请检查数据后重试！');
}
},
setIbpShow(data) {

4
src/views/ibp/ibpsystem/index.vue
View File

@ -195,9 +195,9 @@ export default {
});
}
} catch (error) {
console.log(error, '===');
console.log(error, '===');
this.loading = false;
this.$alert('当前ibp盘数据不存在', '信息', {
this.$alert('当前ibp盘数据有问题请检查', '信息', {
confirmButtonText: '确定',
callback: action => {}
});

83
src/views/lesson/trainingRule/addEdit.vue
View File

@ -11,6 +11,9 @@
<script>
import { postTrainingRulesData, putTrainingRulesData, getPlaceholderList } from '@/api/management/operation';
import { getPublishMapListOnline } from '@/api/jmap/map';
import ConstConfig from '@/scripts/ConstConfig';
import Cookies from 'js-cookie';
import { getTrainingOperateTypeMap } from '@/scripts/ConstDic';
export default {
name: 'TrainingEdit',
@ -102,13 +105,9 @@ export default {
created() {
this.init();
},
// beforeupdate(data) {
// this.$refs.dataform.clearValidate();
// },
methods: {
init() {
// 获取地图列表
// this.$refs.dataform.resetForm();
this.mapIdList = [];
this.productTypesList = [{ value:'01', label:'现地'}, {value:'02', label:'行调'}];
getPublishMapListOnline().then(response => {
@ -122,73 +121,13 @@ export default {
// 获取实训类型
this.trainingTypeList = [];
this.$Dictionary.trainingType().then(list => {
this.trainingTypeList = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
});
});
// 获取实训操作类型
this.trainingOperateTypeMap = {};
this.$Dictionary.stationControl().then(list => {
this.trainingOperateTypeMap['01'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 控制权实训
});
this.$Dictionary.signalOperation().then(list => {
this.trainingOperateTypeMap['02'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 信号机实训
});
this.$Dictionary.switchOperation().then(list => {
this.trainingOperateTypeMap['03'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 道岔实训
});
this.$Dictionary.sectionOperation().then(list => {
this.trainingOperateTypeMap['04'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 区段实训
});
this.$Dictionary.stationStandOperation().then(list => {
this.trainingOperateTypeMap['05'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 站台实训
});
this.$Dictionary.trainPlanOperation().then(list => {
this.trainingOperateTypeMap['06'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 行车计划实训
});
this.$Dictionary.trainOperation().then(list => {
this.trainingOperateTypeMap['07'] = list.map(item => {
const params = {};
params.label = item.name;
params.value = item.code;
return params;
}); // 列车实训
});
const trainingDeviceTypeList = ConstConfig.ConstSelect.trainingDeviceType || {};
for (const val in trainingDeviceTypeList) {
this.trainingTypeList.push({value: val, label: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
}
// 获取实训操作类型
this.trainingOperateTypeMap = getTrainingOperateTypeMap();
},
async show(data) {
this.loading = false;
@ -210,9 +149,6 @@ export default {
};
} else {
this.formModel.mapId = this.$route.query.mapId;
// this.formModel = {
// mapId: this.$route.query.mapId
// };
}
},
repliceName(fieldValue, enumList) {
@ -307,7 +243,6 @@ export default {
productTypes:[]
};
this.$refs.dataform.resetForm();
// this.$refs.dataform.clearValidate();
this.dialogVisible = false;
}
}

2
src/views/login/index.vue
View File

@ -301,7 +301,7 @@ export default {
},
mounted() {
document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
if (!this.syncLogin && !this.project.endsWith('heb') && !this.project.endsWith('ntyl')) {
if (!(!this.syncLogin && this.project.endsWith('heb')) && !this.project.endsWith('ntyl')) {
this.loginRefresh();
}
},

38
src/views/messageBoard/create.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog
title="创建留言板"
:title="title"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose"
@ -10,7 +10,7 @@
<el-input v-model="form.title" style="width: 200px;" />
</el-form-item>
<el-form-item label="归属项目:" prop="project">
<el-select v-model="form.project" placeholder="请选择">
<el-select v-model="form.project" :disabled="update" placeholder="请选择">
<el-option
v-for="item in projectOptionList"
:key="item.value"
@ -22,13 +22,14 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button>
<el-button type="primary" @click="commit">确 定</el-button>
<el-button v-if="!update" type="primary" @click="commit">确 定</el-button>
<el-button v-if="update" type="primary" @click="updateCommit">修 改</el-button>
</span>
</el-dialog>
</template>
<script>
import { createPost } from '@/api/learn';
import { createPost, updatePost } from '@/api/learn';
export default {
name: 'Create',
props:{
@ -42,10 +43,13 @@ export default {
data() {
return {
dialogVisible: false,
postId: '',
form:{
title: '',
project: ''
},
title: '',
update: false,
rules: {
title: [
{ required: true, message: '请填写留言板名称', trigger: 'blur' }
@ -58,11 +62,35 @@ export default {
},
methods: {
handleClose() {
this.form = { title: '', project: '' };
this.$refs.form.resetFields();
this.dialogVisible = false;
},
doShow() {
doShow(data) {
this.dialogVisible = true;
this.postId = '';
this.update = false;
this.title = '创建留言板';
if (data) {
this.update = true;
this.title = '修改留言板';
this.form.title = data.title;
this.form.project = data.project;
this.postId = data.id;
}
},
updateCommit() {
this.$refs['form'].validate((valid) => {
if (valid) {
updatePost(this.postId, this.form).then(resp => {
this.$emit('reloadTable');
this.handleClose();
}).catch(() => {
this.$message.error('修改留言板失败！');
this.handleClose();
});
}
});
},
commit() {
this.$refs['form'].validate((valid) => {

8
src/views/messageBoard/manage.vue
View File

@ -9,6 +9,7 @@
import { queryPostPage } from '@/api/learn';
import { ProjectList} from '@/scripts/ProjectConfig';
import CreateDraft from './create';
export default {
name: 'Manage',
components:{
@ -60,6 +61,10 @@ export default {
{
name: '进入',
handleClick: this.handleEnter
},
{
name: '修改',
handleClick: this.handleUpdate
}
]
}
@ -104,6 +109,9 @@ export default {
}
});
window.open(routeData.href, '_blank', 'noopener noreferrer');
},
handleUpdate(index, row) {
this.$refs.createDraft.doShow(row);
}
}
};

2
src/views/newMap/displayNew/menuDemon.vue
View File

@ -23,7 +23,7 @@
@runPlanLoadShow="runPlanLoadShow"
/>
<div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
<div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'||$route.query.lineCode == '14'}" :style="{bottom: offsetBottom + 'px'}">
<el-button-group class="button-group-box">
<el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
<template v-if="!dataError&&project != 'bjd'">

2
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -26,7 +26,7 @@
<el-button v-if="messageBoard" size="small" @click="messageBoardShow">留言板</el-button>
</el-button-group>
</div>
<div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
<div class="display-draft" :class="{'haerbin_btn_box': lineCode == '07'||lineCode=='14'}" :style="{bottom: offsetBottom + 'px'}">
<el-button-group class="button-group-box">
<el-button type="primary" :loading="backLoading" size="small" @click="back">退出</el-button>
<template v-if="!dataError"> <!-- 地图错误判断 -->

2
src/views/newMap/mapsystemNew/common/index.vue
View File

@ -115,7 +115,7 @@ export default {
this.selected = device;
this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType});
this.$store.dispatch('menuOperation/setLeftClickCount');
if (this.$route.query.lineCode == '07') {
if (this.$route.query.lineCode == '07' || this.$route.query.lineCode == '14') {
this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
}
this.$store.dispatch('training/emitTipFresh');

5
src/views/newMap/newMapdraft/mapoperate/section/index.vue
View File

@ -501,10 +501,7 @@ export default {
model.rightStopPointOffset = model.rightStopPointOffset || model.lengthFact - 5;
}
const changeSectionList = this.handleOtherSectionChange(model);
// let changeStandList = [];
// if (this.editModel.stationCode != this.selected.stationCode) { // 优化
const changeStandList = this.handleRelevanceStand(model);
// }
models = [...changeSectionList, ...changeStandList];
this.$emit('updateMapModel', models);
@ -512,8 +509,10 @@ export default {
this.oldLeftSectionCode = model.leftSectionCode;
this.oldRightSectionCode = model.rightSectionCode;
this.field = '';
this.$emit('deviceSelect', ''); // 清空属性
} else {
this.$message('还有属性未填写，修改未生效！');
this.$emit('deviceSelect', '');
}
});
},

287
src/views/newMap/newMapdraft/mapoperate/switch/create.vue
View File

@ -23,6 +23,8 @@ export default {
methods:{
create() { // 一键生成道岔
const createArr = []; // 创建model列表
// const changeSectionLists = [];
// const changeSectionList = this.changeSectionsAttr(); // 找道岔中心点
const changeSectionList = this.changeSectionAttr(); // 找道岔中心点
changeSectionList.forEach(section => {
if (section['typeModel'] && section['typeModel'] == 'start') { // 右侧关联关系为空 且 道岔区段
@ -35,7 +37,7 @@ export default {
if (this.handleResetPoint(item.points)) {
sectionEnd = item.points[item.points.length - 1];
} else {
sectionEnd = item.points[0];
sectionEnd = item.points.length == 2 ? item.points[0] : item.points[item.points.length - 2];
}
if ((sectionEnd.y == section.points[section.points.length - 1].y) || (sectionEnd.x == section.points[section.points.length - 1].x)) { // 是否水平拿第二个点判断
sectionB = item;
@ -50,13 +52,13 @@ export default {
if (this.handleResetPoint(section.points)) {
intersection = section.points[section.points.length - 1];
} else {
intersection = section.points[0];
intersection = section.points.length == 2 ? section.points[0] : section.points[section.points.length - 2];
}
let skew;
if (this.handleResetPoint(sectionC.points)) {
skew = sectionC.points[sectionC.points.length - 1];
} else {
skew = sectionC.points[0];
skew = sectionC.points.length == 2 ? sectionC.points[0] : sectionC.points[sectionC.points.length - 2];
}
const data = {
code: getUID('W', [...this.switchList, ...createArr]),
@ -91,7 +93,7 @@ export default {
list.forEach(item => {
let sectionStart;
if (this.handleResetPoint(item.points)) {
sectionStart = item.points[0];
sectionStart = item.points.length == 2 ? item.points[0] : item.points[item.points.length - 2];
} else {
sectionStart = item.points[item.points.length - 1];
}
@ -106,13 +108,13 @@ export default {
const switchModel = getModel('Switch');
let intersection;
if (this.handleResetPoint(section.points)) {
intersection = section.points[0];
intersection = section.points.length == 2 ? section.points[0] : section.points[section.points.length - 2];
} else {
intersection = section.points[section.points.length - 1];
}
let skew;
if (this.handleResetPoint(sectionC.points)) {
skew = sectionC.points[0];
skew = sectionC.points.length == 2 ? sectionC.points[0] : sectionC.points[sectionC.points.length - 2];
} else {
skew = sectionC.points[sectionC.points.length - 1];
}
@ -140,6 +142,92 @@ export default {
!swch && createArr.push(model); // 已有的道岔不在创建
}
}
// if (item['typeModel'] == 'start') { // 右侧关联关系为空 且 道岔区段
// const section = item.A;
// const sectionB = item.B;
// const sectionC = item.C;
// if (section.code && sectionB.code && sectionC.code) {
// const uname = 'W' + section.name.replace('T', '');
// const switchModel = getModel('Switch');
// let intersection;
// if (this.handleResetPoint(section.points)) {
// intersection = section.points[section.points.length - 1];
// } else {
// intersection = section.points.length == 2 ? section.points[0] : section.points[section.points.length - 2];
// }
// let skew;
// if (this.handleResetPoint(sectionC.points)) {
// skew = sectionC.points[sectionC.points.length - 1];
// } else {
// skew = sectionC.points.length == 2 ? sectionC.points[0] : sectionC.points[sectionC.points.length - 2];
// }
// const data = {
// code: getUID('W', [...this.switchList, ...createArr]),
// name: uname,
// nameShow: true,
// timeoutShow: true,
// sectionACode: section.code,
// sectionBCode: sectionB.code,
// sectionCCode: sectionC.code,
// turnTime: 3,
// intersection: {
// x: intersection.x,
// y: intersection.y
// },
// skew: {
// x: skew.x,
// y: skew.y
// },
// normalPosition: 1 // 默认状态定位
// };
// const model = Object.assign(switchModel, data);
// const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
// !swch && createArr.push(model); // 已有的道岔不在创建
// }
// }
// if (item['typeModel'] == 'end') { // 左侧关联关系为空 且 道岔区段
// const section = item.A;
// const sectionB = item.B;
// const sectionC = item.C;
// if (section.code && sectionB.code && sectionC.code) {
// const uname = 'W' + section.name.replace('T', '');
// const switchModel = getModel('Switch');
// let intersection;
// if (this.handleResetPoint(section.points)) {
// intersection = section.points.length == 2 ? section.points[0] : section.points[section.points.length - 2];
// } else {
// intersection = section.points[section.points.length - 1];
// }
// let skew;
// if (this.handleResetPoint(sectionC.points)) {
// skew = sectionC.points.length == 2 ? sectionC.points[0] : sectionC.points[sectionC.points.length - 2];
// } else {
// skew = sectionC.points[sectionC.points.length - 1];
// }
// const data = {
// code: getUID('W', [...this.switchList, ...createArr]),
// name: uname,
// nameShow: true,
// timeoutShow: true,
// sectionACode: section.code,
// sectionBCode: sectionB.code,
// sectionCCode: sectionC.code,
// turnTime: 3,
// intersection: {
// x: intersection.x,
// y: intersection.y
// },
// skew: {
// x: skew.x,
// y: skew.y
// },
// normalPosition: 1 // 默认状态定位
// };
// const model = Object.assign(switchModel, data);
// const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
// !swch && createArr.push(model); // 已有的道岔不在创建
// }
// }
}
});
this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
@ -147,6 +235,8 @@ export default {
cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then((res) => {
// console.log(createArr, changeSectionLists);
// debugger;
const modelsList = this.createSwitchSection(createArr, changeSectionList);
modelsList.forEach(item => {
createArr.push(item);
@ -157,6 +247,133 @@ export default {
this.$message( this.$t('tip.cancelGeneration'));
});
},
findArr(arr) {
if (arr[0].slope !== arr[1].slope && arr[0].slope !== arr[2].slope) {
return arr[0];
}
for (var i = 0, len = arr.length; i < len; i++) {
if (arr[i].slope !== arr[0].slope) {
return arr[i];
}
}
},
// 修改区段属性
// changeSectionsAttr() {
// const pointMap = {};
// const ponitMapNew = {};
// this.sectionList.forEach(item=> {
// if (item.type == '01' || item.type == '03') {
// const ponits = item.points;
// const startKey = ponits[0].x + '-' + ponits[0].y;
// const endKey = ponits[ponits.length - 1].x + '-' + ponits[ponits.length - 1].y;
// if (pointMap[startKey]) {
// pointMap[startKey].count++;
// pointMap[startKey].lists.push(item);
// if (pointMap[startKey].count >= 2) { ponitMapNew[startKey] = pointMap[startKey]; }
// } else {
// pointMap[startKey] = {count: 0, lists: [item]};
// }
// if (pointMap[endKey]) {
// pointMap[endKey].count++;
// pointMap[endKey].lists.push(item);
// if (pointMap[endKey].count >= 2) { ponitMapNew[endKey] = pointMap[endKey]; }
// } else {
// pointMap[endKey] = {count: 0, lists: [item]};
// }
// }
// });
// const keys = Object.keys(ponitMapNew);
// const switchSections = [];
// keys.forEach(key => {
// if (ponitMapNew[key].count == 2) {
// const slopeList = [];
// ponitMapNew[key].lists.forEach(sectionModel => {
// let slope = '';
// const points = sectionModel.points;
// const startKey = points[0].x + '-' + points[0].y;
// const endKey = points[points.length - 1].x + '-' + points[points.length - 1].y;
// if (key == startKey) {
// slope = ( points[1].y - points[0].y ) / ( points[1].x - points[0].x );
// }
// if (key == endKey) {
// slope = ( points[points.length - 1].y - points[points.length - 2].y ) / ( points[points.length - 1].x - points[points.length - 2].x );
// }
// slopeList.push({slope: slope, code: sectionModel.code, model: sectionModel});
// });
// const arr = [];
// let A, B;
// const sectionModelC = this.findArr(slopeList);
// slopeList.forEach(ele => {
// if (ele.slope != sectionModelC.slope) {
// arr.push(ele);
// }
// });
// const C = sectionModelC.model;
// const pointsC = C.points;
// arr.forEach(item => {
// const sectionModel = item.model;
// const points = sectionModel.points;
// const startKey = points[0].x + '-' + points[0].y;
// const endKey = points[points.length - 1].x + '-' + points[points.length - 1].y;
// const startKeyC = pointsC[0].x + '-' + pointsC[0].y;
// const endKeyC = pointsC[pointsC.length - 1].x + '-' + pointsC[pointsC.length - 1].y;
// let pointC = null;
// if (key == startKeyC) {
// pointC = JSON.parse(JSON.stringify(pointsC[1]));
// }
// if (key == endKeyC) {
// pointC = JSON.parse(JSON.stringify(pointsC[pointsC.length - 2]));
// }
// let acuteAngle;
// if (key == startKey) {
// acuteAngle = this.handleAngle([points[1], points[0], pointC]);
// }
// if (key == endKey) {
// acuteAngle = this.handleAngle([points[points.length - 2], points[points.length - 1], pointC]);
// }
// if (acuteAngle) {
// B = item.model;
// } else {
// A = item.model;
// }
// });
// let typeModel;
// if (key == A.points[A.points.length - 1].x + '-' + A.points[A.points.length - 1].y) {
// A.rightSectionCode = '';
// A.sepTypeRight = '00'; // 分隔符
// B.leftSectionCode = '';
// B.sepTypeLeft = '00';
// C.leftSectionCode = '';
// C.sepTypeLeft = '00';
// typeModel = 'start';
// }
// if (key == A.points[0].x + '-' + A.points[0].y) {
// A.leftSectionCode = '';
// A.sepTypeLeft = '00'; // 分隔符
// B.rightSectionCode = '';
// B.sepTypeRight = '00';
// C.rightSectionCode = '';
// C.sepTypeRight = '00';
// typeModel = 'end';
// }
// A.type = '03';
// B.type = '03';
// C.type = '03';
// switchSections.push({A: A, B: B, C: C, typeModel: typeModel });
// }
// });
// console.log(switchSections);
// return switchSections;
// },
// handleAngle(points) {
// const A = points[0];
// const B = points[1];
// const C = points[2];
// var AB = Math.sqrt(Math.pow(A.x - B.x, 2) + Math.pow(A.y - B.y, 2));
// var AC = Math.sqrt(Math.pow(A.x - C.x, 2) + Math.pow(A.y - C.y, 2));
// var BC = Math.sqrt(Math.pow(B.x - C.x, 2) + Math.pow(B.y - C.y, 2));
// return Math.pow(AB, 2) + Math.pow(BC, 2) > Math.pow(AC, 2);
// },
findSectionA(pointX, pointY, lists, code) {
const list = [];
lists.forEach(item => {
@ -208,19 +425,19 @@ export default {
},
// 重置坐标点
handleResetPoint(points) {
return (points[points.length - 1].x >= points[0].x) && (points[points.length - 1].y >= points[0].y);
return points[points.length - 1].x >= points[points.length - 2].x;
},
// 修改区段属性
changeSectionAttr() {
const changeSectionList = []; // 改变的区段列表
this.sectionList.forEach(section => {
if (section.type == '01') {
if (section.type == '01' || section.type == '03') {
const oneSection = section.points[section.points.length - 1];
const oneSectionStar = section.points[0];
let countA = 0;
let countB = 0;
this.sectionList.forEach(elem => {
if (elem.type == '01' && section.code != elem.code) {
if ((elem.type == '01' || section.type == '03') && section.code != elem.code) {
let twoSection, twoSectionEnd;
if (this.handleResetPoint(elem.points)) {
twoSection = elem.points[0];
@ -276,34 +493,34 @@ export default {
});
return changeSectionList;
},
checkAddListA(points, code) { // 判断是否添加list (暂时不用)
let flag = false;
this.sectionList.forEach(section => {
section.points.forEach((point, index) => {
if (index > 0 && section.code != code) {
if (point.x == points.x && point.y == points.y) {
flag = true;
}
}
});
// checkAddListA(points, code) { // 判断是否添加list (暂时不用)
// let flag = false;
// this.sectionList.forEach(section => {
// section.points.forEach((point, index) => {
// if (index > 0 && section.code != code) {
// if (point.x == points.x && point.y == points.y) {
// flag = true;
// }
// }
// });
});
return flag;
},
checkAddListB(points, code) { // 判断是否添加list (暂时不用)
let flag = false;
this.sectionList.forEach(section => {
section.points.forEach((point, index) => {
if (index == 0 && section.code != code) {
if (point.x == points.x && point.y == points.y) {
flag = true;
}
}
});
// });
// return flag;
// },
// checkAddListB(points, code) { // 判断是否添加list (暂时不用)
// let flag = false;
// this.sectionList.forEach(section => {
// section.points.forEach((point, index) => {
// if (index == 0 && section.code != code) {
// if (point.x == points.x && point.y == points.y) {
// flag = true;
// }
// }
// });
});
return flag;
},
// });
// return flag;
// },
// 一键生成道岔计轴区段
createSwitchSection(list, sectionLists) {
const models = [];

6
src/views/planMonitor/detail.vue
View File

@ -250,7 +250,11 @@ export default {
}).then(() => {
if (this.hasRelease) {
publishRunPlan(row.id, {runPlanName: name}).then(resp => {
this.$message.success(this.$t('tip.publishRunPlanSuccess'));
if (resp.data.length <= 0) {
this.$message.success(this.$t('tip.publishRunPlanSuccess'));
} else {
this.$messageBox(`${this.$t('tip.publishRunPlanFail')}: ${resp.data[0]}`);
}
this.refresh();
}).catch(() => {
this.$messageBox(this.$t('tip.publishRunPlanFail'));

6
src/views/planMonitor/editTool/menuBar.vue
View File

@ -612,7 +612,11 @@ export default {
type: 'warning'
}).then(() => {
publishRunPlan(param.planId, {runPlanName: param.planName}).then(resp => {
this.$message.success(this.$t('tip.publishRunPlanSuccess'));
if (resp.data.length <= 0) {
this.$message.success(this.$t('tip.publishRunPlanSuccess'));
} else {
this.$messageBox(`${this.$t('tip.publishRunPlanFail')}: ${resp.data[0]}`);
}
}).catch(() => {
this.$messageBox(this.$t('tip.publishRunPlanFail'));
});

13
src/views/planMonitor/editTool/routingoperate/routeConfig.vue
View File

@ -11,7 +11,7 @@
<el-input v-model="addModel.name" />
</el-form-item>
<el-form-item :label="$t('map.startStationCodeColon')" prop="startStationCode">
<el-select v-model="addModel.startStationCode" clearable :filterable="true" @change="changeStartStation">
<el-select v-model="addModel.startStationCode" clearable :filterable="true" disabled @change="changeStartStation">
<el-option
v-for="item in filterStationList"
:key="item.code"
@ -19,10 +19,10 @@
:value="item.code"
/>
</el-select>
<el-button
<!-- <el-button
:type=" field === 'startStationCode' ? 'danger' : 'primary'"
@click="hover('startStationCode')"
>{{ $t('map.activate') }}</el-button>
>{{ $t('map.activate') }}</el-button> -->
</el-form-item>
<el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode">
<el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow" @change="changeStartSection">
@ -40,7 +40,8 @@
>{{ $t('map.activate') }}</el-button>
</el-form-item>
<el-form-item :label="$t('map.endStationColon')" prop="endStationCode">
<el-select v-model="addModel.endStationCode" clearable :filterable="true" :disabled="!isStartSelected" @change="changeEndStation">
<!-- :disabled="!isStartSelected" -->
<el-select v-model="addModel.endStationCode" clearable :filterable="true" disabled @change="changeEndStation">
<el-option
v-for="item in filterStationList"
:key="item.code"
@ -48,11 +49,11 @@
:value="item.code"
/>
</el-select>
<el-button
<!-- <el-button
:disabled="!isStartSelected"
:type=" field === 'endStationCode' ? 'danger' : 'primary'"
@click="hover('endStationCode')"
>{{ $t('map.activate') }}</el-button>
>{{ $t('map.activate') }}</el-button> -->
</el-form-item>
<el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode">
<el-select v-model="addModel.endSectionCode" clearable :filterable="true" :disabled="editShow || !isStartSelected" @change="changeEndSection">

1
src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
View File

@ -111,7 +111,6 @@ export default {
SDTNumber: `${this.model.serviceNumber}${tripNumber}`
};
getRoutingBySDTNumber(model).then(resp => {
debugger;
const taskObj = {
id:index + 1,
tripNumber: tripNumber,

3
src/views/system/systemGenerate/index.vue
View File

@ -93,8 +93,7 @@ export default {
{
name: this.$t('systemGenerate.deleteData'),
handleClick: this.deleteData,
type: 'danger',
showControl: (row) => { return Boolean(row.customized); }
type: 'danger'
}
]
}