From 7c76ba9021842be79ab45cca8d18c9d6b501c6c7 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 5 Jun 2020 14:53:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A3=81=E5=88=A4=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=9B=9E=E6=94=BE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/menuReplay.vue | 44 +++++++++++------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/views/jsxt/refereeList/menuReplay.vue b/src/views/jsxt/refereeList/menuReplay.vue
index 26d611a69..bbec85e7e 100644
--- a/src/views/jsxt/refereeList/menuReplay.vue
+++ b/src/views/jsxt/refereeList/menuReplay.vue
@@ -86,35 +86,35 @@ export default {
         addSpeed() {
             if (this.playSpeedIndex < this.playSpeedList.length - 1) {
                 this.playSpeedIndex++;
-                if (this.isPlaying) {
-                    // 暂停播放
-                    playingPause({}).then(res=>{
-                        this.isPlaying = false;
-                        setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                        });
-                    });
+                // if (this.isPlaying) {
+                //     // 暂停播放
+                //     playingPause({}).then(res=>{
+                //         this.isPlaying = false;
+                //         setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
+                //         });
+                //     });
 
-                } else {
-                    setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                    });
-                }
+                // } else {
+                setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
+                });
+                // }
 
             }
         },
         minusSpeed() {
             if (this.playSpeedIndex > 0) {
                 this.playSpeedIndex--;
-                if (this.isPlaying) {
-                    // 暂停播放
-                    playingPause({}).then(res=>{
-                        this.isPlaying = false;
-                        setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                        });
-                    });
-                } else {
-                    setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
-                    });
-                }
+                // if (this.isPlaying) {
+                //     // 暂停播放
+                //     playingPause({}).then(res=>{
+                //         this.isPlaying = false;
+                //         setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
+                //         });
+                //     });
+                // } else {
+                setPlaySpeed({level:this.playSpeedList[this.playSpeedIndex].level}).then(res=>{
+                });
+                // }
 
             }
         },

From 4d918cc6a7b987509cf7f8f292a04578638a8ac3 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 5 Jun 2020 15:54:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=81=E5=88=A4=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=9B=9E=E6=94=BE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jsxt/refereeList/menuReplay.vue          |  8 ++++----
 .../newMap/jointTrainingNew/chatView/chatBox.vue   |  8 ++++++--
 .../jointTrainingNew/chatView/chatContent.vue      | 14 ++++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/jsxt/refereeList/menuReplay.vue b/src/views/jsxt/refereeList/menuReplay.vue
index bbec85e7e..ac52d9992 100644
--- a/src/views/jsxt/refereeList/menuReplay.vue
+++ b/src/views/jsxt/refereeList/menuReplay.vue
@@ -71,10 +71,10 @@ export default {
         }
     },
     beforeDestroy() {
-        if (this.isPlaying) {
-            endPlaying({}).then(res=>{
-            });
-        }
+        // if (this.isPlaying) {
+        endPlaying({}).then(res=>{
+        });
+        // }
     },
     methods:{
         back() {
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index 3ce1aeedd..ae42ab8a1 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -2,7 +2,7 @@
   <!-- v-quickMenuDrag  -->
   <div class="chatBox" :style="{'bottom':bottom+'px'}">
     <div v-show="!minimize" class="chat-box">
-      <chat-member-list ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
+      <chat-member-list v-if="project!='refereeJsxt'" ref="chatMemberList" :group="group" :current-coversition="currentCoversition" />
       <div class="chat-box-main">
         <chat-coversition-list ref="chatCoversitionList" :user-role="userRole" @hideAddCoversition="hideAddCoversition" @setCurrentCoversition="setCurrentCoversition" @setHeadTitle="setHeadTitle" />
         <div class="chat-window">
@@ -19,7 +19,7 @@
             </div>
           </div>
           <div class="chat-box-content">
-            <chat-content ref="chatContent" :current-coversition="currentCoversition" @changeCoversition="changeCoversition" />
+            <chat-content ref="chatContent" :project="project" :current-coversition="currentCoversition" @changeCoversition="changeCoversition" />
             <div v-if="recordSending" class="chat_record_tip">
               <div id="record_progress_bar" :style="'width:'+100/60*seconds+'%'" />
               <div class="record_icon" />
@@ -56,6 +56,7 @@ import ChatCreateGroup from './chatCreateGroup';
 import ChatTooltip from './chatTooltip';
 import RecordRTC from 'recordrtc';
 import {uploadAudioFileNew, quitCoversition} from '@/api/chat';
+import { getSessionStorage } from '@/utils/auth';
 export default {
     name: 'ChatBox',
     components:{
@@ -101,6 +102,9 @@ export default {
         },
         isButtonShow() {
             return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition;
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch:{
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
index e793b2ed1..6b7fbe617 100644
--- a/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
@@ -26,11 +26,16 @@
 import {getSimulationContextListNew} from '@/api/chat';
 import ConstConfig from '@/scripts/ConstConfig';
 import Cookies from 'js-cookie';
+
 export default {
     props:{
         currentCoversition:{
             type:Object,
             required:true
+        },
+        project:{
+            type:String,
+            required:true
         }
     },
     data() {
@@ -73,7 +78,12 @@ export default {
                             this.playAllAudio();
                         }
                     }
-
+                } else {
+                    if (this.project == 'refereeJsxt') {
+                        this.chatContentList.push(simulationText);
+                        simulationText.name = '所有人';
+                        this.$emit('changeCoversition', simulationText);
+                    }
                 }
             }
         },
@@ -81,7 +91,7 @@ export default {
             this.inintData();
         },
         currentCoversition:function (val, old) {
-            if (val) {
+            if (val && this.project != 'refereeJsxt') {
                 this.chatContentList = [];
                 this.coversition = this.currentCoversition;
                 this.inintData();