From 1f9482e3da987b170143b30c9cd7d93a2f27dfec Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 23 Jul 2021 17:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=89=E9=97=AE=E9=A2=9884?= =?UTF-8?q?=20=E6=AD=A3=E7=BA=BF=E6=89=80=E6=9C=89=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=9C=BA=E9=BB=84=E7=81=AF=E4=BD=8D=E6=98=BE=E7=A4=BA=E4=B8=8E?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=B8=8D=E7=AC=A6=EF=BC=8C=E9=BB=84=E7=81=AF?= =?UTF-8?q?=E4=BD=8D=E5=BA=94=E5=9C=A8=E4=B8=8A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/graph/Signal/index.js | 8 ++++---- src/utils/baseUrl.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index cac40d689..24f23586e 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -612,8 +612,8 @@ class Signal extends Group { } } else { this.cbtcStatus = ''; - this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.greenColor); - this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor); // 设置黑色 + this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.greenColor); + this.lamps[0] && this.lamps[0].setColor(this.style.backgroundColor); // 设置黑色 this.virtualSignal && this.virtualSignal.setColor(this.style.Signal.lamp.blueColor); if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色 this.sigPost.setColor('#00FF00'); @@ -636,8 +636,8 @@ class Signal extends Group { } } else { this.cbtcStatus = ''; - this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor); - this.lamps[1] && this.lamps[1].setColor(this.style.backgroundColor); + this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.yellowColor); + this.lamps[0] && this.lamps[0].setColor(this.style.backgroundColor); if (this.style.Signal.lamp.guidName === 'doubleAndBase') { // 设置底座颜色 this.sigPost.setColor('#00FF00'); if (this.model.logicLight) { // 设置哈尔滨逻辑点灯 颜色 diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 8b75cd8e6..bc303bcc8 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,11 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.2.175:9000'; // 旭强 有线 // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线 - BASE_API = 'http://192.168.2.183:9000'; // 张赛 + // BASE_API = 'http://192.168.2.183:9000'; // 张赛 // BASE_API = 'http://192.168.8.140:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康