From 7df417424efcf65b84c8d9a40080f5ba9c9c8221 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 1 Apr 2020 09:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=AC=E5=9C=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BF=AB=E9=80=9F=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demonstration/deomonList/index_HYD.vue    | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/views/demonstration/deomonList/index_HYD.vue b/src/views/demonstration/deomonList/index_HYD.vue
index 3683df2d8..3eb3760da 100644
--- a/src/views/demonstration/deomonList/index_HYD.vue
+++ b/src/views/demonstration/deomonList/index_HYD.vue
@@ -20,7 +20,6 @@
         :props="defaultProps"
         :filter-node-method="filterNode"
         :style="{height: height+'px'}"
-        @node-click="clickEvent"
       >
         <div slot-scope="{ node, data }" class="list-elem custom-tree-node">
           <span v-if="data.state=='01'">{{ '['+data.mapName+']'+($t('global.trainingNotStart').replace('{name}', data.creator.nickName)) }}</span>
@@ -37,14 +36,13 @@
       slot="footer"
       class="dialog-footer"
     >
-      <el-button v-loading="loading" type="primary" :disabled="!group" @click="handleJoin">{{ $t('global.joinNewRoom') }}</el-button>
+      <el-button v-loading="loading" type="primary" @click="handleJoin">{{ $t('global.joinNewRoom') }}</el-button>
       <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { getjointTrainList, getjointTraining, putJointTrainingSimulationEntrance } from '@/api/chat';
 import { getjointTrainListNew, putJointTrainingSimulationEntranceNew, getjointTrainingNew } from '@/api/jointTraining';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import { launchFullscreen } from '@/utils/screen';
@@ -60,8 +58,6 @@ export default {
                 label: 'roomName'
             },
             group: '',
-            state: '',
-            mapId: '',
             loading: false,
             pageLoading: false
         };
@@ -85,11 +81,6 @@ export default {
             if (!value) return true;
             return data.label.indexOf(value) !== -1;
         },
-        clickEvent(obj, node, data) {
-            this.state = obj.state;
-            this.group = obj.group;
-            this.mapId = obj.mapId;
-        },
         async doShow() {
             try {
                 this.pageLoading = true;
@@ -97,15 +88,6 @@ export default {
                 this.loading = false;
                 const resp = await getjointTrainListNew();
                 this.trainingList = resp.data || [];
-                this.$nextTick(() => {
-                    var training = this.trainingList[0] || {};
-                    if (training) {
-                        this.state = training.state;
-                        this.group = training.group;
-                        this.mapId = training.mapId;
-                        this.$refs.tree.setCurrentKey(this.group);
-                    }
-                });
             } catch (e) {
                 console.error(e);
             } finally {
@@ -117,15 +99,15 @@ export default {
         },
         async handleJoinRoom(data) {
             try {
-                const rest = await getPublishMapInfo(this.mapId);
+                const rest = await getPublishMapInfo(data.mapId);
                 await getjointTrainingNew(data.group);
                 if (data.state == '02') {
                     launchFullscreen();
-                    const query = { lineCode: rest.data.lineCode, mapId: this.mapId, group: this.group, drawWay: true };
-                    await putJointTrainingSimulationEntranceNew(this.group);
+                    const query = { lineCode: rest.data.lineCode, mapId: data.mapId, group: data.group, drawWay: true };
+                    await putJointTrainingSimulationEntranceNew(data.group);
                     this.$router.push({ path: `/jointTrainingNew`, query: query });
                 } else if (data.state == '01') {
-                    const query = { group: this.group, drawWay: true };
+                    const query = { group: data.group, drawWay: true };
                     this.$router.push({ path: `/trainroom`, query: query });
                 }
             } catch (e) {