From 56bfd76ba616ead28812f19ff19104c081654396 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 27 Dec 2022 17:16:56 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E4=B8=80=E8=A5=BF?=
 =?UTF-8?q?=E5=AE=89=E4=B8=80=E5=BC=BA=E5=88=B6=E7=AB=99=E6=8E=A7=E8=BD=AC?=
 =?UTF-8?q?=E4=B8=BA=E7=AB=99=E6=8E=A7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh/menu.js                     |   2 +-
 .../fuzhou_01/menus/localWorkMenuBar.vue      |  10 +-
 .../menuDialog/stationControlConvert.vue      |   5 -
 .../menus/menuDialog/warningInfo.vue          | 121 ------------------
 .../fuzhou_01/menus/passiveDialog/alarm.vue   |  26 ++--
 .../xian_01/menus/dispatchWorkMenuBar.vue     |   8 +-
 .../theme/xian_01/menus/localWorkMenuBar.vue  |   8 +-
 .../menuDialog/stationControlConvert.vue      |   5 -
 .../xian_01/menus/menuDialog/warningInfo.vue  | 121 ------------------
 .../xian_01/menus/passiveDialog/alarm.vue     |  19 +--
 .../newMap/display/terminals/localWork.vue    |   3 -
 .../trainingList/trainingPositionTip.vue      |  17 ++-
 12 files changed, 29 insertions(+), 316 deletions(-)
 delete mode 100644 src/jmapNew/theme/fuzhou_01/menus/menuDialog/warningInfo.vue
 delete mode 100644 src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue

diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js
index e9f466a2c..a2aa5c5a6 100644
--- a/src/i18n/langs/zh/menu.js
+++ b/src/i18n/langs/zh/menu.js
@@ -129,7 +129,7 @@ export default {
         confirmRunToFrontStation: '确认运行至前方站'
     },
     passiveDialog: {
-        alarmDetailInformation: '级告警详细信息',
+        alarmDetailInformation: '级报警详细信息',
         lineName: '线路名称',
         unitName: '单位名称',
         moduleName: '模块名称',
diff --git a/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
index 483ff116f..ce0565ba3 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
@@ -1,13 +1,12 @@
 <template>
   <div id="menuBarFuzhou">
     <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
-    <station-control-convert ref="stationControlConvert" pop-class="fuzhou-01__systerm" @warningInfoDoShow="warningInfoDoShow" />
+    <station-control-convert ref="stationControlConvert" pop-class="fuzhou-01__systerm" />
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
     <view-train-id ref="viewTrainId" />
     <view-name ref="viewName" />
     <view-device ref="viewDevice" />
     <manage-user ref="manageUser" />
-    <warning-info ref="warningInfo" />
     <help-about ref="helpAbout" />
   </div>
 </template>
@@ -22,7 +21,6 @@ import ViewDevice from './menuDialog/viewDevice';
 import ManageUser from './menuDialog/manageUser';
 import HelpAbout from './menuDialog/helpAbout';
 import { EventBus } from '@/scripts/event-bus';
-import WarningInfo from './menuDialog/warningInfo';
 
 export default {
     name: 'LocalWorkMenu',
@@ -34,8 +32,7 @@ export default {
         ViewName,
         ViewDevice,
         ManageUser,
-        HelpAbout,
-        WarningInfo
+        HelpAbout
     },
     data() {
         return {
@@ -271,9 +268,6 @@ export default {
                 }
             });
         },
-        warningInfoDoShow(info) {
-            this.$refs.warningInfo.doShow(info);
-        },
         blankClickClose() {
             this.$refs.menuBar.doClose();
         }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index 364ba71a7..3cbdbd8ca 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -155,11 +155,6 @@ export default {
                 this.updateTableValue(controlTransfer);
             });
         },
-        '$store.state.socket.controlTransfer': function(val) {
-            if (val && val.applicantId == this.$store.state.training.myMemberId && this.$store.state.map.picture === 'localWork') {
-                this.$emit('warningInfoDoShow', val);
-            }
-        },
         // 深度数据状态
         tableData: {
             handler(val, oldVal) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/warningInfo.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/warningInfo.vue
deleted file mode 100644
index d6ea711f7..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/warningInfo.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm station-control-convert"
-    title="0级报警详细信息"
-    :visible.sync="show"
-    width="900px"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="font-size: 14px;color: #000;">
-      <el-row>
-        <el-col :span="8" style="display: flex;">
-          <div>线路名称</div>
-          <div style="width: 180px;" class="border-style">{{ $store.state.map.mapName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>单位名称</div>
-          <div style="width: 180px;" class="border-style">{{ stationName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>模块名称</div>
-          <div style="width: 180px;" class="border-style">CMM控制模式转换模块</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="8" style="display: flex;">
-          <div>报警时间</div>
-          <div style="width: 180px;" class="border-style">{{ time }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>等&#12288&#12288级</div>
-          <div style="width: 180px;" class="border-style">0级告警</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>确认状态</div>
-          <div style="width: 180px;" class="border-style">未确认</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="12" style="display: flex;">
-          <div>类&#12288&#12288型</div>
-          <div style="width: 325px;" class="border-style">系统事件</div>
-        </el-col>
-        <el-col :span="12" style="display: flex;">
-          <div>子&#8194类&#8194型</div>
-          <div style="width: 325px;" class="border-style">依据信号设备操作命令设置控制模式</div>
-        </el-col>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>事件摘要</div>
-        <div style="width: 760px;" class="border-style">控制模式转换</div>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>推荐操作</div>
-        <div style="width: 760px;" class="border-style" />
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <span>报警详细描述</span>
-        <div style="width: 825px;margin-left: 0;height: 80px;" class="border-style">{{ `控制模式转换:${stationName}由中控模式转为站控模式！` }}</div>
-      </el-row>
-      <div style="text-align: center;margin-top: 10px;">
-        <el-button :id="closeAlarm.domId" @click="doClose">确认</el-button>
-        <span>未确认0级报警数目：1</span>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { parseTime } from '@/utils/index';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { UserOperationType } from '@/scripts/ConstDic';
-export default {
-    name: 'WarningInfo',
-    data() {
-        return {
-            show: false,
-            stationName: '',
-            time: ''
-        };
-    },
-    computed: {
-        closeAlarm() {
-            return OperationEvent.StationControl.requestStationControl.awaitAlarm;
-        }
-    },
-    methods: {
-        doClose() {
-            const operate = {
-                cancel: true,
-                userOperationType: UserOperationType.LEFTCLICK,
-                operation: this.closeAlarm.operation
-            };
-            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.show = false;
-                }
-            });
-        },
-        doShow(info) {
-            const station = this.$store.getters['map/getDeviceByCode'](info.stationCode);
-            this.stationName = station.name;
-            this.time = parseTime(this.$store.state.training.initTime);
-            this.show = true;
-        }
-    }
-};
-</script>
-
-<style scoped>
-	.border-style {
-		border-top: 2px solid #858585;
-		border-left: 2px solid #858585;
-		border-right: 2px solid #F2F2F2;
-		border-bottom: 2px solid #F2F2F2;
-		padding: 0 10px;
-		margin-left: 10px;
-	}
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index 621efce32..48d629e50 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -31,7 +31,7 @@
       <el-row>
         <el-col :span="9">
           <el-form-item :label="$t('menu.passiveDialog.alarmDate')">
-            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+            <el-input v-model="model.alarmDate" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -83,8 +83,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { UserOperationType } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
+import { parseTime } from '@/utils/index';
 export default {
     name: 'AlarmDetail',
     data() {
@@ -124,14 +125,13 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.awaitAlarm.domId : '';
         }
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.success) {
                 const operate = this.$store.state.training.operate;
-                // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
                 const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     type: operate.type,
@@ -151,7 +151,7 @@ export default {
                 moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
                 level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
                 confirm: this.$t('menu.passiveDialog.confirmStatus'),
-                alarmDate: new Date(),
+                alarmDate: parseTime(this.$store.state.training.initTime),
                 type: this.$t('menu.passiveDialog.systemEvent'),
                 childType: this.$t('menu.passiveDialog.childTypeTips'),
                 timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
@@ -170,21 +170,11 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-
-            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
         commit() {
             const operate = {
-                operation: OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
+                cancel: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation:OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
             };
             this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue
index 6a66c4dc0..9b51a1c3d 100644
--- a/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue
+++ b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue
@@ -6,7 +6,7 @@
     <!--<div class="jumpStopStatus">S</div>-->
     <!--</div>-->
     <menu-system-time ref="menuSystemTime" />
-    <station-control-convert ref="stationControlConvert" :work="work" @warningInfoDoShow="warningInfoDoShow" />
+    <station-control-convert ref="stationControlConvert" :work="work"/>
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
     <view-train-id ref="viewTrainId" />
     <view-name ref="viewName" />
@@ -16,7 +16,6 @@
     <train-delete ref="trainDelete" />
     <manage-user ref="manageUser" />
     <help-about ref="helpAbout" />
-    <warning-info ref="warningInfo" />
     <!-- <delete-runplan-line ref="deleteRunplanLine" /> -->
     <!-- <add-runplan-line ref="addRunplanLine" /> -->
   </div>
@@ -25,7 +24,6 @@
 import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
 import StationControlConvert from './menuDialog/stationControlConvert';
-import WarningInfo from './menuDialog/warningInfo';
 import TrainAdd from './menuDialog/trainAdd';
 // import AddRunplanLine from './menuDialog/addRunplanLine';
 import TrainTranstalet from './menuDialog/trainTranstalet';
@@ -55,7 +53,6 @@ export default {
         TrainDelete,
         ManageUser,
         HelpAbout,
-        WarningInfo,
         MenuSystemTime
         // DeleteRunplanLine
     },
@@ -385,9 +382,6 @@ export default {
         blankClickClose() {
             this.$refs.menuBar.doClose();
         },
-        warningInfoDoShow(info) {
-            this.$refs.warningInfo.doShow(info);
-        },
         undeveloped() {
             this.$refs.menuBar.doClose();
             this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
diff --git a/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue
index 519355002..5c1d6923c 100644
--- a/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue
+++ b/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue
@@ -6,7 +6,7 @@
     <!--<div class="jumpStopStatus">S</div>-->
     <!--</div>-->
     <menu-system-time ref="menuSystemTime" />
-    <station-control-convert ref="stationControlConvert" :work="work" @warningInfoDoShow="warningInfoDoShow" />
+    <station-control-convert ref="stationControlConvert" :work="work"/>
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
     <view-train-id ref="viewTrainId" />
     <view-name ref="viewName" />
@@ -16,7 +16,6 @@
     <train-delete ref="trainDelete" /> -->
     <manage-user ref="manageUser" />
     <help-about ref="helpAbout" />
-    <warning-info ref="warningInfo" />
     <!-- <delete-runplan-line ref="deleteRunplanLine" /> -->
     <!-- <add-runplan-line ref="addRunplanLine" /> -->
   </div>
@@ -25,7 +24,6 @@
 import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
 import StationControlConvert from './menuDialog/stationControlConvert';
-import WarningInfo from './menuDialog/warningInfo';
 // import TrainAdd from './menuDialog/trainAdd';
 // import AddRunplanLine from './menuDialog/addRunplanLine';
 // import TrainTranstalet from './menuDialog/trainTranstalet';
@@ -55,7 +53,6 @@ export default {
         // TrainDelete,
         ManageUser,
         HelpAbout,
-        WarningInfo,
         MenuSystemTime
         // DeleteRunplanLine
     },
@@ -342,9 +339,6 @@ export default {
         blankClickClose() {
             this.$refs.menuBar.doClose();
         },
-        warningInfoDoShow(info) {
-            this.$refs.warningInfo.doShow(info);
-        },
         undeveloped() {
             this.$refs.menuBar.doClose();
             this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
index 2677d14ce..833f8c6b6 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
@@ -163,11 +163,6 @@ export default {
                 this.updateTableValue(controlTransfer);
             });
         },
-        '$store.state.socket.controlTransfer': function(val) {
-            if (val && val.applicantId == this.$store.state.training.myMemberId && this.$store.state.map.picture === 'localWork') {
-                this.$emit('warningInfoDoShow', val);
-            }
-        },
         // 深度数据状态
         tableData: {
             handler(val, oldVal) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue
deleted file mode 100644
index a72afa0d3..000000000
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-01__systerm station-control-convert"
-    title="0级报警详细信息"
-    :visible.sync="show"
-    width="900px"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="font-size: 14px;color: #000;">
-      <el-row>
-        <el-col :span="8" style="display: flex;">
-          <div>线路名称</div>
-          <div style="width: 180px;" class="border-style">{{ $store.state.map.mapName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>单位名称</div>
-          <div style="width: 180px;" class="border-style">{{ stationName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>模块名称</div>
-          <div style="width: 180px;" class="border-style">CMM控制模式转换模块</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="8" style="display: flex;">
-          <div>报警时间</div>
-          <div style="width: 180px;" class="border-style">{{ time }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>等&#12288&#12288级</div>
-          <div style="width: 180px;" class="border-style">0级告警</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>确认状态</div>
-          <div style="width: 180px;" class="border-style">未确认</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="12" style="display: flex;">
-          <div>类&#12288&#12288型</div>
-          <div style="width: 325px;" class="border-style">系统事件</div>
-        </el-col>
-        <el-col :span="12" style="display: flex;">
-          <div>子&#8194类&#8194型</div>
-          <div style="width: 325px;" class="border-style">依据信号设备操作命令设置控制模式</div>
-        </el-col>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>事件摘要</div>
-        <div style="width: 760px;" class="border-style">控制模式转换</div>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>推荐操作</div>
-        <div style="width: 760px;" class="border-style" />
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <span>报警详细描述</span>
-        <div style="width: 825px;margin-left: 0;height: 80px;" class="border-style">{{ `控制模式转换:${stationName}由中控模式转为站控模式！` }}</div>
-      </el-row>
-      <div style="text-align: center;margin-top: 10px;">
-        <el-button :id="closeAlarm.domId" @click="doClose">确认</el-button>
-        <span>未确认0级报警数目：1</span>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { parseTime } from '@/utils/index';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { UserOperationType } from '@/scripts/ConstDic';
-export default {
-    name: 'WarningInfo',
-    data() {
-        return {
-            show: false,
-            stationName: '',
-            time: ''
-        };
-    },
-    computed: {
-        closeAlarm() {
-            return OperationEvent.StationControl.requestStationControl.awaitAlarm;
-        }
-    },
-    methods: {
-        doClose() {
-            const operate = {
-                cancel: true,
-                userOperationType: UserOperationType.LEFTCLICK,
-                operation: this.closeAlarm.operation
-            };
-            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.show = false;
-                }
-            });
-        },
-        doShow(info) {
-            const station = this.$store.getters['map/getDeviceByCode'](info.stationCode);
-            this.stationName = station.name;
-            this.time = parseTime(this.$store.state.training.initTime);
-            this.show = true;
-        }
-    }
-};
-</script>
-
-<style scoped>
-	.border-style {
-		border-top: 2px solid #858585;
-		border-left: 2px solid #858585;
-		border-right: 2px solid #F2F2F2;
-		border-bottom: 2px solid #F2F2F2;
-		padding: 0 10px;
-		margin-left: 10px;
-	}
-</style>
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
index 2b9e3e383..41615aeea 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
@@ -84,6 +84,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'AlarmDetail',
@@ -120,7 +121,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.awaitAlarm.domId : '';
         }
     },
     watch: {
@@ -169,21 +170,11 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-
-            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
         commit() {
             const operate = {
-                operation: OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
+                cancel: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation:OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
             };
             this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/views/newMap/display/terminals/localWork.vue b/src/views/newMap/display/terminals/localWork.vue
index 5a17c7d99..60c4ff85f 100644
--- a/src/views/newMap/display/terminals/localWork.vue
+++ b/src/views/newMap/display/terminals/localWork.vue
@@ -111,9 +111,6 @@ export default {
             }
             this.$jlmap.updateShowStation(list);
             this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
-            // this.$jlmap.updatePicture(deviceList);
-            // this.$jlmap.updateTransform(picture.scaling, picture.origin);
-            // this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
             setTimeout(() => {
                 this.$jlmap.updatePicture(deviceList);
                 const trainingDetail = this.$store.state.trainingNew.trainingDetail;
diff --git a/src/views/newMap/display/trainingList/trainingPositionTip.vue b/src/views/newMap/display/trainingList/trainingPositionTip.vue
index c0e91ddfc..bbdb0907a 100644
--- a/src/views/newMap/display/trainingList/trainingPositionTip.vue
+++ b/src/views/newMap/display/trainingList/trainingPositionTip.vue
@@ -42,7 +42,10 @@ export default {
     },
     watch: {
         '$store.state.trainingNew.stepInfo': function(val) {
-            const awaitOperateFlag = val && val.tipPosition && val.tipPosition.domId === OperationEvent.StationControl.requestStationControl.awaitAlarm.operation;
+            let awaitOperateFlag = false;
+            if (val && val.tipPosition && val.tipPosition.domId === OperationEvent.StationControl.requestStationControl.awaitAlarm.operation) {
+                awaitOperateFlag = !document.getElementById(OperationEvent.StationControl.requestStationControl.awaitAlarm.domId);
+            }
             if (val && this.trainingDetail && this.trainingDetail.type === 'SINGLE' && val.memberId == this.myMemberId && !awaitOperateFlag) {
                 this.tipInit();
             } else {
@@ -79,11 +82,13 @@ export default {
                 }
             }, 10);
         },
-        '$store.state.socket.controlTransfer': function(val) {
-            const stepInfo = this.$store.state.trainingNew.stepInfo;
-            const domId = OperationEvent.StationControl.requestStationControl.awaitAlarm.operation;
-            if (val && val.applicantId == this.$store.state.training.myMemberId && stepInfo && stepInfo.tipPosition && stepInfo.tipPosition.domId === domId) {
-                setTimeout(() => { this.tipInit(); }, 10);
+        '$store.state.socket.msgHead': function (val) {
+            if (val && val.success) {
+                const stepInfo = this.$store.state.trainingNew.stepInfo;
+                const domId = OperationEvent.StationControl.requestStationControl.awaitAlarm.operation;
+                if (val && val.sourceMemberId == this.$store.state.training.myMemberId && stepInfo && stepInfo.tipPosition && stepInfo.tipPosition.domId === domId) {
+                    setTimeout(() => { this.tipInit(); }, 10);
+                }
             }
         }
     },

From edadc872ed6e42e03ebc6b18b23faec53d679041 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Tue, 27 Dec 2022 18:04:28 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=80=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E7=AB=99=E6=8E=A7=E8=BD=AC=E4=B8=BA=E7=AB=99=E6=8E=A7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xian_01/menus/passiveDialog/alarm.vue     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
index 41615aeea..2106869af 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
@@ -31,7 +31,7 @@
       <el-row>
         <el-col :span="9">
           <el-form-item :label="$t('menu.passiveDialog.alarmDate')">
-            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+            <el-input v-model="model.alarmDate" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -85,7 +85,7 @@
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { UserOperationType } from '@/scripts/ConstDic';
-
+import { parseTime } from '@/utils/index';
 export default {
     name: 'AlarmDetail',
     data() {
@@ -126,19 +126,15 @@ export default {
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
-            if (elem && elem.type == 'resp' && elem.agree) {
-                if (elem.agree) {
-                    const operate = this.$store.state.training.operate;
-                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                    const newOperate = {
-                        type: operate.type,
-                        name: station.name,
-                        currentMode: elem.currentMode
-                    };
-
-                    this.doShow(newOperate);
-                }
+            if (elem && elem.success) {
+                const operate = this.$store.state.training.operate;
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
+                const newOperate = {
+                    type: operate.type,
+                    name: station.name,
+                    currentMode: elem.currentMode
+                };
+                this.doShow(newOperate);
             }
         }
     },
@@ -151,7 +147,7 @@ export default {
                 moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
                 level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
                 confirm: this.$t('menu.passiveDialog.confirmStatus'),
-                alarmDate: new Date(),
+                alarmDate: parseTime(this.$store.state.training.initTime),
                 type: this.$t('menu.passiveDialog.systemEvent'),
                 childType: this.$t('menu.passiveDialog.childTypeTips'),
                 timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),

From df53224447c62bf1222fcb44066b06ee11f2ad32 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 28 Dec 2022 10:21:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue                    | 3 ++-
 src/views/newMap/display/terminals/index.vue | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c3c3c19b1..e380ad555 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -271,10 +271,11 @@ export default {
                             const group = resp.data;
                             getLoginInfo(getToken()).then(resp => {
                                 const deviceVO = resp.data.deviceVO;
+                                const accountVO = resp.data.accountVO;
                                 if (deviceVO) {
                                     const config = JSON.parse(deviceVO.config || '{}');
                                     if (config && config.roleCode) {
-                                        const params = [{userId: res.id, memberId:config.roleCode}];
+                                        const params = [{userId: accountVO.id, memberId:config.roleCode}];
                                         assignUsersPlayRoles(params, group).then(() => {
                                             this.enterSimulation(group, mapId, config);
                                         }).catch(res=>{
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
index 7ad77cf0d..ac92402f3 100644
--- a/src/views/newMap/display/terminals/index.vue
+++ b/src/views/newMap/display/terminals/index.vue
@@ -158,7 +158,9 @@ export default {
                     this.initMemberUserInfo();
                     this.setCentralizedStationList(map); // 获取集中站列表
                     if (this.$route.query.client) {
-                        this.pictureChange(this.$route.query.client);
+                        setTimeout(() => {
+                            this.pictureChange(this.$route.query.client);
+                        }, 200);
                     }
                 }
             } catch (error) {

From e92d1664da49e8c58a6b7ea25be57528b29a75e6 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 28 Dec 2022 13:37:47 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=81=E6=B3=A2?=
 =?UTF-8?q?=E4=B8=80=E9=81=A5=E6=8E=A7=E5=AE=9E=E8=AE=AD=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue   | 4 ++--
 src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue  | 6 +++---
 src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue | 4 ++--
 src/views/newMap/display/trainingDesign/editOperate.vue   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
index 9131a79c2..d044a21b0 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
@@ -20,7 +20,7 @@
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="12">
-        <el-button @click="confirm">确定</el-button>
+        <el-button :id="confirmId" @click="confirm">确定</el-button>
       </el-col>
       <el-col :span="12">
         <el-button @click="doClose">关闭</el-button>
@@ -54,7 +54,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         confirmId() {
-            return this.operation.domId;
+            return this.operation === OperationEvent.Station.setPreReset.confirm.operation ? OperationEvent.Station.setPreReset.confirm.domId : OperationEvent.Station.cancelPreReset.confirm.domId;
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
index f33dde531..773f6261b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
@@ -113,7 +113,7 @@ export default {
         },
         setCenterControl() {
             // 请求中控（遥控）
-            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
@@ -121,7 +121,7 @@ export default {
         },
         setStationControl() {
             // 请求站控
-            commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
@@ -129,7 +129,7 @@ export default {
         },
         setEmergencyControl() {
             // 紧急站控
-            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
index 70a1af49a..ffdfb9e00 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
@@ -116,7 +116,7 @@ export default {
         },
         setPreReset() {
             // 计轴复位
-            commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'preReset'}).then(({valid, operate})=>{
                 if (valid) {
                     const nextOperate = {
                         operation: OperationEvent.Station.setPreReset.confirm.operation
@@ -127,7 +127,7 @@ export default {
         },
         cancelPreReset() {
             // 取消计轴复位
-            commitOperate(menuOperate.Station.cancelPreReset.operation, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'light'}).then(({valid, operate})=>{
+            commitOperate(menuOperate.Station.cancelPreReset.operation, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'preReset'}).then(({valid, operate})=>{
                 if (valid) {
                     const nextOperate = {
                         operation: OperationEvent.Station.cancelPreReset.confirm.operation
diff --git a/src/views/newMap/display/trainingDesign/editOperate.vue b/src/views/newMap/display/trainingDesign/editOperate.vue
index cdddf4812..bfb6f1945 100644
--- a/src/views/newMap/display/trainingDesign/editOperate.vue
+++ b/src/views/newMap/display/trainingDesign/editOperate.vue
@@ -59,7 +59,7 @@ export default {
                     operationType: val.cmdType ? val.cmdType.value : '',
                     params: val.param || {}
                 };
-                if (['trainSetButton', 'light'].includes(val.subType)) {
+                if (['trainSetButton', 'light', 'button', 'preReset'].includes(val.subType)) {
                     data.subType = val.subType;
                 }
                 this.stepDetail.operations.push(data);

From 17398ffb035d75d4fb4467ddd0b25871e6dc3f73 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 28 Dec 2022 15:01:37 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9ibp=E7=9B=98=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=8C=89=E9=92=AE=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/store/modules/ibp.js                      |  9 ++++++++-
 src/views/ibp/ibpsystem/index.vue             | 15 ++++++++++-----
 .../display/simulationMenu/simulationMenu.vue | 19 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/ibp.js b/src/store/modules/ibp.js
index 9c0c50d56..43a090311 100644
--- a/src/store/modules/ibp.js
+++ b/src/store/modules/ibp.js
@@ -10,7 +10,8 @@ const ibp = {
         ibp: null, 				// 数据
         updateDeviceData: {}, // 修改的数据
         rightClickCount: 0, // 右键点击设备
-        ibpBgDevice: {} // ibp背景设备
+        ibpBgDevice: {}, // ibp背景设备
+        moreScreen: false // 切换按钮是否显示
     },
 
     getters: {
@@ -42,6 +43,9 @@ const ibp = {
         setIbpData: (state, ibp) => {
             state.ibp = ibp;
         },
+        setMoreScreen: (state, moreScreen) => {
+            state.moreScreen = moreScreen;
+        },
         setUpdateDeviceData: (state, model) => {
             state.rightClickCount++;
             state.updateDeviceData = model;
@@ -58,6 +62,9 @@ const ibp = {
         setIbpData: ({ commit }, ibp) => {
             commit('setIbpData', ibp);
         },
+        setMoreScreen: ({ commit }, moreScreen) => {
+            commit('setMoreScreen', moreScreen);
+        },
         updateIbpDevices: ({ commit }, models) => {
             return new Promise((resolve) => {
                 if (!(models instanceof Array)) {
diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue
index 77ccae44c..71e32ab5a 100644
--- a/src/views/ibp/ibpsystem/index.vue
+++ b/src/views/ibp/ibpsystem/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <div :id="ibpId" v-loading="loading" :style="{ width: canvasWidth+'px', height: canvasHeight +'px',background:'#000' }" class="ibp-canvas" />
-    <el-button-group class="ibp-button">
-      <el-button v-if="moreScreen" type="primary" @click="switchOffset">切换</el-button>
-<!--      <el-button v-if="showBackButton" type="primary" @click="back">{{ $t('global.back') }}</el-button>-->
-<!--      <el-button v-if="$route.query.noPreLogout" type="primary" @click="quit">退出</el-button>-->
-    </el-button-group>
+    <!-- <el-button-group class="ibp-button"> -->
+    <!-- <el-button v-if="moreScreen" type="primary" @click="switchOffset">切换</el-button> -->
+    <!--      <el-button v-if="showBackButton" type="primary" @click="back">{{ $t('global.back') }}</el-button>-->
+    <!--      <el-button v-if="$route.query.noPreLogout" type="primary" @click="quit">退出</el-button>-->
+    <!-- </el-button-group> -->
 
     <template v-for="alarm in alarmList">
       <audio :id="`buzzer_${alarm.code}`" :key="alarm.code" controls loop="loop">
@@ -28,6 +28,7 @@ import { getIbpInfoByStation } from '@/api/ibp';
 import { getSimulationInfoNew, getIbpInitialState } from '@/api/simulation';
 import BuzzerAudio from '@/assets/buzzer.mp3';
 import { getStationList } from '@/api/runplan';
+import { EventBus } from '@/scripts/event-bus';
 
 const pressedKeys = new Set();
 export default {
@@ -112,6 +113,7 @@ export default {
             await this.setMoveInit(false);
             this.showBackButton = false;
         }
+        EventBus.$on('switchOffset', this.switchOffset);
     },
     beforeDestroy() {
         if (this.$route.query.noPreLogout) {
@@ -119,6 +121,8 @@ export default {
             this.$ibp.setClockStart(false);
         }
         this.ibpDestroy();
+        this.$store.dispatch('ibp/setMoreScreen', false);
+        EventBus.$off('switchOffset');
     },
     preResetBtn: null,
     methods: {
@@ -192,6 +196,7 @@ export default {
                     const data = parser(ibpDatas, {width: this.canvasWidth, height: this.canvasHeight}); // ibp 绘图编译数据
                     this.initIbp(this.offsetX);
                     this.moreScreen = ibpDatas.background && ibpDatas.background.width > 1920;
+                    this.$store.dispatch('ibp/setMoreScreen', this.moreScreen);
                     this.setIbp(data, ibpDatas);
                     this.$store.dispatch('ibp/setIbpData', ibpDatas);
                     this.handleBanOpenScreenDoorStatus();
diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
index cad2a1e61..254d070d7 100644
--- a/src/views/newMap/display/simulationMenu/simulationMenu.vue
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -3,7 +3,7 @@
     <div class="allSimulationMenu">
       <div class="simulationMenu" @click="showMenuList">菜单</div>
       <div v-show="isShowMenuList" class="simulationMenuList">
-        <div v-for="(each, index) in allMenuList" :key="index">
+        <div v-for="(each, index) in autoMenuList" :key="index">
           <div v-if="each.show" class="eachSimulationMenu" :class="{'menuDisabled' :each.disabled}" @click="() => { each.disabled? '' : each.click(); }">{{ each.label }}</div>
         </div>
       </div>
@@ -34,6 +34,7 @@ import DeviceManage from './deviceManage';
 import QrCode from '@/components/QrCode';
 import { SimulationUserType } from '@/scripts/ConstDic';
 import { destroySimulationByAdmin, ranAsPlan} from '@/api/simulation';
+import { EventBus } from '@/scripts/event-bus';
 
 export default {
     name: 'SimulationMenu',
@@ -56,6 +57,7 @@ export default {
             deviceif: false,
             deviceShow: true,
             allMenuList: [
+                { label: '切换', name: 'switchOffset', click: this.switchOffset, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.ibp.moreScreen; } },
                 { label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isDisabled: () => { return false; }, isShow: () => { return true; } },
                 { label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } },
                 { label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } },
@@ -81,6 +83,18 @@ export default {
         },
         mapId() {
             return this.$route.query.mapId;
+        },
+        autoMenuList() {
+            const list = [];
+            this.allMenuList.forEach(item => {
+                const obj = {
+                    ...item,
+                    show: item.isShow(),
+                    disabled: item.isDisabled()
+                };
+                list.push(obj);
+            });
+            return list;
         }
     },
     watch: {
@@ -105,6 +119,9 @@ export default {
         window.removeEventListener('click', this.hideMenuList);
     },
     methods: {
+        switchOffset() {
+            EventBus.$emit('switchOffset');
+        },
         generateQrCode() {
             this.hideMenuList();
             getSimulationQrcode(this.$route.query.group).then(resp => {

From 19b16deee56fc71f6d3b02b3c85ce5e6104e4671 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 28 Dec 2022 15:31:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=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   | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
index 254d070d7..82981fbb0 100644
--- a/src/views/newMap/display/simulationMenu/simulationMenu.vue
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -3,7 +3,7 @@
     <div class="allSimulationMenu">
       <div class="simulationMenu" @click="showMenuList">菜单</div>
       <div v-show="isShowMenuList" class="simulationMenuList">
-        <div v-for="(each, index) in autoMenuList" :key="index">
+        <div v-for="(each, index) in allMenuList" :key="index">
           <div v-if="each.show" class="eachSimulationMenu" :class="{'menuDisabled' :each.disabled}" @click="() => { each.disabled? '' : each.click(); }">{{ each.label }}</div>
         </div>
       </div>
@@ -83,21 +83,12 @@ export default {
         },
         mapId() {
             return this.$route.query.mapId;
-        },
-        autoMenuList() {
-            const list = [];
-            this.allMenuList.forEach(item => {
-                const obj = {
-                    ...item,
-                    show: item.isShow(),
-                    disabled: item.isDisabled()
-                };
-                list.push(obj);
-            });
-            return list;
         }
     },
     watch: {
+        '$store.state.ibp.moreScreen': function (val) {
+            this.handleMenuShow();
+        },
         '$store.state.training.simulationUserType': function (val) {
             this.handleMenuShow();
         },