Merge pull request 'zdg' (#235) from zdg into main

Reviewed-on: #235

src/renderer/src/views/prepare/container/reserv.vue

@@ -86,7 +86,7 @@ import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 import { getCurrentTime, getAfterMinutes } from '@/utils/date'
 
-const emit = defineEmits(['addSuccess'])
+const emit = defineEmits(['addSuccess','close'])
 const props = defineProps({
   bookId: {
     type: Number,
@@ -217,6 +217,8 @@ const closeDialog = () => {
   ruleFormDialog.value.resetFields()
   centerDialogVisible.value = false
   form.name = props.currentNode.label
+  emit('close')
+
 }
 const classList = ref([])
 onMounted(() => {

src/renderer/src/views/prepare/index.vue

@@ -158,6 +158,7 @@
     :current-node="currentNode"
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
+    @close="closeChange"
   ></reserv>
   <!-- 上课配置 -->
   <class-start ref="calssRef" @close="closeChange"/>
@@ -319,6 +320,7 @@ export default {
       this.activeClass = item
     },
     closeChange() { // 上课弹窗被关闭-触发
+      console.log('关闭上课弹窗')
       this.activeClass = null
       sessionStore.delete('activeClass')
     },