Merge pull request 'fix:修改个人中心宽度,预约课件删除及时回应;' (#127) from yangws into main
Reviewed-on: #127
This commit is contained in:
commit
e3a04c0add
|
@ -17,6 +17,8 @@
|
||||||
v-show="tabActive === '已结束'"
|
v-show="tabActive === '已结束'"
|
||||||
:key="index"
|
:key="index"
|
||||||
:item="item"
|
:item="item"
|
||||||
|
@open-edit="reservDialog.openDialog(item)"
|
||||||
|
@delete-reserv="deleteReserv(item)"
|
||||||
></reserv-item>
|
></reserv-item>
|
||||||
</div>
|
</div>
|
||||||
<reserv ref="reservDialog"></reserv>
|
<reserv ref="reservDialog"></reserv>
|
||||||
|
@ -51,8 +53,8 @@ const doneDataList = computed(() => {
|
||||||
})
|
})
|
||||||
const toolStore = useToolState()
|
const toolStore = useToolState()
|
||||||
watch(
|
watch(
|
||||||
() => toolStore.isToolWin,
|
() => [dataList,toolStore.isToolWin],
|
||||||
(newD, oldD) => {
|
() => {
|
||||||
getSelfReserv().then((res) => {
|
getSelfReserv().then((res) => {
|
||||||
dataList.value = [...res.data]
|
dataList.value = [...res.data]
|
||||||
})
|
})
|
||||||
|
|
|
@ -232,7 +232,7 @@ export default {
|
||||||
this.isOpenHomework = false
|
this.isOpenHomework = false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
// activated() {
|
// activated() {
|
||||||
// if (this.uploadData.textbookId !== null) {
|
// if (this.uploadData.textbookId !== null) {
|
||||||
|
@ -427,7 +427,7 @@ export default {
|
||||||
await this.asyncAllFile()
|
await this.asyncAllFile()
|
||||||
},
|
},
|
||||||
async initHomeWork() {
|
async initHomeWork() {
|
||||||
|
|
||||||
if (this.uploadData.levelSecondId) {
|
if (this.uploadData.levelSecondId) {
|
||||||
// 获取作业列表所需ID 可能存在没有
|
// 获取作业列表所需ID 可能存在没有
|
||||||
let { rows } = await this.getChapterId()
|
let { rows } = await this.getChapterId()
|
||||||
|
@ -596,6 +596,7 @@ export default {
|
||||||
// 上课-工具类悬浮
|
// 上课-工具类悬浮
|
||||||
openLesson() {
|
openLesson() {
|
||||||
const toolStore = useToolState()
|
const toolStore = useToolState()
|
||||||
|
console.log(toolStore.isToolWin,'toolStore.isToolWin')
|
||||||
if (toolStore.isToolWin) return this.$message.error('您当前已开始上课,请勿重复操作')
|
if (toolStore.isToolWin) return this.$message.error('您当前已开始上课,请勿重复操作')
|
||||||
startClass(this.curClassReserv.id)
|
startClass(this.curClassReserv.id)
|
||||||
createWindow('tool-sphere', {
|
createWindow('tool-sphere', {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20" style="display: flex;flex-wrap: nowrap;justify-content: start">
|
||||||
<el-col :span="6" :xs="24">
|
<el-col :xs="24" style="min-width: 260px;max-width: 260px">
|
||||||
<el-card class="box-card">
|
<el-card class="box-card">
|
||||||
<template v-slot:header>
|
<template v-slot:header>
|
||||||
<div class="clearfix">
|
<div class="clearfix">
|
||||||
|
|
|
@ -139,4 +139,4 @@ const clickHandel = (o, e) => {
|
||||||
color: red;
|
color: red;
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue