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:
joylink_cuiweidong 2020-08-04 18:48:14 +08:00
commit 946d212bb9
13 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,6 +207,26 @@ class SkinCode extends defaultStyle {
}
};
this[deviceType.StationTurnBack] = { // 站后折返
displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）
lamp: {
fill: '#f1f1f1', // 填充色
radiusR: 7 // 控制灯大小
},
text: {
titleTextShow: true,
fontWeight: 580,
fontSize: 10,
distance: 10
},
rect: {
fill: 'rgba(0,0,0,0)',
stroke: '#fff',
lineWidth: 0,
padding: 6
}
};
this[deviceType.AutoTurnBack] = {
// 是否显示
visibleConditions: '03',

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

@ -253,12 +253,15 @@ class Signal extends Group {
if (isShowThePrdType(model.prdType, '03') && this.style.Signal.lowButton.display) {
// 北京一号线现地 信号机点击按钮
const lowButtonH = this.count * style.Signal.lamp.radiusR * 2;
let lowButtonH = this.count * style.Signal.lamp.radiusR * 2;
if (drict == 1) {
lowButtonH = -(this.count * style.Signal.lamp.radiusR * 2 + style.Signal.lamp.radiusR * 2);
}
this.lowButton = new ELowButton({
zlevel: this.zlevel,
z: this.z,
style: style,
x: endPoint.x - 2 * (lowButtonH + 3) * drict - (drict + 1) / 2 * lowButtonH,
x: endPoint.x + lowButtonH,
y: endPoint.y - style.Signal.lamp.radiusR
});
this.add(this.lowButton);

7
src/jmapNew/shape/StationTurnBack/index.js
View File

@ -2,6 +2,7 @@ import Group from 'zrender/src/container/Group';
import Circle from 'zrender/src/graphic/shape/Circle';
import Text from 'zrender/src/graphic/Text';
import Rect from 'zrender/src/graphic/shape/Rect';
import Vue from 'vue';
export default class StationTurnBack extends Group {
constructor(model, style) {
@ -68,6 +69,10 @@ export default class StationTurnBack extends Group {
}
});
}
let turnName = '按计划执行';
if (Vue.prototype.$jlmap.lineCode == '03') {
turnName = '关闭';
}
this.strategyText = new Text({
_subType: 'Text',
zlevel: this.zlevel,
@ -79,7 +84,7 @@ export default class StationTurnBack extends Group {
fontWeight: style.StationTurnBack.text.fontWeight,
fontSize: style.StationTurnBack.text.fontSize,
fontFamily: style.fontFamily,
text: model.optionList.length ? model.optionList[0].label : '按计划执行',
text: model.optionList.length ? model.optionList[0].label : turnName,
textFill: '#fff',
textAlign: 'center',
textVerticalAlign: 'top'

2
src/views/newMap/newMapdraft/dataRelation/automaticoperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag class="autoSignal" :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag class="autoSignal" :title="$t('map.automaticSignalList')" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/dwellTimeOperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag class="autoSignal" title="停站时间列表" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag class="autoSignal" title="停站时间列表" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/flankProtectOperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag class="autoSignal" title="侧防列表" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag class="autoSignal" title="侧防列表" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
View File

@ -1,6 +1,6 @@
<template>
<div v-show="show">
<el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="95%" :before-do-close="doClose">
<el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="95%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag :title="$t('map.thenList')" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag :title="$t('map.thenList')" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/runLeveloperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag title="站间等级列表" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag title="站间等级列表" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/signaloperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag :title="$t('map.signalApprochSection')" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag :title="$t('map.signalApprochSection')" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

2
src/views/newMap/newMapdraft/dataRelation/turnedoperate/detail.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-dialogDrag :title="$t('map.autoTurnedList')" :visible.sync="show" width="85%" :before-do-close="doClose">
<el-dialog v-dialogDrag :title="$t('map.autoTurnedList')" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
<div>
<QueryListPage
ref="queryListPage"

6
src/views/newMap/newMapdraft/index.vue
View File

@ -41,9 +41,9 @@
@showMap="showMap"
/>
</div>
</div>
<config-map ref="configMap" @handleSelectPhysicalView="handleSelectPhysicalView" />
<ci-config ref="ciConfig" />
</div>
<pop-menu ref="popMenu" :menu="menu" />
</div>
</transition>
@ -472,8 +472,8 @@ export default {
},
saveMapEvent() { // 保存地图
const map = this.$store.state.map.map;
// map.sectionList.forEach(item => {
// item.belongStation = '';
// map.signalList.forEach(item => {
// item.interlockStationCode = item.stationCode;
// });
if (this.$refs.jlmapVisual && map && parseInt(this.$route.params.mapId)) {
if (this.verifySectionPoint(map)) {

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

@ -494,10 +494,10 @@ export default {
model.rightStopPointOffset = model.rightStopPointOffset || model.lengthFact - 5;
}
const changeSectionList = this.handleOtherSectionChange(model);
let changeStandList = [];
if (this.editModel.stationCode != this.selected.stationCode) { // 优化
changeStandList = this.handleRelevanceStand(model);
}
// let changeStandList = [];
// if (this.editModel.stationCode != this.selected.stationCode) { // 优化
const changeStandList = this.handleRelevanceStand(model);
// }
models = [...changeSectionList, ...changeStandList];
this.$emit('updateMapModel', models);
@ -511,7 +511,7 @@ export default {
},
handleRelevanceStand(model) { // 站台轨关联站台调整 所属集中站
const models = [];
if (model.standTrack) {
if (model.standTrack || model.reentryTrack || model.transferTrack) {
this.stationStandList.forEach(stand => {
if (stand.standTrackCode == model.code) {
const copyStand = deepAssign({}, stand);