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_cuiweidong 2020-03-24 16:40:37 +08:00
commit fabd5f1025
14 changed files with 151 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,9 @@ class SkinCode extends defaultStyle {
},
lamp: {
radiusR: 6, // 控制灯大小
controlColor: '#00FF00' // 控制灯颜色
controlColor: '#00FF00', // 控制灯颜色
offColor: '#000',
strokeColor: '#fff'
}
};
this[deviceType.Maintain] = {
@ -431,6 +433,31 @@ class SkinCode extends defaultStyle {
}
};
this[deviceType.AtsControl] = {
displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
text: {
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
distance: 5 // 灯跟文字距离
},
lamp: {
radiusR: 6, // 控制灯大小
controlColor: '#00FF00', // 控制灯颜色
offColor: '#FF0000'
}
};
this[deviceType.MaintenanceLamps] = {
displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
text: {
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
distance: 5 // 灯跟文字距离
},
lamp: {
radiusR: 6, // 控制灯大小
controlColor: '#b5b3b3' // 控制灯颜色
}
};
this[deviceType.ZcCommunication] = {
displayCondition: '03', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
text: {
fontSize: 11, // 字体大小
@ -451,7 +478,8 @@ class SkinCode extends defaultStyle {
},
lamp: {
radiusR: 6, // 控制灯大小
controlColor: '#00FF00' // 控制灯颜色
controlColor: '#00FF00', // 控制灯颜色
offColor: '#ff0000'
}
};
this[deviceType.IntersiteControl] = {
@ -499,7 +527,8 @@ class SkinCode extends defaultStyle {
},
lamp: {
radiusR: 6, // 控制灯大小
controlColor: '#00FF00' // 控制灯颜色
controlColor: '#00FF00', // 控制灯颜色
offColor: '#ff0000'
}
};
this[deviceType.ZcControl] = {

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

@ -144,7 +144,7 @@ class SkinCode extends defaultStyle {
},
lamp: {
bgShow: false, // 是否被选中
guidName: 'defult', // 默认引导类型
guidName: 'ningbo_01', // 默认引导类型
stopWidth: 2, // 禁止线宽度
borderWidth: 1, // 信号灯边框线宽度
borderColor: '#3149C3', // 信号灯边框线颜色
@ -158,19 +158,21 @@ class SkinCode extends defaultStyle {
blueColor: '#0070C0' // 信号灯蓝色
},
route: {
direction: false, // 自动进路方向
offset: { x: -4, y: 0 }, // 自动进路偏移量
routeColor: '#00FF00' // 自动进路
direction: false, // 自动通过方向
radiusR: 8, // 自动通过三角半径
offset: { x: 2, y: 0 }, // 自动通过偏移量
routeColor: '#00FF00' // 自动进路
},
auto: {
signalFrontTriangle: false, // 信号灯前三角展示
direction: false, // 自动通过方向
offset: { x: -4, y: 0}, // 自动通过偏移量
width: 5, // 自动宽度
autoRoute: '#00FF00', // 自动进路
autoTrigger: '#FFFF00', // 自动触发
manualControl: '#FFFF00', // 人工控制
outConflict: '#C00808' // 出车冲突
auto: { // 人工进路显示状态
signalFrontTriangle: true, // 信号灯前三角展示
fleetModeTriangle: false, // 自动进路显示三角形非箭头
direction: false, // 自动通过方向
offset: { x: -4, y: 0 }, // 自动通过偏移量
width: 5, // 自动宽度
manualControl: '#FFFF00', // 人工控制
autoRoute: '#00FF00', // 自动进路 (绿色)
autoTrigger: '#FFFF00', // 自动触发
outConflict: '#C00808' // 出车冲突
},
delay: {
direction: true, // 延时解锁方向
@ -193,6 +195,7 @@ class SkinCode extends defaultStyle {
this[deviceType.StationStand] = {
common: { // 通用属性
textFontSize: 11, // 站台默认字体大小
haveJumpShow: true, // 站台是否有列车停跳显示
functionButtonShow: '03' // 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
},
safetyDoor: { // 屏蔽门
@ -207,11 +210,12 @@ class SkinCode extends defaultStyle {
spareColor: '#606060', // 站台空闲颜色
stopColor: '#FEFE00', // 站台列车停站颜色
jumpStopColor: '#9A99FF', // 站台跳停颜色
designatedJumpStopColor: 'lightSkyBlue' // 站台指定列车跳停颜色
designatedJumpStopColor: '#606060' // 站台指定列车跳停颜色
},
standEmergent: { // 紧急关闭
mergentR: 4, // 站台紧急关闭半径
offset: {x: 0, y: 40}, // 站台紧急关闭偏移量
position: -1,
offset: {x: -6, y: -15}, // 站台紧急关闭偏移量
closeColor: '#F61107' // 站台紧急关闭颜色
},
reentry: { // 站台折返策略
@ -223,20 +227,30 @@ class SkinCode extends defaultStyle {
detainCar: { // 扣车
text: 'H', // 扣车显示内容
position: -1, // 扣车方向
offset: {x: -8, y: -6}, // 扣车偏移量
offset: {x: -8, y: 13}, // 扣车偏移量
trainColor: '#E4EF50', // 车站扣车颜色
centerTrainColor: '#FFFFFF', // 中心扣车颜色
andCenterTrainColor: '#F61107', // 车站+中心扣车颜色
detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色
},
stopTime: { // 停站时间
position: 1, // 运行时间方向
offset: {x: -8, y: 26}, // 运行时间偏移量
textColor: '#FFFFFF' // 停站时间字体颜色
stopTime: { // 停站时间
position: 1, // 运行时间方向
offset: {x: -8, y: -4}, // 运行时间偏移量
textColor: '#C0C0C0', // 停站时间字体颜色
textFontSize: 12
},
jump: {
text: 'S', // 停跳显示内容
position: -1, // 停跳方向
offset: {x: -8, y: 10},
textColor: '#5376B3', // 停跳文字颜色
arcColor: '#000000', // 停跳圆圈颜色
fillColor: 'rgba(0,0,0,0)', // 透明填充颜色
r: 8 // 圆半径大小
},
level: { // 运行等级
position: 1, // 运行等级方向
offset: {x: -8, y: 6}, // 运行等级偏移量
offset: {x: -8, y: -6}, // 运行等级偏移量
textColor: '#FFFFFF' // 停站等级字体颜色
},
text: {

10
src/jmapNew/constant/deviceRender.js
View File

@ -190,5 +190,15 @@ deviceRender[deviceType.NoOneReturn] = {
_type: deviceType.NoOneReturn,
zlevel: 1
};
/** MaintenanceLamps 全站维修点灯 */
deviceRender[deviceType.MaintenanceLamps] = {
_type: deviceType.MaintenanceLamps,
zlevel: 1
};
/** ZcCommunication Zc通信表示灯 */
deviceRender[deviceType.ZcCommunication] = {
_type: deviceType.ZcCommunication,
zlevel: 1
};
export default deviceRender;

4
src/jmapNew/constant/deviceType.js
View File

@ -31,7 +31,9 @@ const deviceType = {
LocalControl: 'LocalControl',
Maintain: 'Maintain',
PowerSupply: 'PowerSupply',
NoOneReturn: 'NoOneReturn'
NoOneReturn: 'NoOneReturn',
MaintenanceLamps: 'MaintenanceLamps',
ZcCommunication: 'ZcCommunication'
};
export default deviceType;

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

@ -162,6 +162,12 @@ class Status {
handleNoOneReturn(device) {
this.statusObj = {};
}
handleMaintenanceLamps(device) {
this.statusObj = {};
}
handleZcCommunication(device) {
this.statusObj = {};
}
getStatus() {
return this.statusObj;
}

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

@ -2,8 +2,9 @@ import Group from 'zrender/src/container/Group';
import EControl from '../element/EControl';
import EMouse from './EMouse';
import {isShowThePrdType} from '../../utils/handlePath';
import deviceType from '../../constant/deviceType';
export default class AtsControl extends Group {
export default class SaidLamp extends Group {
constructor(model, style) {
super();
this.z = 20;
@ -60,6 +61,12 @@ export default class AtsControl extends Group {
// 设置状态
setState(model) {
if (!this.isShowShape) return;
if (model._type === deviceType.PowerSupply && model.name.includes('2')) {
this.control.setControlColor(this.deviceStyle.lamp.offColor);
this.control.setControlStroke(this.deviceStyle.lamp.strokeColor, 1);
} else if ((model._type === deviceType.AtsControl || model._type === deviceType.LocalControl || model._type === deviceType.ChainControl) && model.name.includes('B')) {
this.control.setControlColor(this.deviceStyle.lamp.offColor);
}
}
createMouseEvent() {

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

@ -391,11 +391,11 @@ class Signal extends Group {
/** 信号机进路按钮显示 */
model.isRouteSignal && this.setLowButtonShow();
/** 信号机封锁 */
/** 信号机封锁 */ // 缺一个功能封锁
model.blockade && this.block();
/** 设置灯的颜色 */
// model.redOpen = 1;
// model.yellowOpen = 0;
// model.yellowOpen = 1;
// model.greenOpen = 0;
model.redOpen && model.yellowOpen && !model.greenOpen && this.guid(); // 引导信号显示
model.redOpen && !model.yellowOpen && !model.greenOpen && this.close(); // 信号关闭

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

@ -26,7 +26,7 @@ class ELevel extends Group {
text: model.name,
textFill: style.StationStand.level.textColor,
textAlign: 'center',
textVerticalAlign: 'middle'
textVerticalAlign: 'middle'
}
});

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

@ -61,7 +61,11 @@ class StationStand extends Group {
/** 站台紧急关闭*/
const emergentH = model.inside ? model.right ? 1 : -1 : model.right ? -1 : 1;
let emergentX = model.position.x + style.StationStand.standEmergent.offset.x;
let emergentWidth = 0;
if (style.StationStand.stopTime.position) {
emergentWidth = model.width / 2;
}
let emergentX = model.position.x + (style.StationStand.stopTime.position || emergentH) * style.StationStand.standEmergent.offset.x - emergentWidth;
let emergentY = model.position.y + emergentH * (model.height / 2 + style.StationStand.standEmergent.offset.y);
if (style.StationStand.common.special) {
emergentX = model.position.x;

4
src/jmapNew/shape/element/EControl.js
View File

@ -97,6 +97,10 @@ export default class EControl extends Group {
this.control.setStyle('fill', color);
}
}
setControlStroke(color, lineWidth) {
this.control.setStyle('lineWidth', lineWidth);
this.control.setStyle('stroke', color);
}
setTextColor(color) {
if (color) {
this.text.setStyle('textFill', color);

22
src/jmapNew/shape/factory.js
View File

@ -21,7 +21,7 @@ import AutoTurnBack from './Automactic/index.js';
import OutFrame from './OutFrame/index.js';
import CheckBox from './checkBox/checkBox.js';
import AutomaticRoute from './AutomacticRoute/index.js';
import AtsControl from './SaidLamp/index.js';
import SaidLamp from './SaidLamp/index.js';
/** 图库*/
const mapShape = {};
@ -47,15 +47,17 @@ mapShape[deviceType.AxleReset] = AxleReset;
mapShape[deviceType.GuideLock] = GuideLock;
mapShape[deviceType.CheckBox] = CheckBox;
mapShape[deviceType.AutomaticRoute] = AutomaticRoute;
mapShape[deviceType.AtsControl] = AtsControl;
mapShape[deviceType.CenterCommunication] = AtsControl;
mapShape[deviceType.ChainControl] = AtsControl;
mapShape[deviceType.IntersiteControl] = AtsControl;
mapShape[deviceType.LeuControl] = AtsControl;
mapShape[deviceType.LocalControl] = AtsControl;
mapShape[deviceType.Maintain] = AtsControl;
mapShape[deviceType.PowerSupply] = AtsControl;
mapShape[deviceType.NoOneReturn] = AtsControl;
mapShape[deviceType.AtsControl] = SaidLamp;
mapShape[deviceType.CenterCommunication] = SaidLamp;
mapShape[deviceType.ChainControl] = SaidLamp;
mapShape[deviceType.IntersiteControl] = SaidLamp;
mapShape[deviceType.LeuControl] = SaidLamp;
mapShape[deviceType.LocalControl] = SaidLamp;
mapShape[deviceType.Maintain] = SaidLamp;
mapShape[deviceType.PowerSupply] = SaidLamp;
mapShape[deviceType.NoOneReturn] = SaidLamp;
mapShape[deviceType.MaintenanceLamps] = SaidLamp;
mapShape[deviceType.ZcCommunication] = SaidLamp;
function shapefactory(device, jmap) {
const type = device._type;

8
src/jmapNew/utils/parser.js
View File

@ -165,6 +165,12 @@ export function parser(data, skinCode, showConfig) {
case 'NoOneReturn':
mapDevice[elem.code] = createDevice(deviceType.NoOneReturn, elem, propConvert, showConfig);
break;
case 'MaintenanceLamps':
mapDevice[elem.code] = createDevice(deviceType.MaintenanceLamps, elem, propConvert, showConfig);
break;
case 'ZcCommunication':
mapDevice[elem.code] = createDevice(deviceType.ZcCommunication, elem, propConvert, showConfig);
break;
}
}, this);
@ -273,6 +279,8 @@ export function updateMapData(state, model) {
case deviceType.Maintain: updateForList(model, state, 'indicatorLightList'); break;
case deviceType.PowerSupply: updateForList(model, state, 'indicatorLightList'); break;
case deviceType.NoOneReturn: updateForList(model, state, 'indicatorLightList'); break;
case deviceType.MaintenanceLamps: updateForList(model, state, 'indicatorLightList'); break;
case deviceType.ZcCommunication: updateForList(model, state, 'indicatorLightList'); break;
}
}
}

27
src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
View File

@ -62,6 +62,8 @@ export default {
maintainList: [],
powerSupplyList: [],
noOneReturnList: [],
maintenanceLampList: [],
zcCommunicationList: [],
typeList: [
{ name: 'LEU通信', value: 'LeuControl' },
{ name: '站间通信', value: 'IntersiteControl' },
@ -71,7 +73,9 @@ export default {
{ name: '连锁主备状态', value: 'ChainControl' },
{ name: '维护工作站', value: 'Maintain'},
{ name: '电源', value: 'PowerSupply'},
{ name: '无人折返', value: 'NoOneReturn'}
{ name: '无人折返', value: 'NoOneReturn'},
{ name: '全站维修点灯', value: 'MaintenanceLamps'},
{ name: 'ZC通信', value: 'ZcCommunication'}
],
editModel: {
code: '',
@ -235,6 +239,12 @@ export default {
case 'NoOneReturn':
this.noOneReturnList.push(item);
break;
case 'MaintenanceLamps':
this.maintenanceLampList.push(item);
break;
case 'ZcCommunication':
this.zcCommunicationList.push(item);
break;
}
});
},
@ -267,8 +277,13 @@ export default {
case 'NoOneReturn':
this.selectLists = this.noOneReturnList;
break;
case 'MaintenanceLamps':
this.selectLists = this.maintenanceLampList;
break;
case 'ZcCommunication':
this.selectLists = this.zcCommunicationList;
break;
}
console.log(this.selectLists, '===============');
},
changeStation(code) { // 选择对应的所属设备集中站
this.autoList.forEach(elem => {
@ -294,7 +309,9 @@ export default {
if (selected && selected._type.toUpperCase() === 'LeuControl'.toUpperCase() || selected._type.toUpperCase() === 'IntersiteControl'.toUpperCase() ||
selected._type.toUpperCase() === 'CenterCommunication'.toUpperCase() || selected._type.toUpperCase() === 'AtsControl'.toUpperCase() ||
selected._type.toUpperCase() === 'LocalControl'.toUpperCase() || selected._type.toUpperCase() === 'ChainControl'.toUpperCase() ||
selected._type.toUpperCase() === 'Maintain'.toUpperCase() || selected._type.toUpperCase() === 'PowerSupply'.toUpperCase() || selected._type.toUpperCase() === 'NoOneReturn'.toUpperCase()) {
selected._type.toUpperCase() === 'Maintain'.toUpperCase() || selected._type.toUpperCase() === 'PowerSupply'.toUpperCase() ||
selected._type.toUpperCase() === 'NoOneReturn'.toUpperCase() || selected._type.toUpperCase() === 'MaintenanceLamps'.toUpperCase() ||
selected._type.toUpperCase() === 'ZcCommunication'.toUpperCase()) {
this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected);
this.editModel.type = selected._type;
@ -338,7 +355,9 @@ export default {
if (selected && selected._type.toUpperCase() === 'LeuControl'.toUpperCase() || selected._type.toUpperCase() === 'IntersiteControl'.toUpperCase() ||
selected._type.toUpperCase() === 'CenterCommunication'.toUpperCase() || selected._type.toUpperCase() === 'AtsControl'.toUpperCase() ||
selected._type.toUpperCase() === 'LocalControl'.toUpperCase() || selected._type.toUpperCase() === 'ChainControl'.toUpperCase() ||
selected._type.toUpperCase() === 'Maintain'.toUpperCase() || selected._type.toUpperCase() === 'PowerSupply'.toUpperCase() || selected._type.toUpperCase() === 'NoOneReturn'.toUpperCase()) {
selected._type.toUpperCase() === 'Maintain'.toUpperCase() || selected._type.toUpperCase() === 'PowerSupply'.toUpperCase() ||
selected._type.toUpperCase() === 'NoOneReturn'.toUpperCase() || selected._type.toUpperCase() === 'MaintenanceLamps'.toUpperCase() ||
selected._type.toUpperCase() === 'ZcCommunication'.toUpperCase()) {
this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
confirmButtonText: this.$t('tip.confirm'),
cancelButtonText: this.$t('tip.cancel'),

3
src/views/newMap/newMapdraft/mapoperate/index.vue
View File

@ -313,7 +313,8 @@ export default {
this.enabledTab = 'Section';
} else if (type == 'AutomaticRoute' || type == 'AutoTurnBack' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock') {
this.enabledTab = 'ControlDraft';
} else if (type == 'AtsControl' || type == 'CenterCommunication' || type == 'ChainControl' || type == 'InteresiteControl' || type == 'LeuControl' || type == 'LocalControl' || type == 'Maintain' || type == 'PowerSupply' || type == 'NoOneReturn') {
} else if (type == 'AtsControl' || type == 'CenterCommunication' || type == 'ChainControl' || type == 'IntersiteControl' || type == 'LeuControl' ||
type == 'LocalControl' || type == 'Maintain' || type == 'PowerSupply' || type == 'NoOneReturn' || type == 'MaintenanceLamps' || type == 'ZcCommunication') {
this.enabledTab = 'ControlLamp';
} else {
this.enabledTab = type;