From c54b9edcd3ed2d745dc1a1cb1fa5ead23f0e669b Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Wed, 18 Nov 2020 09:51:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E5=AE=A2=E6=B5=81=E4=BA=BA=E6=95=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js index 5bf7b4fe1..6caff6cac 100644 --- a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js +++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js @@ -71,11 +71,9 @@ export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passe open:0, text:"", }; - if(data.body[i].num == "0"){ - train.text = data.body[i].code+"(无人)"; - }else{ - train.text = data.body[i].code+"(现有乘客"+data.body[i].num+"人)"; - } + + train.text = data.body[i].code+"(现有乘客"+data.body[i].num+"人)"; + trafficTrain.trainList[train.code] = train; } } From a06a7d24ac80d6d0910798ba67484eb9e441217a Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Wed, 18 Nov 2020 09:52:50 +0800 Subject: [PATCH 2/2] url merge --- src/utils/baseUrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 54719f53d..c0569ef83 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -1,8 +1,8 @@ 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://joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.129:9000'; // 旭强 // BASE_API = 'http://192.168.8.119:9000'; // 张赛