From 412e6bd582b2248b5cf0118c2a0374d063fbf9f1 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Tue, 18 Feb 2020 19:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/shape/Train/index.js | 4 ++-- src/utils/baseUrl.js | 4 ++-- .../dataRelation/turnedoperate/priority.vue | 19 +------------------ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js index 5d2a058a4..3cb898fde 100644 --- a/src/jmapNew/shape/Train/index.js +++ b/src/jmapNew/shape/Train/index.js @@ -186,7 +186,7 @@ export default class Train extends Group { setDirectionType(right, flag) { if (this.style.Train.trainStatusStyle.directionType.length > 0) { this.style.Train.trainStatusStyle.directionType.forEach((item) => { - if (right && item.type === '02' || !right && item.type === '03') { + if (right === item.type) { let lineLShow = item.lineLShow; let arrowLShow = item.arrowLShow; let lineRShow = item.lineRShow; @@ -210,7 +210,7 @@ export default class Train extends Group { setDirectionStopType(right) { if (this.style.Train.trainStatusStyle.directionStopType.length > 0) { this.style.Train.trainStatusStyle.directionStopType.forEach((item) => { - if (right && item.type === '02' || !right && item.type === '03') { + if (right === item.type) { this.trainL && this.trainL.setLineShow(item.lineLShow); this.trainR && this.trainR.setLineShow(item.lineRShow); return true; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 9946eeea7..f639d80e8 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; diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue index ac4b1b90d..594b6b248 100644 --- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue +++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/priority.vue @@ -67,7 +67,7 @@