From 48491044ce3a0b7f433008e61a5bd240c2e579ef Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 30 Jul 2020 15:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/displayNew/chatView/chatBox.vue    | 124 +++++++++---------
 .../displayNew/chatView/chatMemberList.vue    |   2 +-
 src/views/newMap/displayNew/menuDemon.vue     |  32 ++---
 .../newMap/jointTrainingNew/menuDemon.vue     |   2 +-
 4 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index 461d8bf69..04789d7fe 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -1,68 +1,68 @@
 <template>
   <div class="chatBox" :class="{'active': drawer}" :style="{'bottom':bottom+'px'}">
-	<div class="menuTrainListBtn" @click="clickBtn">
+    <div class="menuTrainListBtn" @click="clickBtn">
       <i class="el-icon-more" />
     </div>
-	<div class="chat-box-main">
-		<div class="chat-box-header">
-		<div class="chat-box-header-title">
-			<el-input v-show="isShow" v-model="queryMember" size="small" placeholder="请输入搜索人员">
-			<el-button slot="append" icon="el-icon-search" />
-			</el-input>
-		</div>
-		<!-- <div class="minimality" @click="handleMinimality('min')">
+    <div class="chat-box-main">
+      <div class="chat-box-header">
+        <div class="chat-box-header-title">
+          <el-input v-show="isShow" v-model="queryMember" size="small" placeholder="请输入搜索人员">
+            <el-button slot="append" icon="el-icon-search" />
+          </el-input>
+        </div>
+        <!-- <div class="minimality" @click="handleMinimality('min')">
 			<i class="el-icon-remove" />
 		</div> -->
-		<!-- <div v-show="memberListCoversition.all==undefined?true&&isShow:memberListCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
+        <!-- <div v-show="memberListCoversition.all==undefined?true&&isShow:memberListCoversition.all&&isShow" class="chat-createGroup" @click="handleCreateGroup()">
 			<i class="el-icon-plus" style="font-weight: bolder;" />
 		</div> -->
-		<div class="chat-setting" @click="handleSetting()">
-			<i class="el-icon-s-tools" />
-		</div>
-		</div>
-		<div v-if="isShow" class="chat-box-content">
-		<el-tree
-			ref="tree"
-			:data="treeData"
-			:props="defaultProps"
-			node-key="id"
-			default-expand-all
-			:filter-node-method="filterNode"
-			show-checkbox
-			style="margin: 10px;overflow-y: auto;height: 100%;margin-right: 0;"
-			@check-change="handleCheckChange"
-		>
-			<span :id="data.id" slot-scope="{ node, data }">
-			<span style="font-size: 14px">{{ data.label }}</span>
-			</span>
-		</el-tree>
-		</div>
-		<div v-else class="chat-box-content">
-		<div class="chatcontentInner">
-			<chat-content ref="chatContent" :chat-content-list="chatContentList" />
-			<div v-if="recordSending" class="chat_record_tip">
-			<div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
-			<div class="record_icon" />
-			<div class="record_tip_text">正在录音...</div>
-			<div class="record_tip_confirm" @click="stopRecording()">确定</div>
-			<div class="record_tip_cancle" @click="cancleRecording()">取消</div>
-			</div>
-		</div>
-		<chat-member-list ref="chatMemberList" :user-role="userRole" :current-member-list="currentMemberList" />
-		</div>
-		<div class="chat-box-footer">
-		<div v-if="isShow">
-			<div class="userString">{{ userString }}</div>
-			<el-button :loading="loading" size="mini" type="primary" class="chat-box-create-coversite" @click="doCreate">创建会话</el-button>
-		</div>
-		<div v-else>
-			<div class="chat-box-footer-tool" />
-			<el-button v-if="isButtonShow&&isCreate" size="mini" type="danger" class="chat-box-footer-quit" :loading="loading" @click="quitCoversition()">结束会话</el-button>
-			<el-button v-if="memberListCoversition.all||isButtonShow" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
-			<div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
-		</div>
-		</div>
-	</div>
+        <div class="chat-setting" @click="handleSetting()">
+          <i class="el-icon-s-tools" />
+        </div>
+      </div>
+      <div v-if="isShow" class="chat-box-content">
+        <el-tree
+          ref="tree"
+          :data="treeData"
+          :props="defaultProps"
+          node-key="id"
+          default-expand-all
+          :filter-node-method="filterNode"
+          show-checkbox
+          style="margin: 10px;overflow-y: auto;height: 100%;margin-right: 0;"
+          @check-change="handleCheckChange"
+        >
+          <span :id="data.id" slot-scope="{ node, data }">
+            <span style="font-size: 14px">{{ data.label }}</span>
+          </span>
+        </el-tree>
+      </div>
+      <div v-else class="chat-box-content">
+        <div class="chatcontentInner">
+          <chat-content ref="chatContent" :chat-content-list="chatContentList" />
+          <div v-if="recordSending" class="chat_record_tip">
+            <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
+            <div class="record_icon" />
+            <div class="record_tip_text">正在录音...</div>
+            <div class="record_tip_confirm" @click="stopRecording()">确定</div>
+            <div class="record_tip_cancle" @click="cancleRecording()">取消</div>
+          </div>
+        </div>
+        <chat-member-list ref="chatMemberList" :user-role="userRole" :current-member-list="currentMemberList" />
+      </div>
+      <div class="chat-box-footer">
+        <div v-if="isShow">
+          <div class="userString">{{ userString }}</div>
+          <el-button :loading="loading" size="mini" type="primary" class="chat-box-create-coversite" @click="doCreate">创建会话</el-button>
+        </div>
+        <div v-else>
+          <div class="chat-box-footer-tool" />
+          <el-button v-if="isButtonShow&&isCreate" size="mini" type="danger" class="chat-box-footer-quit" :loading="loading" @click="quitCoversition()">结束会话</el-button>
+          <el-button v-if="memberListCoversition.all||isButtonShow" class="chat-box-footer-send" size="mini" type="primary" :disabled="recordSending" @click="startRecording()">发送语音</el-button>
+          <div v-if="scriptTip" class="scriptTip">{{ scriptTip }}</div>
+        </div>
+      </div>
+    </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
     <!-- <chat-create-group ref="createGroup" :group="group" :member-list="memberList" @addCoversition="addCoversition" /> -->
     <chat-tooltip :group="group" @getCoversitionList="getCoversitionList" />
@@ -100,7 +100,7 @@ export default {
     },
     data() {
         return {
-			drawer: false,
+            drawer: false,
             bottom:15,
             recordSending:false,
             memberList:[],
@@ -207,7 +207,7 @@ export default {
         this.initPage();
     },
     methods:{
-		clickBtn() {
+        clickBtn() {
             if (this.drawer) {
                 this.drawer = false;
             } else {
@@ -254,8 +254,8 @@ export default {
             lastData = Object.values(lastData);
             const lastMemberList = [];
             const dispatcherList = [];
-            const electricDispatcherList = [];
-            const depotDispatcherList = [];
+            // const electricDispatcherList = [];
+            // const depotDispatcherList = [];
             const stationSupervisorList = [];
             const driverList = [];
             const maintainerList = [];
@@ -464,7 +464,7 @@ export default {
                             type: 'audio',
                             recorderType: StereoAudioRecorder,
                             numberOfAudioChannels: 1,
-                            bitsPerSecond:256000,
+                            bitsPerSecond: 256000,
                             desiredSampRate: 16000
                         });
                         that.recorders.startRecording();
diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue
index 716adeaf1..3e157c89d 100644
--- a/src/views/newMap/displayNew/chatView/chatMemberList.vue
+++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue
@@ -63,7 +63,7 @@ export default {
     margin-top: 10px;
     font-size: 12px;
     margin-left: 0px;
-    height: 350px;
+    height: calc(100% - 18px);
     overflow-y: auto;
 }
 .each-chat-member{
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 5fca445eb..1475ca793 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -9,22 +9,24 @@
     <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 type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
-        <template v-if="isShowQuest">
-          <!-- && !isDesignPlatform  -->
-          <el-button v-if="!isDesignPlatform && !dataError" type="danger" size="small" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+        <template v-if="!dataError">
+          <template v-if="isShowQuest">
+            <!-- && !isDesignPlatform  -->
+            <el-button v-if="!isDesignPlatform" type="danger" size="small" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+          </template>
+          <template v-else-if="!projectDevice">
+            <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>
+          </template>
+          <!-- 设备视图 -->
+          <el-button v-if="isShow3dmodel && !isShowScheduling" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+          <!-- 三维视图 -->
+          <el-button v-if="!isShowScheduling" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+          <!-- cctv视图 -->
+          <el-button v-if="!isShowScheduling" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+          <!-- 排班计划 -->
+          <el-button v-if="isShowScheduling" type="primary" size="small" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
         </template>
-        <template v-else-if="!projectDevice">
-          <el-button type="danger" :disabled="dataError" 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>
-        </template>
-        <!-- 设备视图 -->
-        <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-        <!-- 三维视图 -->
-        <el-button v-if="!isShowScheduling && !dataError" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
-        <!-- cctv视图 -->
-        <el-button v-if="!isShowScheduling && !dataError" 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-group>
     </div>
     <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 914c81a73..9939233e4 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -10,7 +10,7 @@
         <template v-if="!dataError"> <!-- 地图错误判断 -->
           <template v-if="isAdmin && project != 'refereeJsxt'">
             <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 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>