Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
c1aa6596fa
@ -438,7 +438,7 @@ export default {
|
|||||||
} else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'endSectionCode'.toUpperCase()) {
|
} else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'endSectionCode'.toUpperCase()) {
|
||||||
if (selected.standTrack || selected.reentryTrack || selected.transferTrack) {
|
if (selected.standTrack || selected.reentryTrack || selected.transferTrack) {
|
||||||
if (selected.belongStation) {
|
if (selected.belongStation) {
|
||||||
this.addModel.startStationCode = selected.belongStation;
|
this.addModel.endStationCode = selected.belongStation;
|
||||||
}
|
}
|
||||||
this.addModel.endSectionCode = selected.code;
|
this.addModel.endSectionCode = selected.code;
|
||||||
this.judgeAllowSelected();
|
this.judgeAllowSelected();
|
||||||
@ -478,10 +478,10 @@ export default {
|
|||||||
if (index < 0) {
|
if (index < 0) {
|
||||||
list.splice(0, 1, data);
|
list.splice(0, 1, data);
|
||||||
} else {
|
} else {
|
||||||
if (index == list.length - 1) {
|
if (index == list.length - 1 && list.length >= 2) {
|
||||||
this.$messageBox('起始区段和终到区段不能相同');
|
this.$messageBox('起始区段和终到区段不能相同');
|
||||||
this.addModel.startSectionCode = list[0].sectionCode;
|
this.addModel.startSectionCode = list[0].sectionCode;
|
||||||
} else {
|
} else if (index != list.length - 1 && index != 0) {
|
||||||
this.$messageBox('该区段已经在交路区段中存在');
|
this.$messageBox('该区段已经在交路区段中存在');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -505,10 +505,10 @@ export default {
|
|||||||
list.push(data);
|
list.push(data);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (index == 0) {
|
if (index == 0 && list.length >= 2) {
|
||||||
this.$messageBox('起始区段和终到区段不能相同');
|
this.$messageBox('起始区段和终到区段不能相同');
|
||||||
this.addModel.endSectionCode = list[list.length - 1].sectionCode;
|
this.addModel.endSectionCode = list[list.length - 1].sectionCode;
|
||||||
} else {
|
} else if (index != list.length - 1 && index != 0) {
|
||||||
this.$messageBox('该区段已经在交路区段中存在');
|
this.$messageBox('该区段已经在交路区段中存在');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user