From ed7acb5abebd0ce99e6597a1ffe1d2e592dbfda5 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 19 Nov 2019 13:11:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CancelLimitOperationConverter.js                      | 0
 .../converter => Converter}/MixinOperationConverter.js    | 0
 .../converter => Converter}/SectionOperationConverter.js  | 0
 .../SignalRouteOperationConverter.js                      | 0
 .../StationControlOperationConverter.js                   | 0
 .../converter => Converter}/StationOperationConverter.js  | 0
 .../StationStandOperationConverter.js                     | 0
 .../converter => Converter}/SwitchOperationConverter.js   | 0
 .../converter => Converter}/TrainOperationConverter.js    | 0
 src/scripts/{plugin/converter => Converter}/manager.js    | 0
 src/utils/baseUrl.js                                      | 4 ++--
 src/views/display/index.vue                               | 8 +++-----
 12 files changed, 5 insertions(+), 7 deletions(-)
 rename src/scripts/{plugin/converter => Converter}/CancelLimitOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/MixinOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/SectionOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/SignalRouteOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/StationControlOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/StationOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/StationStandOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/SwitchOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/TrainOperationConverter.js (100%)
 rename src/scripts/{plugin/converter => Converter}/manager.js (100%)

diff --git a/src/scripts/plugin/converter/CancelLimitOperationConverter.js b/src/scripts/Converter/CancelLimitOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/CancelLimitOperationConverter.js
rename to src/scripts/Converter/CancelLimitOperationConverter.js
diff --git a/src/scripts/plugin/converter/MixinOperationConverter.js b/src/scripts/Converter/MixinOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/MixinOperationConverter.js
rename to src/scripts/Converter/MixinOperationConverter.js
diff --git a/src/scripts/plugin/converter/SectionOperationConverter.js b/src/scripts/Converter/SectionOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SectionOperationConverter.js
rename to src/scripts/Converter/SectionOperationConverter.js
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/Converter/SignalRouteOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SignalRouteOperationConverter.js
rename to src/scripts/Converter/SignalRouteOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationControlOperationConverter.js b/src/scripts/Converter/StationControlOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationControlOperationConverter.js
rename to src/scripts/Converter/StationControlOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationOperationConverter.js b/src/scripts/Converter/StationOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationOperationConverter.js
rename to src/scripts/Converter/StationOperationConverter.js
diff --git a/src/scripts/plugin/converter/StationStandOperationConverter.js b/src/scripts/Converter/StationStandOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/StationStandOperationConverter.js
rename to src/scripts/Converter/StationStandOperationConverter.js
diff --git a/src/scripts/plugin/converter/SwitchOperationConverter.js b/src/scripts/Converter/SwitchOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/SwitchOperationConverter.js
rename to src/scripts/Converter/SwitchOperationConverter.js
diff --git a/src/scripts/plugin/converter/TrainOperationConverter.js b/src/scripts/Converter/TrainOperationConverter.js
similarity index 100%
rename from src/scripts/plugin/converter/TrainOperationConverter.js
rename to src/scripts/Converter/TrainOperationConverter.js
diff --git a/src/scripts/plugin/converter/manager.js b/src/scripts/Converter/manager.js
similarity index 100%
rename from src/scripts/plugin/converter/manager.js
rename to src/scripts/Converter/manager.js
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 469782cec..55be58dc3 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ 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://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index ecf89c7c8..ddfacfb3a 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -159,9 +159,6 @@ export default {
         skinCode() {
             return this.$route.query.skinCode;
         },
-        mapId() {
-            return this.$route.query.mapId;
-        },
         isLesson() {
             return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
         },
@@ -237,6 +234,7 @@ export default {
 
         await this.setWindowSize();
         await this.initLoadData();
+        console.log(history);
     },
     async beforeDestroy() {
         await this.clearAllTimer();
@@ -527,11 +525,11 @@ export default {
             if (this.isDrive) {
                 this.panelShow = false;
                 this.drivingShow = true;
-                this.$refs.Jl3dDrive.show(this.mapId,this.group);
+                this.$refs.Jl3dDrive.show(this.mapId, this.group);
             } else {
                 this.panelShow = false;
                 this.simulationShow = true;
-                this.$refs.Jl3dSimulation.show(this.mapId,this.group);
+                this.$refs.Jl3dSimulation.show(this.mapId, this.group);
             }
         },
         showScheduling() {

From d08d6737813e433a9e1cf05c3981164980ca920a Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Tue, 19 Nov 2019 13:13:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=A6=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => plugin}/Converter/CancelLimitOperationConverter.js       | 0
 src/scripts/{ => plugin}/Converter/MixinOperationConverter.js     | 0
 src/scripts/{ => plugin}/Converter/SectionOperationConverter.js   | 0
 .../{ => plugin}/Converter/SignalRouteOperationConverter.js       | 0
 .../{ => plugin}/Converter/StationControlOperationConverter.js    | 0
 src/scripts/{ => plugin}/Converter/StationOperationConverter.js   | 0
 .../{ => plugin}/Converter/StationStandOperationConverter.js      | 0
 src/scripts/{ => plugin}/Converter/SwitchOperationConverter.js    | 0
 src/scripts/{ => plugin}/Converter/TrainOperationConverter.js     | 0
 src/scripts/{ => plugin}/Converter/manager.js                     | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename src/scripts/{ => plugin}/Converter/CancelLimitOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/MixinOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/SectionOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/SignalRouteOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/StationControlOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/StationOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/StationStandOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/SwitchOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/TrainOperationConverter.js (100%)
 rename src/scripts/{ => plugin}/Converter/manager.js (100%)

diff --git a/src/scripts/Converter/CancelLimitOperationConverter.js b/src/scripts/plugin/Converter/CancelLimitOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/CancelLimitOperationConverter.js
rename to src/scripts/plugin/Converter/CancelLimitOperationConverter.js
diff --git a/src/scripts/Converter/MixinOperationConverter.js b/src/scripts/plugin/Converter/MixinOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/MixinOperationConverter.js
rename to src/scripts/plugin/Converter/MixinOperationConverter.js
diff --git a/src/scripts/Converter/SectionOperationConverter.js b/src/scripts/plugin/Converter/SectionOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/SectionOperationConverter.js
rename to src/scripts/plugin/Converter/SectionOperationConverter.js
diff --git a/src/scripts/Converter/SignalRouteOperationConverter.js b/src/scripts/plugin/Converter/SignalRouteOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/SignalRouteOperationConverter.js
rename to src/scripts/plugin/Converter/SignalRouteOperationConverter.js
diff --git a/src/scripts/Converter/StationControlOperationConverter.js b/src/scripts/plugin/Converter/StationControlOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/StationControlOperationConverter.js
rename to src/scripts/plugin/Converter/StationControlOperationConverter.js
diff --git a/src/scripts/Converter/StationOperationConverter.js b/src/scripts/plugin/Converter/StationOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/StationOperationConverter.js
rename to src/scripts/plugin/Converter/StationOperationConverter.js
diff --git a/src/scripts/Converter/StationStandOperationConverter.js b/src/scripts/plugin/Converter/StationStandOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/StationStandOperationConverter.js
rename to src/scripts/plugin/Converter/StationStandOperationConverter.js
diff --git a/src/scripts/Converter/SwitchOperationConverter.js b/src/scripts/plugin/Converter/SwitchOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/SwitchOperationConverter.js
rename to src/scripts/plugin/Converter/SwitchOperationConverter.js
diff --git a/src/scripts/Converter/TrainOperationConverter.js b/src/scripts/plugin/Converter/TrainOperationConverter.js
similarity index 100%
rename from src/scripts/Converter/TrainOperationConverter.js
rename to src/scripts/plugin/Converter/TrainOperationConverter.js
diff --git a/src/scripts/Converter/manager.js b/src/scripts/plugin/Converter/manager.js
similarity index 100%
rename from src/scripts/Converter/manager.js
rename to src/scripts/plugin/Converter/manager.js