Merge pull request 'fix:修改个人中心宽度,预约课件删除及时回应;' (#127) from yangws into main

Reviewed-on: #127
This commit is contained in:
yangws 2024-08-14 09:56:10 +08:00
commit e3a04c0add
4 changed files with 10 additions and 7 deletions

View File

@ -17,6 +17,8 @@
v-show="tabActive === '已结束'"
:key="index"
:item="item"
@open-edit="reservDialog.openDialog(item)"
@delete-reserv="deleteReserv(item)"
></reserv-item>
</div>
<reserv ref="reservDialog"></reserv>
@ -51,8 +53,8 @@ const doneDataList = computed(() => {
})
const toolStore = useToolState()
watch(
() => toolStore.isToolWin,
(newD, oldD) => {
() => [dataList,toolStore.isToolWin],
() => {
getSelfReserv().then((res) => {
dataList.value = [...res.data]
})

View File

@ -232,7 +232,7 @@ export default {
this.isOpenHomework = false
})
},
// activated() {
// if (this.uploadData.textbookId !== null) {
@ -427,7 +427,7 @@ export default {
await this.asyncAllFile()
},
async initHomeWork() {
if (this.uploadData.levelSecondId) {
// ID
let { rows } = await this.getChapterId()
@ -596,6 +596,7 @@ export default {
// -
openLesson() {
const toolStore = useToolState()
console.log(toolStore.isToolWin,'toolStore.isToolWin')
if (toolStore.isToolWin) return this.$message.error('您当前已开始上课,请勿重复操作')
startClass(this.curClassReserv.id)
createWindow('tool-sphere', {

View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-row :gutter="20" style="display: flex;flex-wrap: nowrap;justify-content: start">
<el-col :xs="24" style="min-width: 260px;max-width: 260px">
<el-card class="box-card">
<template v-slot:header>
<div class="clearfix">

View File

@ -139,4 +139,4 @@ const clickHandel = (o, e) => {
color: red;
}
</style>
</style>