From 6ae459b9103225d393b7bf23fb8f4b91ee63e827 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Tue, 31 Mar 2020 18:52:05 +0800
Subject: [PATCH] merge

---
 package.json                                          | 3 +--
 src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c6b1fd09a..b097aa46f 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "dev": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
     "test": "vue-cli-service build --mode staging",
-	"local": "vue-cli-service build --mode native",
+    "local": "vue-cli-service build --mode native",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
@@ -54,7 +54,6 @@
     "compression-webpack-plugin": "^3.0.0",
     "connect": "3.6.6",
     "copy-webpack-plugin": "^4.5.2",
-
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "file-loader": "^3.0.1",
diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
index 477ff36f0..b873b6d15 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
@@ -4,7 +4,6 @@ import { getTrainingCbtcDemon, runDiagramStart, runDiagramOver, setTrainingCbtcI
 
 import { creatSubscribe, clearSubscribe, displayTopic, screenTopic } from '@/utils/stomp';
 import { getToken } from '@/utils/auth';
-import router from '@/router';
 
 // 定于仿真socket接口
 export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,stats) {