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:
fan 2019-12-02 13:01:36 +08:00
commit 438e633ec4
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,6 @@ export default {
}; };
return { return {
questionList: [], questionList: [],
linksCollection: [],
activeName: 'first', activeName: 'first',
SectionTypeList: [], SectionTypeList: [],
SectionSepTypeList: [], SectionSepTypeList: [],
@ -277,7 +276,6 @@ export default {
relSwitchCode: '', relSwitchCode: '',
stationCode: '', stationCode: '',
logicSectionNameSort: '', logicSectionNameSort: '',
linkCode: '',
sepTypeLeft: '', sepTypeLeft: '',
offsetLeft: 0, offsetLeft: 0,
sepTypeRight: '', sepTypeRight: '',
@ -532,6 +530,7 @@ export default {
if (this.sectionList && this.sectionList.length) { if (this.sectionList && this.sectionList.length) {
list = this.sectionList.filter(elem => { return elem.type === '01'; }); list = this.sectionList.filter(elem => { return elem.type === '01'; });
} }
list.unshift({code: '', name: '无'});
return list; return list;
}, },
ReverseSectionList() { ReverseSectionList() {
@ -754,7 +753,6 @@ export default {
logicSectionNum: [], logicSectionNum: [],
logicSectionShow: model.logicSectionShow, logicSectionShow: model.logicSectionShow,
stationCode: model.stationCode, stationCode: model.stationCode,
linkCode: model.linkCode,
offsetLeft: middleOffset * (index) + model.offsetLeft, offsetLeft: middleOffset * (index) + model.offsetLeft,
offsetRight: middleOffset * (index + 1) + model.offsetLeft, offsetRight: middleOffset * (index + 1) + model.offsetLeft,
sepTypeLeft: '00', sepTypeLeft: '00',
@ -901,7 +899,7 @@ export default {
copySection.trainPosType = model.trainPosType; copySection.trainPosType = model.trainPosType;
models.push(copySection); models.push(copySection);
} }
if (section.linkCode == model.linkCode && model.code != section.code && section.type == '01') { if (model.code != section.code && section.type == '01') {
const lastIndex = this.oldPoint.length - 1; const lastIndex = this.oldPoint.length - 1;
const copySection = deepAssign({}, section); const copySection = deepAssign({}, section);
if (this.oldPoint[0].x == section.points[section.points.length - 1].x && this.oldPoint[0].y == section.points[section.points.length - 1].y) { if (this.oldPoint[0].x == section.points[section.points.length - 1].x && this.oldPoint[0].y == section.points[section.points.length - 1].y) {
@ -984,7 +982,6 @@ export default {
offsetLeft: selected.offsetLeft, offsetLeft: selected.offsetLeft,
sepTypeRight: index == this.addModel.splitNumber ? selected.sepTypeRight : '01', // 右侧分隔符类型 (终点右侧按原来区段类型走 其余 默认 01) sepTypeRight: index == this.addModel.splitNumber ? selected.sepTypeRight : '01', // 右侧分隔符类型 (终点右侧按原来区段类型走 其余 默认 01)
offsetRight: selected.offsetRight, offsetRight: selected.offsetRight,
linkCode: selected.linkCode,
trainPosType: this.addModel.trainPosType, trainPosType: this.addModel.trainPosType,
isCurve: selected.isCurve, isCurve: selected.isCurve,
lengthFact: 0, lengthFact: 0,
@ -1043,10 +1040,6 @@ export default {
} }
if (rsection && lsection) { if (rsection && lsection) {
if (lsection.linkCode !== rsection.linkCode) {
this.$messageBox(this.$t('tip.linkCannotMerged'));
return;
}
const uid = getUID('Section'); const uid = getUID('Section');
const model = { const model = {
_type: 'Section', _type: 'Section',
@ -1187,18 +1180,5 @@ export default {
padding: 18px 0; padding: 18px 0;
} }
} }
.link_box_select{
padding: 10px 20px;
.title{
width: 100px;
display: block;
float: left;
text-align: right;
line-height: 28px;
font-weight: 700;
font-size: 14px;
color: #606266;
}
}
</style> </style>