Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts: # src/jmapNew/config/skinCode/ningbo_01.js
This commit is contained in:
joylink_fanyuhong
commit
af7488c27f
@ -91,7 +91,7 @@ class SkinCode extends defaultStyle {
|
||||
beyondWidth: 0, // 区段宽超出宽度
|
||||
invadeColor: '#FFFFFF', // 区段侵入颜色
|
||||
spareColor: '#5578B6', // 区段空闲颜色
|
||||
communicationOccupiedColor: 'lightpink', // 区段通信车占用颜色
|
||||
communicationOccupiedColor: 'red', // 区段通信车占用颜色 // 调整 未确定
|
||||
unCommunicationOccupiedColor: 'red', // 区段非通讯车占用颜色
|
||||
routeLockColor: 'rgba(0, 255, 0, 1)', // 区段路由锁定颜色
|
||||
faultLockColor: 'white', // 区段故障锁定颜色
|
||||
@ -101,7 +101,7 @@ class SkinCode extends defaultStyle {
|
||||
atcExcisionColor: '#A0522D', // 区段atc切除颜色
|
||||
atsExcisionColor: '#A0522D', // 区段ats切除颜色
|
||||
timeReleaseColor: '#3F3F3F', // 区段延时释放颜色
|
||||
protectiveLockColor: '#92D14F', // 区段保护锁闭
|
||||
protectiveLockColor: '#a2d36f', // 区段保护锁闭 延续保护
|
||||
protectiveTimeReleaseColor: '#0071C1', // 区段保护延时解锁
|
||||
logicalColor: '#FFFF00', // 逻辑区段颜色 (未用)
|
||||
logicalTextColor: 'white' // 逻辑区段名称颜色 (未用)
|
||||
@ -134,12 +134,12 @@ class SkinCode extends defaultStyle {
|
||||
color: 'white' // 区段边界符颜色
|
||||
},
|
||||
block: {
|
||||
special: false, // 区段特殊显示
|
||||
special: false // 区段特殊显示
|
||||
}
|
||||
};
|
||||
|
||||
this[deviceType.Signal] = {
|
||||
distance: 3, // 设备距离区段的距离
|
||||
distance: 8, // 设备距离区段的距离
|
||||
post: {
|
||||
standardLength: 6, // 高柱长度
|
||||
standardHeight: 6, // 灯柱高度
|
||||
@ -162,7 +162,7 @@ class SkinCode extends defaultStyle {
|
||||
stopWidth: 2, // 禁止线宽度
|
||||
borderWidth: 2, // 信号灯边框线宽度
|
||||
borderColor: '#3149C3', // 信号灯边框线颜色
|
||||
radiusR: 3, // 信号灯半径
|
||||
radiusR: 5, // 信号灯半径
|
||||
blockColor: '#EF0C08', // 信号灯锁闭
|
||||
grayColor: '#C0C0C0', // 信号灯灰色
|
||||
redColor: 'red', // 信号灯红色
|
||||
@ -483,7 +483,6 @@ class SkinCode extends defaultStyle {
|
||||
trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
|
||||
useSelfFormat: true, // 使用配置项的nameFormat
|
||||
useSelfText: true, // 使用配置项的字体大小
|
||||
trainHeadColorChangeMode: 1, // 1:driveMode + runLevel
|
||||
displayPosition: 'margin' // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
|
||||
},
|
||||
trainStatusStyle: {
|
||||
|
||||
@ -102,6 +102,10 @@ class Status {
|
||||
this.statusObj = {
|
||||
};
|
||||
}
|
||||
handleLine(device) {
|
||||
this.statusObj = {
|
||||
};
|
||||
}
|
||||
getStatus() {
|
||||
return this.statusObj;
|
||||
}
|
||||
|
||||
@ -13,6 +13,7 @@ import JTriangle from '../../utils/JTriangle';
|
||||
import router from '@/router';
|
||||
import { drawSectionStyle } from '../../config/defaultStyle';
|
||||
import store from '@/store';
|
||||
import Vue from 'vue';
|
||||
|
||||
/** 区段*/
|
||||
export default class Section extends Group {
|
||||
@ -776,11 +777,14 @@ export default class Section extends Group {
|
||||
this.recover();
|
||||
// 实际上就是 状态重置 必须在设置其他状态之前 设置颜色之类的
|
||||
if (this.style.Switch.sectionAction.flag && model.relSwitchCode) {
|
||||
const switchModel = store.getters['map/getDeviceByCode'](model.relSwitchCode);
|
||||
if (switchModel.normalPosition && switchModel.sectionCCode == model.code) {
|
||||
this.section.setStyle({ stroke: this.style.Switch.sectionAction.spareColor })
|
||||
} else if (switchModel.reversePosition && switchModel.sectionBCode == model.code) {
|
||||
this.section.setStyle({ stroke: this.style.Switch.sectionAction.spareColor })
|
||||
const switchModel = Vue.prototype.$jlmap.mapDevice[model.relSwitchCode];
|
||||
// const switchModel = store.getters['map/getDeviceByCode'](model.relSwitchCode);
|
||||
if (switchModel.normalPosition != 0) { // 定位情况
|
||||
const sectionC = Vue.prototype.$jlmap.mapDevice[switchModel.sectionCCode];
|
||||
sectionC && sectionC.instance && sectionC.instance.section.setStyle({ stroke: this.style.Switch.sectionAction.spareColor });
|
||||
} else if (switchModel.normalPosition == 0) { // 反位情况
|
||||
const sectionB = Vue.prototype.$jlmap.mapDevice[switchModel.sectionBCode];
|
||||
sectionB && sectionB.instance && sectionB.instance.section.setStyle({ stroke: this.style.Switch.sectionAction.spareColor });
|
||||
}
|
||||
}
|
||||
/** 道岔保护区段锁闭 */
|
||||
|
||||
@ -57,7 +57,7 @@ class ESigPost extends Group {
|
||||
const model = this.model;
|
||||
const style = this.model.style;
|
||||
if (style.Signal.post.standardShow) {
|
||||
type = '01'
|
||||
type = '01';
|
||||
}
|
||||
const length = style.Signal.post.standardShow ? 4 : 0;
|
||||
if (type === '01') {
|
||||
|
||||
@ -105,7 +105,6 @@ class Signal extends Group {
|
||||
// 北京一号线，宁波一号线 自动进路状态
|
||||
// const signalRouteH=;
|
||||
|
||||
|
||||
// 自动进路
|
||||
const sigRouteH = style.Signal.route.direction ? this.count * style.Signal.lamp.radiusR * 2 : -style.Signal.lamp.radiusR * 2;
|
||||
const sigRouteX = endPoint.x + (style.Signal.route.offset.x + sigRouteH) * drict;
|
||||
@ -499,9 +498,7 @@ class Signal extends Group {
|
||||
// this.setAutoFlicker();
|
||||
// }
|
||||
/** 信号机封锁 */
|
||||
if (model.blockade) {
|
||||
this.block();
|
||||
}
|
||||
model.blockade && this.block();
|
||||
/** 设置点灯类型*/
|
||||
if (model.lightType) {
|
||||
this.logicalLight(); // 设置逻辑点灯
|
||||
@ -511,7 +508,7 @@ class Signal extends Group {
|
||||
/** 进路交人工控或自动控 */
|
||||
if (model.atsControl) {
|
||||
this.sigRoute.hide();
|
||||
} else {
|
||||
} else { // 人工控显示黄色三角
|
||||
if (this.style.Signal.auto.signalFrontTriangle) {
|
||||
this.sigRoute.show();
|
||||
this.sigRoute.setStyle({ fill: this.style.Signal.auto.manualControl });
|
||||
|
||||
@ -14,6 +14,7 @@ import EHighlight from '../element/EHighlight';
|
||||
import ERhomboid from './ERhomboid';
|
||||
import ETriangle from './ETriangle';
|
||||
import store from '@/store';
|
||||
import Vue from 'vue';
|
||||
|
||||
export default class Switch extends Group {
|
||||
constructor(model, style) {
|
||||
@ -126,7 +127,7 @@ export default class Switch extends Group {
|
||||
let spointLength1 = 8;
|
||||
const Tspoint1 = [model.intersection.x + directx * width3 + directx * (width2 + width1) - directx * width3, model.intersection.y + directy * switchWidth1];
|
||||
if (this.style.Switch.block.rhomboidShow) {
|
||||
spointLength1 = 16
|
||||
spointLength1 = 16;
|
||||
}
|
||||
const Tspoint2 = [Tspoint1[0] - directx * spointLength1, Tspoint1[1]];
|
||||
const Tspoint3 = [Tspoint1[0] - directx * spointLength1, model.intersection.y - directy * switchWidth1];
|
||||
|
||||
@ -47,7 +47,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>
|
||||
@ -105,11 +105,7 @@ export default {
|
||||
'01': '折返',
|
||||
'02': '直通'
|
||||
},
|
||||
row: '',
|
||||
controlTypeMap: {
|
||||
'01': '自动',
|
||||
'02': '人工'
|
||||
}
|
||||
row: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
||||
@ -206,7 +206,7 @@
|
||||
<div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
|
||||
<span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
|
||||
<el-row style="margin-top: -13px;">
|
||||
<el-radio-group v-model="effective" @change="chooseEffective">
|
||||
<el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
|
||||
<el-col :span="11">
|
||||
<el-radio
|
||||
:id="effective == '02' ? '': domIdChoose2"
|
||||
@ -274,7 +274,8 @@ export default {
|
||||
tripNumber: '',
|
||||
effective: '01',
|
||||
// trainStopTime: 0,
|
||||
trainRunlevel: '01'
|
||||
trainRunlevel: '01',
|
||||
disabledTime: true
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -496,7 +497,10 @@ export default {
|
||||
}
|
||||
if (this.radio === '01') {
|
||||
// this.trainStopTime = 0;
|
||||
this.disabledTime = true;
|
||||
this.trainRunlevel = '01';
|
||||
} else {
|
||||
this.disabledTime = false;
|
||||
}
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
@ -654,16 +658,16 @@ export default {
|
||||
},
|
||||
// 设置停站时间
|
||||
setStopTime() {
|
||||
const forver = this.effective == '02';
|
||||
const forver = this.effective == '01';
|
||||
const operate = {
|
||||
over: true,
|
||||
operation: OperationEvent.StationStand.setStopTime.menu.operation,
|
||||
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
|
||||
val: [`${this.radio}`, this.trainStopTime, forver].join('::'),
|
||||
// val: [`${this.radio}`, this.trainStopTime, forver].join('::'),
|
||||
param: {
|
||||
standStopControl: `${this.radio}`,
|
||||
parkingTime: this.radio == '01' ? -1 : 1,
|
||||
// standStopTime: this.trainStopTime,
|
||||
standAlwaysValid: forver
|
||||
parkingAlwaysValid: forver
|
||||
}
|
||||
};
|
||||
|
||||
@ -681,7 +685,8 @@ export default {
|
||||
},
|
||||
// 设置运行速度
|
||||
setRunLevel() {
|
||||
const forver = this.effective == '02';
|
||||
|
||||
const forver = this.effective == '01';
|
||||
let val = this.radio;
|
||||
if (this.radio == '02') {
|
||||
val = `${this.radio}::${this.trainRunlevel}::${forver}`;
|
||||
@ -694,9 +699,9 @@ export default {
|
||||
cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
|
||||
val: val,
|
||||
param: {
|
||||
standStopControl: `${this.radio}`,
|
||||
standRunLevel: this.radio === '02' ? `${this.trainRunlevel}` : '01',
|
||||
standAlwaysValid: `${forver}`
|
||||
// standStopControl: `${this.radio}`,
|
||||
runLevelTime: this.radio === '02' ? `${this.trainRunlevel}` : '01',
|
||||
runLevelTimeForever: forver
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -275,13 +275,14 @@ export default {
|
||||
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => {
|
||||
const tempData = resp.data;
|
||||
// Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => {
|
||||
// const tempData = resp.data;
|
||||
const tempData = [];
|
||||
this.$refs.standControl.doShow(step, this.selected, tempData);
|
||||
});
|
||||
// });
|
||||
}
|
||||
}).catch(() => {
|
||||
this.$refs.noticeInfo.doShow(step);
|
||||
}).catch((error) => {
|
||||
this.$refs.noticeInfo.doShow(step, [error.message]);
|
||||
});
|
||||
},
|
||||
// 设置运行等级
|
||||
@ -297,10 +298,11 @@ export default {
|
||||
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => {
|
||||
const tempData = resp.data;
|
||||
// Handler.execute(CMD.Stand.CMD_STAND_VIEW_STATUS, {standCode: `${this.selected.code}`}).then(resp => {
|
||||
// const tempData = resp.data;
|
||||
const tempData = [];
|
||||
this.$refs.standControl.doShow(step, this.selected, tempData);
|
||||
});
|
||||
// });
|
||||
}
|
||||
}).catch(() => {
|
||||
this.$refs.noticeInfo.doShow(step);
|
||||
|
||||
@ -22,7 +22,7 @@ export function creatSubscribe(topic, header) {
|
||||
function callback(Response) {
|
||||
if (store) {
|
||||
var data = JSON.parse(Response.body);
|
||||
console.log(data);
|
||||
// console.log(data);
|
||||
store.dispatch('socket/setStomp', data);
|
||||
} else {
|
||||
callback(Response);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user