From 73fd3a478e20162613f8add4442729c09c54e929 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 11 Jun 2025 16:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/synthesisQuery/digitalSignage.js | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/resources/static/js/synthesisQuery/digitalSignage.js b/src/main/resources/static/js/synthesisQuery/digitalSignage.js index 4bdb901..b2f4ab3 100644 --- a/src/main/resources/static/js/synthesisQuery/digitalSignage.js +++ b/src/main/resources/static/js/synthesisQuery/digitalSignage.js @@ -988,19 +988,34 @@ function addMapLine() { let lineColor = ""; let lineStyle = ""; if ( - (startPoint.towerProgress === 8 && - endPoint.towerProgress === 7) || - (startPoint.towerProgress === 8 && endPoint.towerProgress === 8) + // (startPoint.towerProgress === 8 && + // endPoint.towerProgress === 9) || + // (startPoint.towerProgress === 8 && + // endPoint.towerProgress === 8) || + // (startPoint.towerProgress === 9 && endPoint.towerProgress === 8) + + startPoint.towerProgress === 8 && + endPoint.towerProgress === 8 ) { lineColor = "#FFFF00"; lineStyle = "solid"; - } else if (endPoint.existSpan === 1 && startPoint.existSpan === 1) { + } else if ( + endPoint.existSpan === 1 && + startPoint.existSpan === 1 && + startPoint.towerProgress != 9 && + endPoint.towerProgress != 9 && + startPoint.towerProgress != 8 && + endPoint.towerProgress != 8 && + startPoint.towerProgress != 10 && + endPoint.towerProgress != 10 + ) { lineColor = "#d81e06"; lineStyle = "dashed"; } else if ( - (startPoint.towerProgress === 8 && - endPoint.towerProgress === 8) || - (startPoint.towerProgress === 9 && endPoint.towerProgress === 8) + (startPoint.towerProgress === 9 && + endPoint.towerProgress === 9) || + (startPoint.towerProgress === 10 && + endPoint.towerProgress === 10) ) { lineColor = "#d81e06"; // 黄色 lineStyle = "solid";