Merge remote-tracking branch 'origin/test'

This commit is contained in:
fan 2023-05-26 17:59:19 +08:00
commit e32d8f9b6b

View File

@ -19,7 +19,7 @@
<template v-for="terminal in terminalList"> <template v-for="terminal in terminalList">
<div :key="terminal.id" class="terminal-button"> <div :key="terminal.id" class="terminal-button">
<div class="terminal-button-name" :class="{ active: terminal.id === nowTerminal.id }" @click="changePictureShow(terminal)">{{ terminal.name }}</div> <div class="terminal-button-name" :class="{ active: terminal.id === nowTerminal.id }" @click="changePictureShow(terminal)">{{ terminal.name }}</div>
<div v-if="!trainingDesign" class="terminal-button-text" @click="openNewWindow(terminal)">新窗口打开</div> <div v-if="!trainingDesign && !thirdLogin" class="terminal-button-text" @click="openNewWindow(terminal)">新窗口打开</div>
</div> </div>
</template> </template>
</div> </div>
@ -28,6 +28,8 @@
</div> </div>
</template> </template>
<script> <script>
import { ThirdLoginList } from '@/scripts/ProjectConfig';
import { getSessionStorage } from '@/utils/auth';
export default { export default {
name:'TerminalList', name:'TerminalList',
props: { props: {
@ -53,6 +55,9 @@ export default {
}, },
trainingDesign() { trainingDesign() {
return this.$store.state.training.domConfig && this.$store.state.training.domConfig.trainingDesign; return this.$store.state.training.domConfig && this.$store.state.training.domConfig.trainingDesign;
},
thirdLogin() {
return ThirdLoginList.includes(getSessionStorage('project'));
} }
}, },
watch: { watch: {