From a6ebcda15e921ece6f0a12476901996bf0b5acb1 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 9 Nov 2020 11:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=A4=E5=A4=A7=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/demon/planSchedule.vue |  3 ++-
 src/views/newMap/jointTrainingNew/menuDemon.vue    | 12 +++++-------
 src/views/newMap/jointTrainingNew/menuSchema.vue   |  6 ++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/newMap/displayNew/demon/planSchedule.vue b/src/views/newMap/displayNew/demon/planSchedule.vue
index fab66f278..f9b30a295 100644
--- a/src/views/newMap/displayNew/demon/planSchedule.vue
+++ b/src/views/newMap/displayNew/demon/planSchedule.vue
@@ -142,6 +142,7 @@ export default {
         }
     },
     created() {
+        this.$store.dispatch('app/transitionAnimations');
         this.loadRunData();
         this.staticSeries = []; this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
         this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.lineCode);
@@ -158,8 +159,8 @@ export default {
             this.clearSubscribe();
             const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
             creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
-
             await this.$store.dispatch('training/setHasSubscribed');
+            this.$store.dispatch('app/animationsClose');
         },
         clearSubscribe() {
             clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 75c1a5173..6095989f8 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -19,12 +19,11 @@
         <el-button v-if="(isAdmin && isProject) || $route.query.type === 'ILW'" size="small" @click="handleEquipment">设备管理</el-button>
         <el-button v-if="isDeviceLogin" size="small" @click="handleTeach">教学系统</el-button>
         <el-button v-if="isDeviceLogin || $route.query.type === 'IM'" size="small" @click="handleExam">考试系统</el-button>
-        <el-button v-if="running && !dataError" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
-        <template v-if="isAdmin">
-          <el-button v-if="!running && !dataError" size="small" type="warning" @click="loadRunPlan">
-            {{ $t('joinTraining.runGraphLoading') }}</el-button><!-- 运行图加载 -->
+        <template v-if="project === 'bjd'">
+          <el-button v-if="running && !dataError" size="small" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
+          <el-button v-if="!running && !dataError" size="small" type="warning" @click="loadRunPlan">{{ $t('joinTraining.runGraphLoading') }}</el-button><!-- 运行图加载 -->
+          <el-button v-if="isAdmin && !dataError" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
         </template>
-        <el-button v-if="isAdmin && !dataError" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
       </el-button-group>
     </div>
     <div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
@@ -447,8 +446,7 @@ export default {
         menuClick() {
             this.hoverBtn = !this.hoverBtn;
             if (this.hoverBtn) {
-                // this.$refs.button_group_box.$el.clientWidth ||
-                this.btnWidth = 600;
+                this.btnWidth = 800;
             } else {
                 this.btnWidth = 0;
             }
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 4d386a28a..75b80cf5f 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height:100%">
-    <div class="schema" :style="{top: offset+'px'}">
+    <div v-if="project !== 'bjd'" class="schema" :style="{top: offset+'px'}">
       <el-select v-if="showSelectStation" v-model="chiShowStation" style="width: 100px;" size="small" @change="switchStationMode">
         <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -112,6 +112,9 @@ export default {
         // },
         isShowDirective() { // 哈尔滨项目 行调设备显示
             return this.$route.query.type == 'CW' && getSessionStorage('project') == 'heb';
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -134,7 +137,6 @@ export default {
     },
     async mounted() {
         this.userId = this.$store.state.user.id;
-        // await this.loadRunData(this.$route.query);
     },
     methods: {
         loadRunData(opt) {