From 17a18eb328745781193dff4b61fb0331ea14e7c8 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 14 Oct 2020 17:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=20=E5=AE=9E=E6=93=8D=20?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/competition.js                        | 16 ++++---------
 src/views/newMap/chatView/chatBox.vue         | 23 ++++++++++---------
 .../displayNew/dispatherContest/index.vue     |  3 ++-
 .../dispatherContest/operationalStatistic.vue |  4 ++--
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/api/competition.js b/src/api/competition.js
index bcb1e5145..194d0d9d9 100644
--- a/src/api/competition.js
+++ b/src/api/competition.js
@@ -343,11 +343,12 @@ export function competitionPracticalSceneExit(group) {
     });
 }
 
-/** 退出场景 */
-export function competitionPracticalSceneFinish(group) {
+/** 结束场景 */
+export function competitionPracticalSceneFinish(group, data) {
     return request({
         url: `/api/v1/competitionPractical/finish/${group}`,
-        method: 'PUT'
+        method: 'PUT',
+        data
     });
 }
 
@@ -359,12 +360,3 @@ export function getEmptyOperationalStatistics(group) {
     });
 }
 
-/** 提交运营数据 */
-export function submitOperationalStatistics(group, data) {
-    return request({
-        url: `/api/v1/competitionPractical/detail/os/${group}`,
-        method: 'PUT',
-        data
-    });
-}
-
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index ee4b657f8..6b81d8dfc 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -300,17 +300,6 @@ export default {
             this.filterNode();
             if (activeTrainList.length <= 0) {
                 this.resetCoversition();
-                this.treeData.forEach(item => {
-                    if (item.children) {
-                        const memberList = Object.values(item.children);
-                        memberList.forEach(data =>{
-                            data.active = false;
-                            data.isConnect = false;
-                            data.loading = false;
-                            data.disabled = false;
-                        });
-                    }
-                });
             }
             // if (this.$refs.tree) {
             //     this.$refs.tree.filter(this.queryMember);
@@ -941,6 +930,18 @@ export default {
             this.commonMessageList = [];
             this.conversitionStateMap = {};
             this.messageList = this.commonMessageList;
+            this.treeData.forEach(item => {
+                if (item.children) {
+                    const memberList = Object.values(item.children);
+                    memberList.forEach(data =>{
+                        data.active = false;
+                        data.isConnect = false;
+                        data.loading = false;
+                        data.disabled = false;
+                        data.isInviting = false;
+                    });
+                }
+            });
         }
     }
 };
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index 959c1a1d3..66301c45a 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -395,6 +395,7 @@ export default {
                     this.$store.dispatch('scriptRecord/updateOperationalItemVOs', {});
                     this.quitQuest();
                     // this.initLoadPage();
+                    this.isScriptRun = false;
                     this.clearAllData();
                     this.$store.dispatch('scriptRecord/updateBgSet', false);
                 }).catch(()=>{
@@ -463,7 +464,7 @@ export default {
             this.runScriptMode(memberId);
         },
         endTraining() {
-            competitionPracticalSceneFinish(this.group).then(res=>{
+            competitionPracticalSceneFinish(this.group, {operationStatisticVO:{}}).then(res=>{
                 this.isScriptRun = false;
                 // if (this.scriptMode == ScriptMode.TEST) {
                 this.formatScore = res.data;
diff --git a/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
index 2ffa9eaf7..e2770d056 100644
--- a/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
+++ b/src/views/newMap/displayNew/dispatherContest/operationalStatistic.vue
@@ -28,7 +28,7 @@
   </el-dialog>
 </template>
 <script>
-import { submitOperationalStatistics} from '@/api/competition';
+import { competitionPracticalSceneFinish} from '@/api/competition';
 export default {
     name:'OperationalStatistics',
     data() {
@@ -76,7 +76,7 @@ export default {
             if (!result) {
                 this.$messageBox('请填写表单');
             } else {
-                submitOperationalStatistics(this.$route.query.group, this.resultData).then(res=>{
+                competitionPracticalSceneFinish(this.$route.query.group, this.resultData).then(res=>{
                     this.$message.success('运营统计数据提交成功');
                     this.$store.dispatch('scriptRecord/updateOperationalItemVOs', this.resultData.itemVOS);
                     this.dialogShow = false;