From 03c97eefef0ef5ca950ce7764c36d1acb3e6e08c Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Fri, 15 Nov 2019 17:34:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js | 4 ++-- src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js | 2 +- src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js index 70d7dd08f..eda219824 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js @@ -3,7 +3,7 @@ import StompClient from '@/utils/sock'; import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation'; import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp'; -import { handleToken } from '@/utils/auth'; +import { getToken } from '@/utils/auth'; import router from '@/router'; // 定于仿真socket接口 @@ -41,7 +41,7 @@ export function Jl3dDriving(updatemmi,sound,translation,routegroup) { var datatype = '00'; this.teststomp = new StompClient(); this.topic = '/user/queue/simulation/jl3d/'+routegroup; - let header = {'X-Token': handleToken() }; + let header = {'X-Token': getToken() }; this.updatamap = function(newsectionlist,newlinklist,newsignallist,newstationstandlist,newtrainlisttest,newrealsectionlist,newrails, materiallist, nowaction, scene) { // console.log(mapdata); diff --git a/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js b/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js index 2e3ff02a1..a332d065a 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/UpdateTrain.js @@ -74,7 +74,7 @@ export function UpdateTrain(camera,traindata,control){ } - if(trainmodel.status == "02" && mmovecurve.points.length>1){ + if(trainmodel.status == "02" && movecurve.points.length>1){ let point = movecurve.getPointAt(trainmodel.progress); trainmodel.position.x = point.x; trainmodel.position.y = 0; diff --git a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js b/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js index 207f2164a..e4438bf3a 100644 --- a/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js +++ b/src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js @@ -3,7 +3,7 @@ import StompClient from '@/utils/sock'; import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcInitTime } from '@/api/simulation'; import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp'; -import { handleToken } from '@/utils/auth'; +import { getToken } from '@/utils/auth'; import router from '@/router'; // 定于仿真socket接口 @@ -41,7 +41,7 @@ export function Jlmap3dSubscribe(jlmap3d,routegroup) { var datatype = '00'; this.teststomp = new StompClient(); this.topic = '/user/queue/simulation/jl3d/'+routegroup; - const header = {'X-Token': handleToken() }; + const header = {'X-Token': getToken() }; this.updatamap = function(mapdata, materiallist, nowaction, scene) { // console.log(mapdata); @@ -444,7 +444,7 @@ export function Jlmap3dSubscribe(jlmap3d,routegroup) { // 0x32CD32 绿 if (data.body[i]._type == 'Signal' && signallist) { if (signallist) { - console.log(data.body[i]); + // console.log(data.body[i]); signalupdate(data.body[i]); } }