joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

调整列表样式

Browse Source
This commit is contained in:
zyy 2020-07-30 15:32:39 +08:00
parent 1ed90362c0
commit 48491044ce
4 changed files with 81 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/newMap/displayNew/chatView/chatBox.vue
View File

@ -254,8 +254,8 @@ export default {
lastData = Object.values(lastData); lastData = Object.values(lastData);
const lastMemberList = []; const lastMemberList = [];
const dispatcherList = []; const dispatcherList = [];
const electricDispatcherList = []; // const electricDispatcherList = [];
const depotDispatcherList = []; // const depotDispatcherList = [];
const stationSupervisorList = []; const stationSupervisorList = [];
const driverList = []; const driverList = [];
const maintainerList = []; const maintainerList = [];
@ -464,7 +464,7 @@ export default {
type: 'audio', type: 'audio',
recorderType: StereoAudioRecorder, recorderType: StereoAudioRecorder,
numberOfAudioChannels: 1, numberOfAudioChannels: 1,
bitsPerSecond:256000, bitsPerSecond: 256000,
desiredSampRate: 16000 desiredSampRate: 16000
}); });
that.recorders.startRecording(); that.recorders.startRecording();

2
src/views/newMap/displayNew/chatView/chatMemberList.vue
View File

@ -63,7 +63,7 @@ export default {
margin-top: 10px; margin-top: 10px;
font-size: 12px; font-size: 12px;
margin-left: 0px; margin-left: 0px;
height: 350px; height: calc(100% - 18px);
overflow-y: auto; overflow-y: auto;
} }
.each-chat-member{ .each-chat-member{

14
src/views/newMap/displayNew/menuDemon.vue
View File

@ -9,22 +9,24 @@
<div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}"> <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
<el-button-group class="button-group-box"> <el-button-group class="button-group-box">
<el-button type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button> <el-button type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
<template v-if="!dataError">
<template v-if="isShowQuest"> <template v-if="isShowQuest">
<!-- && !isDesignPlatform --> <!-- && !isDesignPlatform -->
<el-button v-if="!isDesignPlatform && !dataError" type="danger" size="small" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button> <el-button v-if="!isDesignPlatform" type="danger" size="small" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
</template> </template>
<template v-else-if="!projectDevice"> <template v-else-if="!projectDevice">
<el-button type="danger" :disabled="dataError" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button> <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
<el-button type="success" :disabled="isDisable || dataError" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable || dataError" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
</template> </template>
<!-- 设备视图 --> <!-- 设备视图 -->
<el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button> <el-button v-if="isShow3dmodel && !isShowScheduling" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
<!-- 三维视图 --> <!-- 三维视图 -->
<el-button v-if="!isShowScheduling && !dataError" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button> <el-button v-if="!isShowScheduling" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
<!-- cctv视图 --> <!-- cctv视图 -->
<el-button v-if="!isShowScheduling && !dataError" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button> <el-button v-if="!isShowScheduling" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
<!-- 排班计划 --> <!-- 排班计划 -->
<el-button v-if="isShowScheduling && !dataError" type="primary" size="small" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button> <el-button v-if="isShowScheduling" type="primary" size="small" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
</template>
</el-button-group> </el-button-group>
</div> </div>
<set-time ref="setTime" @ConfirmSelectBeginTime="start" /> <set-time ref="setTime" @ConfirmSelectBeginTime="start" />

2
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -10,7 +10,7 @@
<template v-if="!dataError"> <!-- 地图错误判断 --> <template v-if="!dataError"> <!-- 地图错误判断 -->
<template v-if="isAdmin && project != 'refereeJsxt'"> <template v-if="isAdmin && project != 'refereeJsxt'">
<el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button> <el-button type="danger" size="small" @click="end">{{ $t('joinTraining.initialize') }}</el-button>
<el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button> <el-button type="success" :disabled="isDisable || dataError" size="small" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
</template> </template>
<template v-if="project == 'jsxt'"> <template v-if="project == 'jsxt'">
<div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div> <div style="background: #FFF;display: inline-block;height: 40px;line-height: 40px;padding: 0 5px;border: 2px solid #F00;border-radius: 6px;margin-right: 8px;">{{ '剩余时间:' + countdownTime }}</div>