From bd9917c0cabbcded703767c333ebce869d0036ee Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jan 2021 14:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=B2=94=E5=8C=BA=E6=AE=B5=20?= =?UTF-8?q?=E5=88=87=E9=99=A4=E9=97=AA=E7=83=81=E7=BB=98=E5=9B=BE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Section/index.js | 7 ----- src/jmapNew/shape/Switch/index.js | 28 ++++++------------- .../theme/chengdu_03/operationConfig.js | 1 - 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js index 629002f38..0c94652fd 100644 --- a/src/jmapNew/shape/Section/index.js +++ b/src/jmapNew/shape/Section/index.js @@ -259,13 +259,6 @@ export default class Section extends Group { sectionCutOff() { const lineWidth = this.style.Section.line.width + (this.model.status != '01' ? this.style.Section.line.beyondWidth : 0); if (this.line) { - if (this.model.relSwitchCode) { - const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode]; - if (switchModel && switchModel.reversePosition && !switchModel.blockade && switchModel.sectionCCode == this.model.code) { - // debugger; - this.line.setZleve(this.z + 8); - } - } this.line.animateStyle(true, [ { time: 0, styles: { lineWidth: lineWidth } }, { time: 1000, styles: { stroke: this.style.backgroundColor } }, diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index e6e68f6de..c469eb06c 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -572,26 +572,14 @@ export default class Switch extends Group { section.show(); } if (sectionModel.cutOff) { - // section.hide(); - // section.animateStyle(true, [ - // { time: 0, styles: { stroke: sectionModel.instance.line.section.style.stroke } }, - // { time: 1000, styles: { stroke: this.style.backgroundColor } }, - // { time: 2000, styles: { stroke: sectionModel.instance.line.section.style.stroke } } - // ]); - // const color = sectionModel.instance.line.section.style.stroke; - // section && section.animateStyle(item => { - // // item.animateStyle(true, [ - // // { time: 0, styles: { stroke: color } }, - // // { time: 500, styles: { stroke: this.style.backgroundColor } }, - // // { time: 1000, styles: { stroke: color } } - // // ]); - // item.animateStyle(true) - // // this.style.backgroundColor - // .when(0, { stroke: color }) - // .when(1000, { stroke:'#FF0000'}) - // .when(2000, { stroke:color }) - // .start(); - // }); + const lineWidth = sectionModel.instance.line.section.style.lineWidth; + section && section.animateStyle(item => { + let an = item.animateStyle(true); + an = an.when(0, {lineWidth: lineWidth}); + an = an.when(1000, {stroke: this.style.backgroundColor}); + an = an.when(2000, {lineWidth: lineWidth}); + an.start(); + }); } } setAshShow() { diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index 79facc7b4..1e7f071a8 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -119,7 +119,6 @@ export default { { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' } ] }, - { maxDuration: 15, minDuration: 8,