Merge remote-tracking branch 'origin/test'

src/views/newMap/displayNew/menuDemon.vue

@@ -8,7 +8,7 @@
     <div class="display-draft" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group>
         <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
-        <el-button v-if="!isShowScheduling" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+        <el-button v-if="!isShowScheduling && isHebLine" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
         <el-button v-if="!isShowScheduling" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <el-button v-if="isShow3dmodel && !isShowScheduling" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
         <template v-if="isShowQuest">
@@ -99,6 +99,9 @@ export default {
         },
         isDesignPlatform() {
             return this.$route.fullPath.includes('design/display/demon');
+        },
+        isHebLine() {
+            return this.$route.query.lineCode === '07';
         }
     },
     watch: {

src/views/newMap/jointTrainingNew/menuDemon.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <chat-box />
+    <!-- <chat-box /> -->
     <!-- <div v-show="!minimize" class="reminder-drag">
         <div v-if="userRole != '05' && userRole != ''">
           <div class="tabs-roles">
@@ -79,7 +79,7 @@
 import QrCode from '@/components/QrCode';
 // import ChartWindow from './chatWindow';
 // import ChartView from './chartView';
-import ChatBox from './chatBox';
+// import ChatBox from './chatBox';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { exitFullscreen } from '@/utils/screen';
@@ -93,7 +93,7 @@ export default {
     components: {
         // ChartView,
         // ChartWindow,
-        ChatBox,
+        // ChatBox,
         QrCode,
         SetTime,
         RealDevice