From 2af7b5cc161dddd6cfbae90217f88baf1e438742 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 13 Jan 2023 16:48:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E5=B7=A5=E4=B8=9Aiframe=E5=B5=8C?=
 =?UTF-8?q?=E5=85=A5=E9=80=80=E5=87=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/simulationMenu/simulationMenu.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
index c1cd00241..9a171add5 100644
--- a/src/views/newMap/display/simulationMenu/simulationMenu.vue
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -193,8 +193,11 @@ export default {
                     this.logout();
                 });
             } else if (this.$route.query.third) {
-                // this.$router.push({ path: `/trainingPlatform/simulation/${this.$route.query.mapId}`, query: { lineCode: this.$route.query.lineCode } });
-                window.close();
+                if (this.$route.query.project === 'cgy') {
+                    window.parent.postMessage('back', '*');
+                } else {
+                    window.close();
+                }
             } else if (this.projectDevice) {
                 this.logout();
             } else {

From 0c7f55c911efcbe5514709a28cb67994bfa19726 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 13 Jan 2023 16:52:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D=20=E3=80=90?=
 =?UTF-8?q?=E5=A4=A7=E9=93=81=E6=A0=87=E5=87=86=E7=AB=99=E3=80=91=E5=A4=A7?=
 =?UTF-8?q?=E9=93=81=E8=BD=A6=E5=8A=A1=E7=BB=88=E7=AB=AF=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=9A=E6=80=BB=E5=8F=96=E6=B6=88=E3=80=81=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E9=87=8D=E5=BC=80=E3=80=81=E6=80=BB=E4=BA=BA=E8=A7=A3?=
 =?UTF-8?q?=E7=AD=89=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/menuButtonCtc.vue        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index 7d31842ba..618facffa 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -6,13 +6,13 @@
         <center><b>建</b><b>立</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, [])">
+    <button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, ['Signal','SignalButton'])">
       <span :style="{color: operation === MixinCommand.totalCancel.button.operation ? '#ccc': 'black'}">
         <center><b>总</b></center>
         <center><b>取</b><b>消</b></center>
       </span>
     </button>
-    <button :id="Signal.reopenSignal.button.domId" class="button_box" @click="buttonDown(Signal.reopenSignal.button.operation, ['Signal'])">
+    <button :id="Signal.reopenSignal.button.domId" class="button_box" @click="buttonDown(Signal.reopenSignal.button.operation, ['Signal','SignalButton'])">
       <span :style="{color: operation === Signal.reopenSignal.button.operation ? '#ccc': 'black'}">
         <center><b>信</b><b>号</b></center>
         <center><b>重</b><b>开</b></center>
@@ -30,7 +30,7 @@
         <center><b>总</b><b>锁</b></center>
       </span>
     </button>
-    <button :id="Signal.humanTrainRoute.button.domId" class="button_box" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal'])">
+    <button :id="Signal.humanTrainRoute.button.domId" class="button_box" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal','SignalButton'])">
       <span :style="{color: operation === Signal.humanTrainRoute.button.operation ? '#ccc':'#800000'}">
         <center><b>总</b></center>
         <center><b>人</b><b>解</b></center>
@@ -461,7 +461,9 @@ export default {
                 operation: this.Signal.reopenSignal.button.operation,
                 userOperationType: UserOperationType.LEFTCLICK,
                 code: device.code,
-                param: { signalCode: device.code }
+                param:{
+                    signalCode: device._type === 'Signal' ? device.code : device.signalCode
+                }
             };
             this.$store.dispatch('trainingNew/next', operate);
         },
@@ -555,7 +557,10 @@ export default {
                 operation: this.$store.state.menuOperation.buttonOperation,
                 userOperationType: UserOperationType.LEFTCLICK,
                 val: model.code,
-                param: { signalCode: model.code }
+                // param: { signalCode: model.code }
+                param:{
+                    signalCode: model._type === 'Signal' ? model.code : model.signalCode
+                }
             };
             this.$store.dispatch('trainingNew/next', operate);
         },