From 43207730bfa6de7d0dfff4a913591cd438ace727 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 21 Aug 2020 14:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E4=BB=BF=E7=9C=9F=E4=BB=A3?=
 =?UTF-8?q?=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/newMap/displayNew/demonChat.vue       | 17 ++++++++++-------
 src/views/newMap/displayNew/menuDemon.vue       |  1 +
 .../scriptDisplay/scriptPreview/index.vue       | 14 ++++++++------
 .../scriptPreview/scriptPreviewChat.vue         |  1 -
 src/views/scriptManage/addScriptMember.vue      |  6 +++---
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue
index 12c6f3716..08c5831e6 100644
--- a/src/views/newMap/displayNew/demonChat.vue
+++ b/src/views/newMap/displayNew/demonChat.vue
@@ -63,6 +63,7 @@ export default {
     },
     computed:{
         isShow() {
+            debugger;
             return this.userRole != '' &&
              this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' &&
             !this.isHasCoversition && this.createCoversition;
@@ -324,21 +325,23 @@ export default {
         },
         clearAllData() {
             this.resetCoversition();
-            this.createCoversition = false;
+            this.createCoversition = true;
             this.$refs.scriptTip.resetScriptTip();
         },
         setMembers(roleId) {
             this.memberData.map(member=>{
-                if (member.userId) {
-                    member.userId = '';
-                    member.name = '';
-                    member.disabled = false;
-                }
                 if (member.id == roleId) {
                     member.userId = this.$store.state.user.id;
-                    member.name = this.$store.state.user.nickname;
+                    member.userName = this.$store.state.user.nickname;
                     member.disabled = true;
+                } else {
+                    member.userId = '';
+                    member.userName = '';
+                    member.disabled = false;
                 }
+                const userName = member.userName ? '-' + member.userName : '';
+                const name = member.name == undefined ? '' : '-' + member.name;
+                member.label = member.type + member.deviceName + name + userName;
             });
         },
         resetCoversition() {
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index fc03c927e..32ca04b17 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -358,6 +358,7 @@ export default {
         quitQuest() {
             this.isScriptRun = false;
             let userRole = '';
+            debugger;
             if (this.$route.query.prdType) {
                 if (this.$route.query.prdType == '02') {
                     userRole = 'DISPATCHER';
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
index 35d860c24..96fe6c042 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
@@ -214,12 +214,14 @@ export default {
                     this.userRole = 'AUDIENCE';
                     this.$store.dispatch('training/setRoles', 'AUDIENCE');
                     this.memberData.map(member=>{
-                        member.userId = '';
-                        member.userName = '';
-                        member.disabled = false;
-                        const userName = member.userName ? '-' + member.userName : '';
-                        const name = member.name == undefined ? '' : '-' + member.name;
-                        member.label = member.type + member.deviceName + name + userName;
+                        if (member.userId) {
+                            member.userId = '';
+                            member.userName = '';
+                            member.disabled = false;
+                            const userName = member.userName ? '-' + member.userName : '';
+                            const name = member.name == undefined ? '' : '-' + member.name;
+                            member.label = member.type + member.deviceName + name + userName;
+                        }
                     });
                     this.switchMode('');
                 }
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
index 6b70a09cf..94474fa85 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
@@ -70,7 +70,6 @@ export default {
     watch:{
         // 创建会话
         '$store.state.socket.createConversition':function(val) {
-            debugger;
             if (this.memberData.length > 0) {
                 const member = this.memberData.find(member=>{ return member.id == val.creatorId; });
                 if (member && member.userId == this.$store.state.user.id) {
diff --git a/src/views/scriptManage/addScriptMember.vue b/src/views/scriptManage/addScriptMember.vue
index c69957d0e..e19a73790 100644
--- a/src/views/scriptManage/addScriptMember.vue
+++ b/src/views/scriptManage/addScriptMember.vue
@@ -45,10 +45,10 @@ export default {
             rules: {
                 type: [
                     { required: true, message: '请选择成员类型', trigger: 'change' }
-                ],
-                name:[
-                    { required: true, message: '请输入成员名称', trigger: 'blur' }
                 ]
+                // name:[
+                //     { required: true, message: '请输入成员名称', trigger: 'blur' }
+                // ]
             },
             typeList: [{label: '行调', value: 'DISPATCHER'}, {label: '通号', value: 'MAINTAINER'}]
         };