Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

SanHQin 11 months ago
parent
commit
4b7d3de540

+ 8 - 6
src/components/pages/classroomObservation/components/messageArea.vue

@@ -36,7 +36,7 @@
 			/>
 			<!-- <div style="height: 10000px;"></div> -->
 		</div>
-		<el-dialog :center="true" :visible.sync="dialogVisible" width="1200px">
+		<el-dialog :visible.sync="dialogVisible" width="1200px" close-on-click-modal="true" :before-close="handleClose">
 			<!-- <div v-if="showDialog == true" class="a-dialog" v-el-drag-dialog> -->
 			<div class="a-d-top">
 				<div class="a-d-topTit"><div style="width: 136px">添加模块</div></div>
@@ -150,6 +150,7 @@ export default {
 			showBrief: true, //是否显示模块简介
 			dialogVisible: false,
 			tagIndex: 0,
+			input2:'',
 			dialogTagList: [
 				{ id: 1, name: "通用课堂分析" },
 				{ id: 2, name: "学科课堂分析" },
@@ -818,11 +819,12 @@ BSCS 5E教学模型是一种广泛应用于科学教育的教学策略,它鼓
 			this.tagIndex = val;
 		},
 		handleClose(done) {
-			this.$confirm("确认关闭?")
-				.then((_) => {
-					done();
-				})
-				.catch((_) => {});
+			// this.$confirm("确认关闭?")
+			// 	.then((_) => {
+			// 		done();
+			// 	})
+			// 	.catch((_) => {});
+			this.dialogVisible = false;
 		},
 		// 切换显示模板简介
 		changeShowBrief(newValue) {