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

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

Browse Source
This commit is contained in:
joylink_fanyuhong 2020-02-28 16:47:35 +08:00
commit d73f084fd5
17 changed files with 228 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,6 +132,9 @@ class SkinCode extends defaultStyle {
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#7F7F7F', // 尽头分隔符颜色
color: '#7F7F7F' // 区段边界符颜色
},
block: {
special: false, // 区段特殊显示
}
};

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

@ -132,6 +132,9 @@ class SkinCode extends defaultStyle {
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: 'white' // 区段边界符颜色
},
block: {
special: false, // 区段特殊显示
}
};

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

@ -135,6 +135,9 @@ class SkinCode extends defaultStyle {
},
shuttleBack: { // 折返进路 (存在此对象 显示折返箭头)
distance: 5 // 限速线距离区段距离
},
block: {
special: false, // 区段特殊显示
}
};

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

@ -125,6 +125,9 @@ class SkinCode extends defaultStyle {
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3' // 区段边界符颜色
},
block: {
special: false, // 区段特殊显示
}
};

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

@ -90,17 +90,17 @@ class SkinCode extends defaultStyle {
width: 5, // 区段宽度
beyondWidth: 1, // 区段宽超出宽度
invadeColor: '#EF0C08', // 区段侵入颜色
spareColor: '#3F3F3F', // 区段空闲颜色
communicationOccupiedColor: '#FF329A', // 区段通信车占用颜色
unCommunicationOccupiedColor: '#FE0000', // 区段非通讯车占用颜色
routeLockColor: '#FFFFFF', // 区段路由锁定颜色
spareColor: '#ffff00', // 区段空闲颜色 (黄色)
communicationOccupiedColor: '#ff0000', // 区段通信车占用颜色 红色
unCommunicationOccupiedColor: '#ff0000', // 区段非通讯车占用颜色 红色
routeLockColor: '#00FF00', // 区段路由锁定颜色
faultLockColor: '#9B4A0A', // 区段故障锁定颜色
undefinedColor: '#0071C1', // 区段未定义颜色
protectionLockedColor: '#FEFF00', // 保护区段锁闭(未用)
blockColor: '#800080', // 区段封锁颜色
blockColor: '#000080', // 区段封锁颜色 深蓝色
atcExcisionColor: '#A0522D', // 区段atc切除颜色
atsExcisionColor: '#A0522D', // 区段ats切除颜色
timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
timeReleaseColor: '#ffff00', // 区段延时释放颜色
protectiveLockColor: '#FFFF00', // 区段保护锁闭
protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
@ -125,6 +125,9 @@ class SkinCode extends defaultStyle {
endWidth: 3.5, // 尽头分隔符宽度
endColor: '#3F3F3F', // 尽头分隔符颜色
color: '#3149C3' // 区段边界符颜色
},
block: {
special: true, // 区段特殊显示
}
};
@ -333,13 +336,13 @@ class SkinCode extends defaultStyle {
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
offset: { x: 0, y: 8 }, // 道岔名称与区段距离
fontSize: 11, // 字体大小
fontColor: '#C0C0C0', // 道岔名称颜色
fontColor: '#fff', // 道岔名称颜色
fontWeight: 'bold', // 字体粗细
borderColor: '#FE0000', // 道岔边框颜色
borderColor: 'red', // 道岔边框颜色
lossColor: '#FFFFFF', // 道岔失去颜色
locateColor: '#00FF00', // 道岔定位颜色
inversionColor: '#9C9D09', // 道岔反位颜色
monolockColor: '#870E10' // 道岔单锁颜色
locateColor: '#fff', // 道岔定位颜色
inversionColor: '#fff', // 道岔反位颜色
monolockColor: '#fff' // 道岔单锁颜色
},
core: {
splice: true, // 哈尔滨特殊显示
@ -347,13 +350,18 @@ class SkinCode extends defaultStyle {
},
block: { // 道岔封锁配置
blockName: 'default', // 默认道岔封锁类型
nameBorderShow: true, // 道岔名称是否有包围框 显示
contentRectShow: false // 道岔封锁显示
nameBorderShow: false, // 道岔名称是否有包围框 显示
contentRectShow: false, // 道岔封锁显示
contentRectColor: '#fff', // 道岔封锁名称颜色
rhomboidShow: true, // 道岔单独显示
},
monolock: { // 道岔单锁配置
locationColor: '#ea282c', // 道岔单锁定位颜色 (红色)
inversionColor: '#ea282c', // 道岔单锁反位颜色 (红色)
rectShow: false // 道岔单锁 矩形框是否显示
locationColor: '#fff', // 道岔单锁定位颜色 (红色)
inversionColor: '#fff', // 道岔单锁反位颜色 (红色)
nameBorderShow: true, // 道岔名称是否有包围框 显示
rectShow: false, // 道岔单锁 矩形框是否显示
rectWidth: 18, // 矩形框 宽高
rectBorderColor: 'red' // 矩形边框颜色
}
};

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

@ -132,6 +132,9 @@ class SkinCode extends defaultStyle {
endWidth: 1.5, // 尽头分隔符宽度
endColor: '#FFFFFF', // 尽头分隔符颜色
color: 'white' // 区段边界符颜色
},
block: {
special: false, // 区段特殊显示
}
};

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

@ -28,7 +28,7 @@ class Status {
}
handleSection(device) {
this.statusObj = {
blockade: device.blockade, // 是否封锁
blockade: device.blockade, // 轨道是否封锁
routeLock: device.routeLock, // 是否进路锁闭
overlapLock: device.overlapLock, // 进路延续保护锁闭
ctOccupied: device.ctOccupied, // 通信车占用

18
src/jmapNew/shape/Section/ELines.js
View File

@ -26,8 +26,7 @@ export default class ELines extends Group {
shape[`y1`] = model.points[0].y;
shape[`x2`] = model.points[model.points.length - 1].x;
shape[`y2`] = model.points[model.points.length - 1].y;
this.add(new BezierCurve({
this.section = new BezierCurve({
isLine: true,
zlevel: this.zlevel,
progressive: model.progressive,
@ -39,7 +38,8 @@ export default class ELines extends Group {
stroke: model.style.Section.line.spareColor,
fillOpacity: 0
}
}));
});
this.add(this.section);
} else {
for (let i = 0; i < (model.points.length - 1); i++) {
this.add(new Line({
@ -71,6 +71,18 @@ export default class ELines extends Group {
});
}
hide() {
this.eachChild((child) => {
child.hide();
});
}
show() {
this.eachChild((child) => {
// console.log(child);
child.show();
});
}
animateStyle(loop, animates) {
if (animates && animates.length) {
this.eachChild((child) => {

114
src/jmapNew/shape/Section/EblockLines.js Normal file
View File

@ -0,0 +1,114 @@
import Group from 'zrender/src/container/Group';
import Line from 'zrender/src/graphic/shape/Line';
import BezierCurve from 'zrender/src/graphic/shape/BezierCurve';
/** 创建区段线集合*/
export default class ELines extends Group {
constructor(model) {
super();
this.model = model;
this.zlevel = model.zlevel;
this.z = model.z;
this.create(model);
}
create(model) {
/** 创建区段*/
if (model && model.points.length > 1) {
if (model.isCurve) { // 曲线 用贝塞尔曲线绘图
const shape = {};
for (let i = 1; i < (model.points.length - 1); i++) {
shape[`cpx${i}`] = model.points[i].x;
shape[`cpy${i}`] = model.points[i].y;
}
shape[`x1`] = model.points[0].x;
shape[`y1`] = model.points[0].y;
shape[`x2`] = model.points[model.points.length - 1].x;
shape[`y2`] = model.points[model.points.length - 1].y;
this.section = new BezierCurve({
isLine: true,
zlevel: this.zlevel,
progressive: model.progressive,
z: this.z + 1,
culling: true,
shape: shape,
style: {
lineWidth: model.style.Section.line.width,
stroke: model.style.Section.line.spareColor,
fillOpacity: 0
}
});
this.add(this.section);
} else {
for (let i = 0; i < (model.points.length - 1); i++) {
this.add(new Line({
isLine: true,
zlevel: this.zlevel,
progressive: model.progressive,
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.style.Section.line.width,
stroke: model.style.Section.line.spareColor
}
}));
}
}
}
}
setStyle(styles) {
this.eachChild((child) => {
if (child.setStyle && child.isLine) {
child.setStyle(styles);
}
});
}
hide() {
this.eachChild((child) => {
child.hide();
});
}
show() {
this.eachChild((child) => {
// console.log(child);
child.show();
});
}
animateStyle(loop, animates) {
if (animates && animates.length) {
this.eachChild((child) => {
if (child.animateStyle && child.isLine) {
let an = child.animateStyle(loop);
animates.forEach(elem => {
an = an.when(elem.time, elem.styles);
});
an.start();
}
});
}
}
stopAnimation(flag) {
this.eachChild((child) => {
if (child.stopAnimation && child.isLine) {
child.stopAnimation(flag);
}
});
}
setBorderVisible(isVisible) {
this.lineBorder && this.lineBorder.hide();
if (isVisible) {
this.lineBorder && this.lineBorder.show();
}
}
}

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

@ -3,6 +3,7 @@ import ETextName from '../element/ETextName'; // 名称文字 (共有)
import ERelease from './ERelease'; // 线段 (共有)
import ELimitLines from './ELimitLines'; // 区段限速 (私有)
import ELines from './ELines'; // 创建多线条 曲线 (私有)
import EblockLines from './EblockLines'; // 区段封锁特有
import ESeparator from './ESeparator'; // 分隔符 (私有)
import EMouse from './EMouse';
import { EAxle } from './EAxle'; // 创建计轴 (私有)
@ -73,8 +74,18 @@ export default class Section extends Group {
points: model.points,
style: style
});
// 创建哈尔滨特殊区段（用作封锁显示）
this.sectionBlock = new EblockLines({
zlevel: this.zlevel,
z: this.z,
isSwitchSection: model.switchSection,
isCurve: model.curve,
points: model.points,
style: style
});
this.add(this.section);
this.add(this.sectionBlock);
}
// 折返箭头
@ -563,6 +574,7 @@ export default class Section extends Group {
recover() {
if (this.section) {
this.section.stopAnimation(true);
this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段
this.section.setStyle({
fill: this.style.backgroundColor,
stroke: this.style.Section.line.spareColor,
@ -631,8 +643,10 @@ export default class Section extends Group {
/** 封锁 06*/
block() {
if (this.section) {
this.section.setStyle({
if (this.style.Section.block.special) {
this.sectionBlock && this.sectionBlock.show();
} else {
this.section && this.section.setStyle({
stroke: this.style.Section.line.blockColor,
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
@ -761,29 +775,20 @@ export default class Section extends Group {
setState(model) {
this.recover();
/** 道岔保护区段锁闭 */
if (model.overlapLock) {
this.protectiveLock();
}
model.overlapLock && this.protectiveLock();
/** 空闲锁闭或者叫进路锁闭 */
if (model.routeLock) {
this.routeLock();
}
model.routeLock && this.routeLock();
/** 轨道封锁 */
// model.blockade = 1;
model.blockade && this.block();
/** 非CBTC车占用 */
if (model.nctOccupied) {
this.unCommunicationOccupied();
}
model.nctOccupied && this.unCommunicationOccupied();
/** CBTC车占用 */
if (model.ctOccupied) {
this.communicationOccupied();
}
model.ctOccupied && this.communicationOccupied();
/** 区段切除*/
if (model.cutOff) {
this.sectionCutOff();
}
model.cutOff && this.sectionCutOff();
/** 是否限速*/
if (model.speedUpLimit > 0) {
this.setSpeedUpperLimit();
}
model.speedUpLimit && this.setSpeedUpperLimit();
/** 道岔区段更新岔心颜色 */
if (model.type === '03' && model.switch) {
const sectionSwitch = store.getters['map/getDeviceByCode'](model.switch.code);

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

@ -32,6 +32,9 @@ class ESwName extends Group {
const rect = this.nameText.getBoundingRect();
let textWidth = rect.width * 0.8;
if (style.Switch.monolock.nameBorderShow) {
textWidth = rect.width * 0.8 + 8;
}
if (model.triangle.drictx !== 1) {
rect.x += rect.width;
textWidth = -textWidth;
@ -49,7 +52,6 @@ class ESwName extends Group {
},
style: {
lineWidth: 0,
// lineDash: [3, 3],
stroke: style.Switch.text.borderColor,
fill: style.transparentColor
}

2
src/jmapNew/shape/Switch/ETriangle.js
View File

@ -19,9 +19,9 @@ class ETriangle extends Group {
},
style: {
fill: style.Section.line.spareColor,
// fill: 'green',
lineWidth: 0,
stroke: style.Section.line.spareColor
// fill: 'green'
},
cursor: model.cursor,
onmouseover: model.onmouseover,

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

@ -123,9 +123,13 @@ export default class Switch extends Group {
onmouseout: () => { this.name.getArrowText().hide(); }
});
let spointLength1 = 8;
const Tspoint1 = [model.intersection.x + directx * width3 + directx * (width2 + width1) - directx * width3, model.intersection.y + directy * switchWidth1];
const Tspoint2 = [Tspoint1[0] - directx * 8, Tspoint1[1]];
const Tspoint3 = [Tspoint1[0] - directx * 8, model.intersection.y - directy * switchWidth1];
if (this.style.Switch.block.rhomboidShow) {
spointLength1 = 16
}
const Tspoint2 = [Tspoint1[0] - directx * spointLength1, Tspoint1[1]];
const Tspoint3 = [Tspoint1[0] - directx * spointLength1, model.intersection.y - directy * switchWidth1];
const Tspoint4 = [model.intersection.x + directx * width3, Tspoint3[1]];
const Tspoint5 = [Tspoint1[0], Tspoint1[1]];
this.sheltertriangle = new ETriangle({ // 平行四边形覆盖范围 内侧三角形覆盖物 (用于宁波线路'挤岔' 专用)其他线路不能使用
@ -322,6 +326,9 @@ export default class Switch extends Group {
if (this.style.Switch.monolock.rectShow) { // 判断单锁矩形是否显示
this.lockRect.show();
}
if (this.style.Switch.monolock.nameBorderShow) { // 单锁显示名称包围框
this.setHasTextBorder(1);
}
if (this.model.normalPosition) {
this.setTextColor(this.style.Switch.monolock.locationColor); // 定位 设置道岔名称颜色
} else if (this.model.reversePosition) {
@ -336,6 +343,9 @@ export default class Switch extends Group {
} else if (this.style.Switch.block.contentRectShow) {
this.lockRect.show();
this.lockRect.setStyle({ stroke: this.style.Switch.block.contentRectColor });
} else if (this.style.Switch.block.rhomboidShow && this.model.reversePosition) { // 范围且封锁时显示
this.sheltertriangle.show();
this.sheltertriangle.getSection().setStyle('fill', '#000080');
}
}
@ -409,7 +419,7 @@ export default class Switch extends Group {
}
/** 道岔单锁 */
model.singleLock && this.setMonolock();
/** 道岔锁闭 */
/** 道岔封锁 */
model.blockade && this.block();
/** 区段切除*/
model.cutOff && this.setSwitchCutOff();

3
src/jmapNew/theme/beijing_01/menus/dialog/routeDetail.vue
View File

@ -25,8 +25,7 @@
</el-table-column>
<el-table-column prop="status" label="控制状态" width="180">
<template slot-scope="scope">
<span v-if="scope.row.controlType == '01'">自动（不进行冲突检测）</span>
<span v-else>人工</span>
{{ scope.row.atsControl == '0' ? '人工' : '自动' }}
</template>
</el-table-column>
</el-table>

10
src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
View File

@ -56,7 +56,7 @@
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }}
{{ scope.row.atsControl == '0' ? '人工' : '自动' }}
</div>
</template>
</el-table-column>
@ -94,10 +94,10 @@ export default {
tempData: [],
stationName: '',
signalName: '',
controlTypeMap: {
'01': '自动',
'02': '人工'
}
// controlTypeMap: {
// '01': '自动',
// '02': '人工'
// }
};
},
computed: {

38
src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
View File

@ -39,7 +39,7 @@
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }}
{{ scope.row.atsControl == '0' ? '人工' : '自动' }}
</div>
</template>
</el-table-column>
@ -87,13 +87,9 @@ export default {
selection: [],
stationName: '',
signalName: '',
allSelect: false,
highlight: true,
row: '',
controlTypeMap: {
'01': '自动',
'02': '人工'
}
commitDisabled: true
};
},
computed: {
@ -125,14 +121,6 @@ export default {
return '进路交自动控';
}
return '';
},
commitDisabled() {
let disabled = true;
if (this.selection && this.selection.length) {
disabled = false;
}
return disabled;
}
},
mounted() {
@ -143,6 +131,8 @@ export default {
methods: {
doShow(operate, selected, tempData) {
this.selected = selected;
this.selection = [];
this.commitDisabled = true;
// 如果不是断点激活，而是第一次显示则初始化
if (!this.dialogShow) {
this.signalName = '';
@ -160,10 +150,10 @@ export default {
elem.disabled = false;
// 设置禁用状态
if (operate.operation === OperationEvent.Signal.humanControl.menu.operation &&
elem.atsControl == '0') {
(elem.atsControl == '0') ) {
elem.disabled = true;
} if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
elem.atsControl == '1') {
(elem.atsControl == '1') ) {
elem.disabled = true;
}
});
@ -200,27 +190,13 @@ export default {
this.$refs.tempTable.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
allSelectChange() {
if (this.allSelect) {
this.tempData.forEach(item => {
if (!item.disabled) {
item.check = true;
}
});
} else {
this.tempData.forEach(item => {
if (!item.disabled) {
item.check = false;
}
});
}
},
clickEvent(row, event, column) {
this.highlight = false;
if (row && !row.disabled) {
this.highlight = true;
this.selection = [row];
this.commitDisabled = false;
this.beforeSectionList = row.containSectionList || [];
this.row = row;
// 设置选中指令

16
src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
View File

@ -57,7 +57,7 @@
<el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
<template slot-scope="scope">
<div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
{{ scope.row.controlType ? controlTypeMap[scope.row.controlType] : '自动' }}
{{ scope.row.atsControl == '0' ? '人工' : '自动' }}
</div>
</template>
</el-table-column>
@ -110,12 +110,9 @@ export default {
display: true,
stationName: '',
signalName: '',
commitDisabled:true,
tableStyle: {
'border-bottom': 'none'
},
controlTypeMap: {
'01': '自动',
'02': '人工'
}
};
},
@ -135,13 +132,6 @@ export default {
title() {
return '办理进路';
},
commitDisabled() {
let disabled = true;
if (this.row) {
disabled = !this.row.canSetting;
}
return disabled;
},
...mapGetters('map', [
'signalList',
'sectionList',
@ -189,6 +179,7 @@ export default {
},
doShow(operate, selected, tempData) {
this.selected = selected;
this.commitDisabled = true;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
if (!this.dialogShow) {
this.signalName = '';
@ -232,6 +223,7 @@ export default {
// 恢复进路区段的切除状态
this.restoreBeforeDevices();
row.canSetting = true;
this.commitDisabled = false;
// 设置选中区段为切除状态
const containSectionList = [];
if (row.routeSectionList && row.routeSectionList.length) {