From a5ab114e2d3d7b5eafd7c616cbbd64b13527060b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 15 Jul 2021 17:25:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=8C=E8=B0=83?=
 =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Train/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js
index 853a93f29..a98851c87 100644
--- a/src/jmapNew/shape/graph/Train/index.js
+++ b/src/jmapNew/shape/graph/Train/index.js
@@ -455,7 +455,7 @@ export default class Train extends Group {
     }
     setShowMode() { }
     initShowStation(model) {
-        if (model.trainWindowModel && model.trainWindowModel.instance && !store.getters['map/checkDeviceShow'](model.trainWindowModel.instance.stationCode, model.sectionModel.code)) {
+        if (model.trainWindowModel && model.trainWindowModel.instance && model.trainWindowModel.instance.stationCode && !store.getters['map/checkDeviceShow'](model.trainWindowModel.instance.stationCode, model.sectionModel.code)) {
             this.eachChild(item => {
                 item.hide();
             });

From 6a674f7db93610a4383b18c55506389071fd6ea0 Mon Sep 17 00:00:00 2001
From: yuan <yuanliye@joylink.club>
Date: Fri, 16 Jul 2021 10:30:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E8=A1=8C=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/jointTrainingNew/menuTrainList.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/jointTrainingNew/menuTrainList.vue b/src/views/newMap/jointTrainingNew/menuTrainList.vue
index 209e5a14a..c2ec272b6 100644
--- a/src/views/newMap/jointTrainingNew/menuTrainList.vue
+++ b/src/views/newMap/jointTrainingNew/menuTrainList.vue
@@ -43,6 +43,7 @@
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex';
 export default {
     name: 'MenuTrainList',
     data() {
@@ -57,7 +58,8 @@ export default {
     computed: {
         lineCode() {
             return this.$route.query.lineCode;
-        }
+        },
+        ...mapGetters('map', ['mapConfig'])
     },
     watch:{
         '$store.state.map.activeTrainListUpdate': function (val) {
@@ -69,9 +71,10 @@ export default {
                     activeTrainList.forEach((trainCode)=>{
                         // train.serviceNumber != '' && train.serviceNumber != undefined &&
                         const train = this.$store.getters['map/getDeviceByCode'](trainCode);
-                        if (train && !train.right && train.sectionCode) {
+                        const isUpDirection = this.mapConfig.upRight ? train.right : !train.right
+                        if (train && isUpDirection && train.sectionCode) {
                             this.topTrainList.push(train);
-                        } else if (train && train.right && train.sectionCode) {
+                        } else if (train && !isUpDirection && train.sectionCode) {
                             this.bottomTrainList.push(train);
                         }
                     });

From 55d88442c3ca246fd156247267f669c38899440c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Jul 2021 10:50:33 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/graph/Train/EMouse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js
index 54d7b0a69..5e37c7d7b 100644
--- a/src/jmapNew/shape/graph/Train/EMouse.js
+++ b/src/jmapNew/shape/graph/Train/EMouse.js
@@ -59,7 +59,7 @@ class EMouse extends Group {
         }
         const physicalSection = store.getters['map/getDeviceByCode'](this.device.model.model.physicalCode);
         let closeDoorTip = '';
-        if (physicalSection.standTrack) {
+        if (physicalSection && physicalSection.standTrack) {
             const stationStand = store.state.map.map.stationStandList.find(item => item.standTrackCode === physicalSection.code);
             if ((stationStand.right && this.device.model.right) || (!stationStand.right && !this.device.model.right)) {
                 if (stationStand.inside) {

From 2523801dbe10819c9c190903b2bc3f39eefeffa4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 16 Jul 2021 14:36:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=97=E8=BD=A6?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/haerbin_01/menus/menuButton.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index bbd31fc1e..35365614a 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -814,7 +814,7 @@ export default {
                 over: true
             };
             if (this.trainOperateType === 'update') {
-                params.groupNumber = this.trainModel.groupNumber;
+                params.groupNumber = this.trainModel.groupNumber || this.trainModel.code;
                 params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 6);
                 params.tripNumber = this.formModelNewTrip.slice(6, 8);
                 step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
@@ -831,12 +831,12 @@ export default {
                 step.operation = OperationEvent.Train.addTrainId.menu.operation;
                 step.param = params;
             } else if (this.trainOperateType === 'delete') {
-                params.groupNumber = this.trainModel.groupNumber;
+                params.groupNumber = this.trainModel.groupNumber || this.trainModel.code;
                 step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
                 step.operation = OperationEvent.Train.delTrainId.menu.operation;
                 step.param = params;
             } else if (this.trainOperateType === 'move') {
-                params.groupNumber = this.trainModel.groupNumber;
+                params.groupNumber = this.trainModel.groupNumber || this.trainModel.code;
                 params.sectionCode = this.formModelNewSection;
                 step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE;
                 step.operation = OperationEvent.Train.moveTrainId.menu.operation;