Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1

This commit is contained in:
fan 2023-01-28 15:07:41 +08:00
commit 06e2e32150

View File

@ -79,7 +79,7 @@ export default {
},
pos: 'N', //
// N- R- NO-() EX-
throat: ''
throat: ''
};
const model = Object.assign(switchModel, data);
const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
@ -99,7 +99,12 @@ export default {
} else {
sectionStart = item.points.length == 2 ? item.points[item.points.length - 1] : item.points[1];
}
if ((sectionStart.y == section.points[0].y) || (sectionStart.x == section.points[0].x)) { //
const dy = section.points[1].y - section.points[0].y;
const dx = section.points[1].x - section.points[0].x;
const startDx = sectionStart.x - section.points[0].x;
const startDy = sectionStart.y - section.points[0].y;
if ((sectionStart.y == section.points[0].y) || (sectionStart.x == section.points[0].x) ||
(dy * startDx == dx * startDy)) { //
sectionB = item;
} else {
sectionC = item;
@ -139,7 +144,7 @@ export default {
},
pos: 'N', //
// N- R- NO-() EX-
throat: ''
throat: ''
};
const model = Object.assign(switchModel, data);
const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
@ -239,8 +244,6 @@ export default {
cancelButtonText: this.$t('tip.cancel'),
type: 'warning'
}).then((res) => {
// console.log(createArr, changeSectionLists);
// debugger;
const modelsList = this.createSwitchSection(createArr, changeSectionList);
modelsList.forEach(item => {
createArr.push(item);