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

Reviewed-on: #235
This commit is contained in:
zhengdegang 2024-09-20 14:57:41 +08:00
commit 928a1401db
2 changed files with 5 additions and 1 deletions

View File

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

View File

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