From 47d4af94eda07217d2adb3a653228f2747c32af5 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 12 May 2023 15:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E8=B0=83=E5=BA=A6=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E9=80=BB=E8=BE=91=E7=94=9F=E6=88=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4&=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../display/simulationMenu/simulationMenu.vue   |  4 +++-
 src/views/newMap/display/terminals/index.vue    | 17 +++++++++++++----
 .../mapoperate/terminals/terminals.vue          |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
index a892c30d8..e21753d98 100644
--- a/src/views/newMap/display/simulationMenu/simulationMenu.vue
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -115,7 +115,9 @@ export default {
                 const mapClientList = mapClientMap ? mapClientMap[this.$route.query.simType] : [];
                 flag = false;
                 mapClientList.forEach(client => {
-                    if (client.type === 'largePassengerView' && clientIdList.includes(client.id)) {
+                    if (clientIdList.length && client.type === 'largePassengerView' && clientIdList.includes(client.id)) {
+                        flag = true;
+                    } else if (client.type === 'largePassengerView' && this.$store.state.training.roles === 'DISPATCHER') {
                         flag = true;
                     }
                 });
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index d1d1777d6..2983f8fd5 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -19,7 +19,7 @@
     <psl-terminal v-else-if="picture === 'psl'" ref="pslTerminal" :now-terminal="nowTerminal" />
     <large-passenger-strategy v-else-if="picture === 'largePassengerStrategy'" ref="largePassengerStrategy" />
     <large-passenger-view v-else-if="picture === 'largePassengerView'" ref="largePassengerView" />
-    <dispatcher-manage v-else-if="picture === 'dispatcherManage'" ref="dispatcherManage" @pictureChange="pictureChange" @loadingChange="loadingChange" />
+    <dispatcher-manage v-else-if="picture === 'dispatcherManage'" ref="dispatcherManage" @pictureChange="pictureChangeByType" @loadingChange="loadingChange" />
     <big-screen v-else-if="picture === 'bigScreen'" ref="bigScreen" />
     <schedule-work v-else-if="picture === 'scheduleWork'" ref="scheduleWork" />
     <emergency-dispatch-work v-else-if="picture === 'emergency'" ref="emergencyDispatchWork" />
@@ -29,9 +29,9 @@
     <diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
     <diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" :plan-id="loadPlanId" @pictureChange="pictureChangeAndPlan" />
     <pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
-    <display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
+    <display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChangeByType" />
     <tro-work v-else-if="picture === 'troWork'" ref="troWork" />
-    <tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChange" />
+    <tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChangeByType" />
     <jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
     <interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
 
@@ -267,9 +267,18 @@ export default {
             this.loading = true;
         },
         pictureChangeAndPlan(data) {
-            this.pictureChange(data.name);
+            const terminal = this.findTerminalFromMap(data.name);
+            if (terminal) {
+                this.pictureChange(terminal);
+            }
             this.loadPlanId = data.planId;
         },
+        pictureChangeByType(type) {
+            const terminal = this.findTerminalFromMap(type);
+            if (terminal) {
+                this.pictureChange(terminal);
+            }
+        },
         pictureChange(terminal) {
             this.picture = terminal.type;
             this.nowTerminal = terminal;
diff --git a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
index 781aff016..d1a24c789 100644
--- a/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/terminals/terminals.vue
@@ -9,7 +9,7 @@
           <client-show-list :client-list="clientRailwayList" :station-list="stationList" :terminals="getTerminals('RAILWAY')" />
         </el-tab-pane>
         <el-tab-pane class="view-control" label="应急调度" name="EMERGENCY">
-          <client-show-list :client-list="clientRailwayList" :station-list="stationList" :terminals="getTerminals('EMERGENCY')" />
+          <client-show-list :client-list="clientEmergencyList" :station-list="stationList" :terminals="getTerminals('EMERGENCY')" />
         </el-tab-pane>
       </el-tabs>
       <div class="button_box">
@@ -279,7 +279,7 @@ export default {
                 {
                     name: '大屏',
                     code: 'bigScreen',
-                    isShow: () => type === 'METRO'
+                    isShow: () => type === 'METRO' || type === 'EMERGENCY'
 
                 },
                 {