From a33a9bbe42041f633c11145921ab6777ce788ded Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Fri, 21 Feb 2020 15:49:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=93=E5=B2=94=E8=BD=AC=E5=8A=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Switch/index.js | 9 +++++++-- src/utils/baseUrl.js | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js index 68a4ee87d..d84679131 100644 --- a/src/jmapNew/shape/Switch/index.js +++ b/src/jmapNew/shape/Switch/index.js @@ -401,8 +401,13 @@ export default class Switch extends Group { } setState(model) { - model.normalPosition && this.setLocationAction(model); /** 定位*/ - model.reversePosition && this.setInversionAction(model); /** 反位*/ + if (model.normalPosition) { + this.setLocationAction(model); /** 定位*/ + } else if (model.reversePosition) { + this.setInversionAction(model); /** 反位*/ + } else { + this.setLossAction(true); + } /** 道岔单锁 */ model.singleLock && this.setMonolock(); /** 道岔锁闭 */ diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f639d80e8..9946eeea7 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -3,12 +3,12 @@ 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.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 - BASE_API = 'http://b29z135112.zicp.vip'; + // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 } else { BASE_API = process.env.VUE_APP_BASE_API;