From 09f78e906432630524435110ad07afe7c99705c7 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 7 Sep 2022 18:11:50 +0800
Subject: [PATCH] =?UTF-8?q?=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/trainingManage/demonMenu.vue     | 11 +++++-
 src/views/trainingManage/editCondition.vue | 43 +++++++++++-----------
 src/views/trainingManage/trainingList.vue  |  1 +
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue
index 69ecaf11c..3f8aa49db 100644
--- a/src/views/trainingManage/demonMenu.vue
+++ b/src/views/trainingManage/demonMenu.vue
@@ -7,7 +7,7 @@
         <el-button size="small" @click="showList">实训列表</el-button>
       </el-button-group>
     </div>
-    <TrainingList ref="trainingList" @updateDetails="updateDetails" @gradeRules="gradeRules" />
+    <TrainingList ref="trainingList" @updateDetails="updateDetails" @gradeRules="gradeRules" @closeAllDialog="closeAllDialog" />
     <EditDetails ref="editDetails" :edit-data="editData" @openEditOperate="openEditOperate" @handleCondition="handleCondition" @publish="publish" @preview="preview" />
     <EditCondition ref="editCondition" v-dialogDrag :materials-list="materialsList" @editConditionFn="editConditionFn" @backStep="backStep" />
     <edit-operate ref="editOperate" v-dialogDrag @backStepList="backStepList" />
@@ -45,6 +45,7 @@ export default {
             hoverBtn: false,
             btnWidth: -600,
             materialsList: [],
+            refsList: ['editDetails', 'editCondition'],
             editData: {},
             isAdmin: true
         };
@@ -107,8 +108,16 @@ export default {
         },
         updateDetails(data) {
             this.editData = data;
+            this.closeAllDialog('editDetails');
             this.$refs.editDetails.doShow(data);
         },
+        closeAllDialog(noCloseName) {
+            this.refsList.forEach(key => {
+                if (key != noCloseName && this.$refs[key]) {
+                    this.$refs[key].doClose();
+                }
+            });
+        },
         openEditOperate(data) {
             console.log(data, '***');
             this.$refs.editOperate.doShow(data);
diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue
index 2140adde4..8a05ee87f 100644
--- a/src/views/trainingManage/editCondition.vue
+++ b/src/views/trainingManage/editCondition.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <div class="conditionTab">
+    <!-- <div class="conditionTab">
       <div v-if="tabVisible" class="conditionTabLable" @click="minisize">
         <span class="titleStyle">{{ title }}</span>
       </div>
-    </div>
+    </div> -->
     <el-dialog :title="title" :visible.sync="dialogVisible" :width="dialogWidth" :modal="false" :close-on-click-modal="false" :before-close="doClose" center :style="{'margin-left': dialogMarginLeft + 'px'}">
       <div @click="editValue(null, '')">
         <div>
@@ -244,27 +244,28 @@ export default {
 	left: auto;
 	overflow: visible !important;
 }
-.conditionTab{
-    position: absolute;
-    z-index: 10;
-	right: 12px;
-	top: calc(45% + 200px);
-}
-.conditionTabLable{
-    position: absolute;
-    background: #fff;
-    border-radius: 5px 0px 0px 5px ;
-    padding: 5px 0px;
-    width: 23px;
-    text-align: center;
-    left: 50%;
-    transform: translateX(-50%);
-    cursor: pointer;
-    top:-28px;
-}
+// .conditionTab{
+//     position: absolute;
+//     z-index: 10;
+// 	right: 12px;
+// 	top: calc(45% + 200px);
+// }
+// .conditionTabLable{
+//     position: absolute;
+//     background: #fff;
+//     border-radius: 5px 0px 0px 5px ;
+//     padding: 5px 0px;
+//     width: 23px;
+//     text-align: center;
+//     left: 50%;
+//     transform: translateX(-50%);
+//     cursor: pointer;
+//     top:-28px;
+// }
 .nullDiv {
 	width: 100%;
-	height: 100%;
+	height: 28px;
+	line-height: 28px;
 	cursor: pointer;
 	color: #ccc;
 }
diff --git a/src/views/trainingManage/trainingList.vue b/src/views/trainingManage/trainingList.vue
index 725239f5a..7ff77225f 100644
--- a/src/views/trainingManage/trainingList.vue
+++ b/src/views/trainingManage/trainingList.vue
@@ -285,6 +285,7 @@ export default {
                         this.$store.dispatch('training/setRoles', member.type);
                     }
                 }
+                this.$emit('closeAllDialog');
                 this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
                 await loadDraftTraining(this.group, data.id, {mode: this.teachMode});
                 this.$message.success('加载实训成功！');