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

调整数据显示字段，调整创建站台区段属性设置

Browse Source
This commit is contained in:
zyy 2019-12-19 10:00:29 +08:00
parent 1e1f9a598d
commit 511701b116
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,19 +64,19 @@ export default {
tagType: (row) => { return ''; }
},
{
title: this.$t('map.psdList'),
prop: 'psdList',
title: '关联站台列表',
prop: 'stationStandList',
type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.psdList, this.psdList, ['code', 'name'], true); },
tagType: (row) => { return ''; }
},
{
title: this.$t('map.espList'),
prop: 'espList',
type: 'tagMore',
columnValue: (row) => { return this.$convertField(row.espList, this.espList, ['code', 'name'], true); },
columnValue: (row) => { return this.$convertField(row.stationStandList, this.stationStandList, ['code', 'name'], true); },
tagType: (row) => { return ''; }
},
// {
// title: this.$t('map.espList'),
// prop: 'espList',
// type: 'tagMore',
// columnValue: (row) => { return this.$convertField(row.espList, this.espList, ['code', 'name'], true); },
// tagType: (row) => { return ''; }
// },
{
type: 'button',
title: this.$t('map.operation'),
@ -101,8 +101,7 @@ export default {
...mapGetters('map', [
'sectionList',
'signalList',
'espList',
'psdList'
'stationStandList'
])
},
watch: {

16
src/views/newMap/newMapdraft/mapoperate/section.vue
View File

@ -248,7 +248,6 @@ export default {
reentryTrackName: '',
reentryTrackNamePosition: { x: 0, y: 0 },
transferTrack: false, // 是否转换轨
// segmentation: false, // 是否分割
segmentationPosition: { x: 0, y: 0 },
transferTrackName: '',
transferTrackNamePosition: { x: 0, y: 0 },
@ -425,11 +424,6 @@ export default {
{value: true, label: this.$t('map.fromSmallToLarge')},
{value: false, label: this.$t('map.fromLargeToSmall')}
] }, // 1
// { prop: 'segmentation', label: this.$t('map.isSegmentation'), type: 'checkbox', isHidden: !this.isSwitchSectionType },
// { prop: 'segmentationPosition', label: this.$t('map.segmentationPosition'), type: 'coordinate', width: '150px', isHidden: !this.issegmentationPosition, children: [
// { prop: 'segmentationPosition.x', firstLevel: 'segmentationPosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
// { prop: 'segmentationPosition.y', firstLevel: 'segmentationPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
// ] },
{ prop: 'curve', label: this.$t('map.isCurve'), type: 'checkbox', isHidden: !this.isSwitchSectionType },
{ prop: 'relevanceSectionList', label: '关联道岔区段:', type: 'multiSelect', optionLabel: 'name&&code', optionValue: 'code', options: this.switchSectionList, isHidden: this.isSwitchSectionType }
]
@ -444,7 +438,6 @@ export default {
{ prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
{ prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') },
{ prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0, placeholder: this.$t('map.meter') }
// { prop: 'trainPosType', label: this.$t('map.trainDirection'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.TrainPositionTypeList }
]
}
}
@ -581,9 +574,6 @@ export default {
isLogicSectionNameSort() { // 逻辑区段排序 判断
return this.editModel.type == '01' && !this.editModel.switchSection;
},
// issegmentationPosition() {
// return this.editModel.type !== '04' && this.editModel.segmentation;
// },
isPointsShow() {
return this.editModel.type !== '04' && this.editModel.points.length > 0;
},
@ -670,7 +660,6 @@ export default {
this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected);
this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
// this.editModel.segmentation = selected.segmentation || false;
this.editModel.points = JSON.parse(JSON.stringify(selected.points));
this.oldPoint = JSON.parse(JSON.stringify(selected.points));
this.oldLeftSectionCode = selected.leftSectionCode;
@ -752,7 +741,6 @@ export default {
transferTrackName: '',
transferTrackNamePosition: { x: 0, y: 0 },
switchSection: false, // 是否道岔管理区段
// segmentation: false,
segmentationPosition: { x: 0, y: 0 },
relSwitchCode: '',
rightSectionCode: '',
@ -766,7 +754,6 @@ export default {
logicSectionNameSort: true,
sepTypeLeft: '01', // 分隔符类型
sepTypeRight: '01',
// trainPosType: '', // 默认不填写 列车所在方向
lengthFact: 0,
parentCode: '',
relStandCode: '',
@ -1030,7 +1017,6 @@ export default {
transferTrackName: '',
transferTrackNamePosition: { x: 0, y: 0 },
switchSection: false,
// segmentation: false,
segmentationPosition: { x: 0, y: 0 },
relSwitchCode: '',
trainWindowCode: '',
@ -1040,7 +1026,6 @@ export default {
sepTypeLeft: index == 0 ? selected.sepTypeLeft : '01', // 左侧分隔符类型 (起始左侧按原来区段类型走 其余 默认 01)
sepTypeRight: index == this.addModel.splitNumber ? selected.sepTypeRight : '01', // 右侧分隔符类型 (终点右侧按原来区段类型走 其余 默认 01)
offsetRight: selected.offsetRight,
// trainPosType: this.addModel.trainPosType,
curve: selected.curve,
lengthFact: 0,
points: [
@ -1119,7 +1104,6 @@ export default {
standTrack: false,
standTrackName: '',
standTrackNamePosition: { x: 0, y: 0 },
// segmentation: false,
segmentationPosition: { x: 0, y: 0 },
reentryTrack: false,
reentryTrackName: '',

2
src/views/newMap/newMapdraft/mapoperate/stationstand.vue
View File

@ -330,6 +330,8 @@ export default {
}
models.push(param);
}
section.standTrack = true;
models.push(section);
this.$emit('updateMapModel', models);
}
});