From 7449b6b2a3a2d9c369fe36c9344a82f3e702e911 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 29 May 2020 14:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83=20?=
 =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=81=8A=E5=A4=A9=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/socket.js                   |   6 +-
 .../{ => chatView}/chatBox.vue                |   5 +-
 .../{ => chatView}/chatContent.vue            |   0
 .../{ => chatView}/chatCoversitionList.vue    | 141 +++++++++---------
 .../{ => chatView}/chatCreateGroup.vue        |  74 +++++----
 .../{ => chatView}/chatMemberList.vue         |   0
 .../{ => chatView}/chatSetting.vue            |   0
 .../jointTrainingNew/chatView/chatTooltip.vue |  94 ++++++++++++
 .../newMap/jointTrainingNew/menuDemon.vue     |   2 +-
 9 files changed, 218 insertions(+), 104 deletions(-)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatBox.vue (99%)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatContent.vue (100%)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatCoversitionList.vue (50%)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatCreateGroup.vue (81%)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatMemberList.vue (100%)
 rename src/views/newMap/jointTrainingNew/{ => chatView}/chatSetting.vue (100%)
 create mode 100644 src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue

diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index e287a3194..12c9f15c4 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -29,6 +29,9 @@ function handle(state, data) {
     case 'Simulation_Script_Tip': // 仿真-聊天界面用户进出仿真消息
         handleSimulationScriptTipInfo(state, msg); // 用户进出仿真消息
         break;
+    case 'Simulation_Start_Conversation': // 综合演练仿真-聊天界面用户邀请其他人加入群聊
+        state.inviteOtherIntoChat = msg;
+        break;
     case 'Competition_Practical': // 竞赛裁判系统裁判员开始考试推送消息
         state.competitionStart++; // 竞赛裁判系统裁判员开始考试推送消息
         break;
@@ -213,7 +216,8 @@ const socket = {
         simulationStart: '',	// 仿真-开始消息
         simulationOver:0, // 退出仿真推送消息
         simulationReset: '', // 仿真-异常消息
-        simulationText: {}, // 仿真-用户交互消息（聊天/命令）
+        simulationText: {}, // 仿真-用户交互消息（聊天/命令）,
+        inviteOtherIntoChat:{}, // 综合演练仿真-聊天界面用户邀请其他人加入群聊推送信息
         // coversitionList:{}, // 历史仿真-用户消息列表
 
         message: {}, // 仿真聊天
diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
similarity index 99%
rename from src/views/newMap/jointTrainingNew/chatBox.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatBox.vue
index d1c1f8846..23e97bbb0 100644
--- a/src/views/newMap/jointTrainingNew/chatBox.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatBox.vue
@@ -43,6 +43,7 @@
     </div>
     <chat-setting ref="chatSetting" :form="form" @setSetting="setSetting" />
     <chat-create-group ref="createGroup" :group="group" @addCoversition="addCoversition" />
+    <chat-tooltip />
   </div>
 </template>
 <script>
@@ -51,6 +52,7 @@ import ChatContent from './chatContent';
 import ChatMemberList from './chatMemberList';
 import ChatCoversitionList from './chatCoversitionList';
 import ChatCreateGroup from './chatCreateGroup';
+import ChatTooltip from './chatTooltip';
 import RecordRTC from 'recordrtc';
 import {uploadAudioFileNew} from '@/api/chat';
 export default {
@@ -60,7 +62,8 @@ export default {
         ChatContent,
         ChatMemberList,
         ChatCoversitionList,
-        ChatCreateGroup
+        ChatCreateGroup,
+        ChatTooltip
     },
     props: {
         group: {
diff --git a/src/views/newMap/jointTrainingNew/chatContent.vue b/src/views/newMap/jointTrainingNew/chatView/chatContent.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/chatContent.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatContent.vue
diff --git a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
similarity index 50%
rename from src/views/newMap/jointTrainingNew/chatCoversitionList.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
index 530229abe..1369aac71 100644
--- a/src/views/newMap/jointTrainingNew/chatCoversitionList.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatCoversitionList.vue
@@ -12,8 +12,8 @@
   </div>
 </template>
 <script>
-import ConstConfig from '@/scripts/ConstConfig';
-import Cookies from 'js-cookie';
+// import ConstConfig from '@/scripts/ConstConfig';
+// import Cookies from 'js-cookie';
 import {getSimulationConversationListNew} from '@/api/chat';
 export default {
     name:'ChatCoversitionList',
@@ -32,15 +32,15 @@ export default {
                 if (resp.data) {
                     const data = resp.data;
                     data.map(coversition=>{
-                        if (coversition.name) {
-                            coversition.coverName = coversition.name;
-                            coversition.isOnline = true;
-                        } else {
-                            const objectCover = this.handleMemberName(coversition);
-                            coversition.coverName = objectCover.coversitionName;
-                            coversition.isOnline = objectCover.isOnline;
-                        }
-
+                        // if (coversition.name) {
+                        coversition.coverName = coversition.name;
+                        coversition.isOnline = true;
+                        // }
+                        // else {
+                        //     const objectCover = this.handleMemberName(coversition);
+                        //     coversition.coverName = objectCover.coversitionName;
+                        //     coversition.isOnline = objectCover.isOnline;
+                        // }
                         return coversition;
                     });
                     this.coversitionList = data;
@@ -54,14 +54,15 @@ export default {
         addCoversition(data) {
             const index = this.coversitionList.findIndex(item=>{ return item.id == data.id; });
             if (index < 0) {
-                const objectCover = this.handleMemberName(data);
-                if (data.name) {
-                    data.coverName = data.name;
-                    data.isOnline = true;
-                } else {
-                    data.coverName = objectCover.coversitionName;
-                    data.isOnline = objectCover.isOnline;
-                }
+                // const objectCover = this.handleMemberName(data);
+                // if (data.name) {
+                data.coverName = data.name;
+                data.isOnline = true;
+                // }
+                // else {
+                //     data.coverName = objectCover.coversitionName;
+                //     data.isOnline = objectCover.isOnline;
+                // }
 
                 this.coversitionList.push(data);
                 this.currentCoversition = data;
@@ -74,62 +75,64 @@ export default {
             // this.$refs.chatContent.reloadData(this.currentCoversition);
         },
         changeCoversitionOther(coversition) {
-            const objectCover = this.handleMemberName(coversition);
-            coversition.coverName = objectCover.coversitionName;
-            coversition.isOnline = objectCover.isOnline;
+            // const objectCover = this.handleMemberName(coversition);
+            // coversition.coverName = objectCover.coversitionName;
+            // coversition.isOnline = objectCover.isOnline;
+            coversition.coverName = coversition.name;
+            coversition.isOnline = true;
             const index = this.coversitionList.findIndex(item=>{ return item.id == coversition.id; });
             if (index < 0) {
                 this.coversitionList.push(coversition);
             }
             this.changeCoversition(coversition);
-        },
-        handleMemberName(conversition) {
-            if (conversition.all) {
-                return {coversitionName:conversition.name, isOnline:true};
-            } else {
-                let coversitionName = '';
-                let isOnline = true;
-                if (conversition.memberList) {
-                    conversition.memberList.forEach(member=>{
-                        if (member.userId != this.$store.state.user.id) {
-                            const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-                            let data = member.role;
-                            roleTypeList.forEach(function(element) {
-                                const rolename = element.value;
-                                if (Cookies.get('user_lang') == 'en') {
-                                    data = data.replace(rolename, element.enLabel);
-                                } else {
-                                    data = data.replace(rolename, element.label);
-                                }
-                            });
-                            const deviceName = member.deviceName ? '-' + member.deviceName : '';
-                            const memberName = member.name ? '-' + member.name : '';
-                            isOnline = member.online;
-                            coversitionName = data + deviceName + memberName;
-                        }
-                    });
-                } else if (conversition.member) {
-                    const member = conversition.member;
-                    let data = member.role;
-                    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-                    roleTypeList.forEach(function(element) {
-                        const rolename = element.value;
-                        if (Cookies.get('user_lang') == 'en') {
-                            data = data.replace(rolename, element.enLabel);
-                        } else {
-                            data = data.replace(rolename, element.label);
-                        }
-                    });
-                    const deviceName = member.deviceName ? '-' + member.deviceName : '';
-                    const memberName = member.name ? '-' + member.name : '';
-                    isOnline = member.online;
-                    coversitionName = data + deviceName + memberName;
-                } else {
-                    coversitionName = conversition.name;
-                }
-                return {coversitionName:coversitionName, isOnline:isOnline};
-            }
         }
+        // handleMemberName(conversition) {
+        //     if (conversition.all) {
+        //         return {coversitionName:conversition.name, isOnline:true};
+        //     } else {
+        //         let coversitionName = '';
+        //         let isOnline = true;
+        //         if (conversition.memberList) {
+        //             conversition.memberList.forEach(member=>{
+        //                 if (member.userId != this.$store.state.user.id) {
+        //                     const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+        //                     let data = member.role;
+        //                     roleTypeList.forEach(function(element) {
+        //                         const rolename = element.value;
+        //                         if (Cookies.get('user_lang') == 'en') {
+        //                             data = data.replace(rolename, element.enLabel);
+        //                         } else {
+        //                             data = data.replace(rolename, element.label);
+        //                         }
+        //                     });
+        //                     const deviceName = member.deviceName ? '-' + member.deviceName : '';
+        //                     const memberName = member.name ? '-' + member.name : '';
+        //                     isOnline = member.online;
+        //                     coversitionName = data + deviceName + memberName;
+        //                 }
+        //             });
+        //         } else if (conversition.member) {
+        //             const member = conversition.member;
+        //             let data = member.role;
+        //             const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+        //             roleTypeList.forEach(function(element) {
+        //                 const rolename = element.value;
+        //                 if (Cookies.get('user_lang') == 'en') {
+        //                     data = data.replace(rolename, element.enLabel);
+        //                 } else {
+        //                     data = data.replace(rolename, element.label);
+        //                 }
+        //             });
+        //             const deviceName = member.deviceName ? '-' + member.deviceName : '';
+        //             const memberName = member.name ? '-' + member.name : '';
+        //             isOnline = member.online;
+        //             coversitionName = data + deviceName + memberName;
+        //         } else {
+        //             coversitionName = conversition.name;
+        //         }
+        //         return {coversitionName:coversitionName, isOnline:isOnline};
+        //     }
+        // }
     }
 };
 </script>
diff --git a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue b/src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue
similarity index 81%
rename from src/views/newMap/jointTrainingNew/chatCreateGroup.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue
index 68bcf6b89..5f16484b8 100644
--- a/src/views/newMap/jointTrainingNew/chatCreateGroup.vue
+++ b/src/views/newMap/jointTrainingNew/chatView/chatCreateGroup.vue
@@ -1,38 +1,40 @@
 <template>
-  <div v-show="dialogVisible" class="chat-create-group">
-    <div class="create-group-header">
-      <div class="create-group-title">添加会话对象</div>
-      <div class="create-group-close">
-        <i class="el-icon-close" @click="dialogVisible=false" />
-      </div>
-    </div>
-    <div class="create-group-content">
-      <div class="chat-member-list">
-        <el-checkbox-group v-model="checkList">
-          <el-checkbox
-            v-for="member in memberList"
-            :key="member.id"
-            class="each-chat-member"
-            :label="member"
-            :disabled="member.userId === userId"
-          >{{ member.memberName }}</el-checkbox>
-        </el-checkbox-group>
-      </div>
-      <div class="currentSelectList">
-        <div
-          v-for="member in checkList"
-          :key="member.id"
-          class="eachSelect"
-        >
-          {{ member.memberName }}
+  <div v-show="dialogVisible" class="chat-create-group-all">
+    <div class="chat-create-group">
+      <div class="create-group-header">
+        <div class="create-group-title">添加会话对象</div>
+        <div class="create-group-close">
+          <i class="el-icon-close" @click="dialogVisible=false" />
         </div>
-
       </div>
+      <div class="create-group-content">
+        <div class="chat-member-list">
+          <el-checkbox-group v-model="checkList">
+            <el-checkbox
+              v-for="member in memberList"
+              :key="member.id"
+              class="each-chat-member"
+              :label="member"
+              :disabled="member.userId === userId"
+            >{{ member.memberName }}</el-checkbox>
+          </el-checkbox-group>
+        </div>
+        <div class="currentSelectList">
+          <div
+            v-for="member in checkList"
+            :key="member.id"
+            class="eachSelect"
+          >
+            {{ member.memberName }}
+          </div>
+
+        </div>
       <!-- :style="member.userId === userId ?'color:red':''" -->
-    </div>
-    <div class="create-group-bottom">
-      <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
-      <el-button size="small" @click="doClose">取消</el-button>
+      </div>
+      <div class="create-group-bottom">
+        <el-button :loading="loading" size="small" type="primary" @click="doCreate">创建会话</el-button>
+        <el-button size="small" @click="doClose">取消</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -102,7 +104,7 @@ export default {
                         this.checkList = [];
                     }
                 }).catch(error=>{
-                    this.$messageBox('创建会话失败: ' + error.messagfe);
+                    this.$messageBox('创建会话失败: ' + error.message);
                     this.loading = false;
                     this.dialogVisible = false;
                     this.checkList = [];
@@ -118,6 +120,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.chat-create-group-all{
+    position:absolute;
+    width:100%;
+    height:100%;
+    left:0;
+    top:0;
+    z-index:10;
+}
 .chat-create-group{
     position: absolute;
     width: 70%;
diff --git a/src/views/newMap/jointTrainingNew/chatMemberList.vue b/src/views/newMap/jointTrainingNew/chatView/chatMemberList.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/chatMemberList.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatMemberList.vue
diff --git a/src/views/newMap/jointTrainingNew/chatSetting.vue b/src/views/newMap/jointTrainingNew/chatView/chatSetting.vue
similarity index 100%
rename from src/views/newMap/jointTrainingNew/chatSetting.vue
rename to src/views/newMap/jointTrainingNew/chatView/chatSetting.vue
diff --git a/src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue b/src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue
new file mode 100644
index 000000000..194e91059
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/chatView/chatTooltip.vue
@@ -0,0 +1,94 @@
+<template>
+  <div v-show="dialogVisible" class="chatTooltipAll">
+    <div class="chatTooltip">
+      <div class="chatTooltipHeader">
+        {{ userName }} 邀请您加入会话！
+      </div>
+      <div class="chatTooltipBootom">
+        <div class="create-group-bottom">
+          <el-button :loading="loading" size="small" type="primary" @click="doCreate">接受</el-button>
+          <el-button size="small" @click="doClose">拒绝</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+export default {
+    name:'ChatTooltip',
+    data() {
+        return {
+            userName:'',
+            dialogVisible:false,
+            loading:false
+        };
+    },
+    watch:{
+        '$store.state.socket.inviteOtherIntoChat':function(val) {
+            this.userName = this.coverName(val);
+            this.dialogVisible = true;
+        }
+    },
+    // {"conversationId":"22e10b17-7a6c-4b1b-8724-f87fb2053b76","from":{"id":"17","userId":"75","name":"赵",
+    // "role":"STATION_SUPERVISOR","deviceType":"STATION","deviceCode":"Station32955","deviceName":"世纪大道","online":true,"robot":false}
+    methods:{
+        coverName(inviteUser) {
+            const member = inviteUser.from;
+            const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+            let data = member.role;
+            roleTypeList.forEach(function(element) {
+                const rolename = element.value;
+                if (Cookies.get('user_lang') == 'en') {
+                    data = data.replace(rolename, element.enLabel);
+                } else {
+                    data = data.replace(rolename, element.label);
+                }
+            });
+            const deviceName = member.deviceName ? '-' + member.deviceName : '';
+            const memberName = member.name ? '-' + member.name : '';
+            return data + deviceName + memberName;
+        },
+        doCreate() {
+
+        },
+        doClose() {
+            this.dialogVisible = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chatTooltip{
+    position: absolute;
+    width: 290px;
+    left: 32%;
+    top: 42%;
+    z-index: 5;
+    background: #fff;
+    padding: 15px;
+    box-shadow: #969090 0px 0px 10px;
+    border-radius: 4px;
+    line-height: 20px;
+    transform: translateY(-50%);
+}
+.chatTooltipHeader{
+    margin-top:10px;
+    font-size:14px;
+}
+.chatTooltipBootom{
+    margin-top:10px;
+    text-align: center;
+    margin-bottom:10px;
+}
+.chatTooltipAll{
+    position:absolute;
+    width:100%;
+    height:100%;
+    left:0;
+    top:0;
+    z-index: 10;
+}
+</style>
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index fd84b70da..258768701 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -26,7 +26,7 @@
 
 <script>
 import QrCode from '@/components/QrCode';
-import ChatBox from './chatBox';
+import ChatBox from './chatView/chatBox';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { exitFullscreen } from '@/utils/screen';