Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
commit
a5f56bae2d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user