From cc8b7003280a58ba4c90808f0ad4496e4804ccde Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 18 May 2020 15:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=BD=95=E5=88=B6=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4=20=E9=80=80=E5=87=BA=E5=89=A7?=
 =?UTF-8?q?=E6=9C=AC=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/newMap/displayNew/chatView/chatBox.vue  |  5 ++++-
 src/views/newMap/displayNew/designIndex.vue       |  1 -
 src/views/newMap/displayNew/menuDemon.vue         |  2 ++
 src/views/scriptManage/scriptRecord/addAction.vue | 15 ++++++++++++---
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue
index e12fca1d9..a9b079620 100644
--- a/src/views/newMap/displayNew/chatView/chatBox.vue
+++ b/src/views/newMap/displayNew/chatView/chatBox.vue
@@ -81,7 +81,7 @@ export default {
                 language:'zh',
                 sex:'1'
             },
-            headerTitle:'所有人'
+            headerTitle:''
         };
     },
     watch: {
@@ -134,6 +134,9 @@ export default {
         },
         setCurrentCoversition(coversition) {
             this.currentCoversition = coversition;
+            if (coversition.group) {
+                this.headerTitle = coversition.name;
+            }
             if (this.recordSending) {
                 this.cancleRecording();
             }
diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue
index f6ed7bdb6..8ffb148e0 100644
--- a/src/views/newMap/displayNew/designIndex.vue
+++ b/src/views/newMap/displayNew/designIndex.vue
@@ -338,7 +338,6 @@ export default {
                     }
                     if (this.drawWay) {
                         scriptExecuteNew(this.group).then(data=>{
-                            this.$refs.menuDemon.clearAllData();
                         }).catch(error=>{
                             console.log(error);
                         });
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 956486d99..5ecee252f 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -233,6 +233,7 @@ export default {
                         getSimulationInfoNew(this.group).then(()=>{
                             this.$emit('quitQuest');
                             this.initLoadPage();
+                            this.clearAllData();
                         }).catch(()=>{
                             this.$messageBox(this.$t('display.demon.exitTaskFail'));
                         });
@@ -247,6 +248,7 @@ export default {
                     getSimulationInfoNew(this.group).then(()=>{
                         this.$emit('quitQuest');
                         this.initLoadPage();
+                        this.clearAllData();
                     }).catch(()=>{
                         this.$messageBox(this.$t('display.demon.exitTaskFail'));
                     });
diff --git a/src/views/scriptManage/scriptRecord/addAction.vue b/src/views/scriptManage/scriptRecord/addAction.vue
index 31d3eeb55..83e0ab83b 100644
--- a/src/views/scriptManage/scriptRecord/addAction.vue
+++ b/src/views/scriptManage/scriptRecord/addAction.vue
@@ -201,7 +201,7 @@ export default {
                 this.$refs['commandDataNew'].clearValidate();
                 if (!val) {
                     this.initActionData();
-                    this.initCommandActionData();
+                    this.clearCommand();
                 }
             } else {
                 this.$refs['commandData'].clearValidate();
@@ -236,7 +236,7 @@ export default {
                     const lastData = JSON.stringify(resp.data);
                     this.memberList = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
                     this.resetDisabled();
-                    this.initCommandActionData();
+                    this.clearCommand();
                 }).catch(error => {
                     this.$message(error.message);
                 });
@@ -363,6 +363,9 @@ export default {
         changeMember(member) {
             if (member) {
                 this.messageTips1 = '';
+                this.executeCommandName = '';
+                this.commandDataNew.action.operationType = '';
+                this.commandDataNew.action.operationParamMap = {};
             }
         },
         addCommandActionNew() {
@@ -376,12 +379,12 @@ export default {
                 this.messageTips2 = '请在右侧的地图中选择操作';
                 return false;
             } else {
-                debugger;
                 const group = this.group;
                 const data = this.commandDataNew.action;
                 this.adding = true;
                 addScriptActionNew(group, data).then(response=>{
                     this.adding = false;
+                    this.clearCommand();
                     this.$message.success(this.$t('scriptRecord.addCommandSucess'));
                     this.$emit('create');
                 }).catch(error => {
@@ -390,6 +393,12 @@ export default {
                 });
             }
         },
+        clearCommand() {
+            this.commandDataNew.action.memberId = '';
+            this.executeCommandName = '';
+            this.commandDataNew.action.operationType = '';
+            this.commandDataNew.action.operationParamMap = {};
+        },
         addScriptActionInfo(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {