From 1a20248a0d5d1a9250f9396c1f2795b999ad8840 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Thu, 19 Mar 2020 14:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/ELines.js | 2 +- src/jmapNew/shape/Section/EMouse.js | 1 - src/jmapNew/shape/Section/index.js | 14 -------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js index bc26f614d..bda374f86 100644 --- a/src/jmapNew/shape/Section/ELines.js +++ b/src/jmapNew/shape/Section/ELines.js @@ -30,7 +30,7 @@ export default class ELines extends Group { isLine: true, zlevel: this.zlevel, progressive: model.progressive, - z: this.z + 1, + z: this.z + 2, culling: true, shape: shape, style: { diff --git a/src/jmapNew/shape/Section/EMouse.js b/src/jmapNew/shape/Section/EMouse.js index 4e5a95330..850274745 100644 --- a/src/jmapNew/shape/Section/EMouse.js +++ b/src/jmapNew/shape/Section/EMouse.js @@ -26,7 +26,6 @@ class EMouse extends Group { }); this.add(this.sectionTextBorder); this.sectionTextBorder.hide(); - console.log(this.sectionTextBorder); } const fontSize = this.device.model.type == '02' ? this.device.style.Section.text.fontSize + 2 : this.device.style.Section.text.fontSize; diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 09814ead6..7688a2c53 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -572,19 +572,9 @@ export default class Section extends Group { }); } - // setModelTypeLevel() { // 给含有逻辑区段的 section 层级加一 - // if (this.model.type == '01' && this.model.logicSectionCodeList && this.model.logicSectionCodeList.length > 0) { - // console.log(this.section); - // this.section.setZleve(this.z + 2); - // } - // } - /** 设置区段恢复默认状态*/ recover() { if (this.section) { - if (this.model.type == '01') { - this.section.setZleve(this.z); - } this.section.stopAnimation(true); this.sectionBlock && this.sectionBlock.hide(); // 因此特殊区段 this.section.setStyle({ @@ -631,7 +621,6 @@ export default class Section extends Group { stroke: this.style.Section.line.communicationOccupiedColor, lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); - // this.setModelTypeLevel(); } } @@ -642,7 +631,6 @@ export default class Section extends Group { stroke: this.style.Section.line.unCommunicationOccupiedColor, lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); - // this.setModelTypeLevel(); } } @@ -653,7 +641,6 @@ export default class Section extends Group { stroke: this.style.Section.line.routeLockColor, lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth }); - // this.setModelTypeLevel(); } } @@ -673,7 +660,6 @@ export default class Section extends Group { { time: 2000, styles: { stroke: this.style.Section.line.blockColor } } ]); } - // this.setModelTypeLevel(); } /** 故障锁定状态 05*/