zhuhao_dev #342

Merged
zhuhao merged 7 commits from zhuhao_dev into main 2024-10-19 17:34:05 +08:00
7 changed files with 43 additions and 47 deletions
Showing only changes of commit 6fe5ee5703 - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -237,7 +237,7 @@ const getStudentClassWorkData = async() => {
// deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,// // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
// deaddate: EndDate.value,// // deaddate: EndDate.value,//
// //status: '1', // 1- // //status: '1', // 1-
// orderby: "deaddate DESC",// TODO deaddate // orderby: "deaddate DESC",//
// pageSize: 1000, // pageSize: 1000,
// }) // })
@ -401,7 +401,8 @@ const onClickItem = (item) => {
clearInterval(pollingST.value) clearInterval(pollingST.value)
console.log('防抖开启弹窗') console.log('防抖开启弹窗')
sessionStore.set('teachClassWorkItem', item); // item // sessionStore.set('teachClassWorkItem', item); // item
localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
debounceOpenWin(); debounceOpenWin();
} }

View File

@ -147,7 +147,7 @@
</template> </template>
</div> </div>
</div> </div>
<!-- TODO 课堂展示 常规作业 预览待开发--> <!-- TODO 课堂展示 预览待开发-->
<!-- 常规作业包含多个格式图片略缩图展示点击放大其他附件跳转另外弹窗查看 --> <!-- 常规作业包含多个格式图片略缩图展示点击放大其他附件跳转另外弹窗查看 -->
<div v-if="currentTag=='常规作业'" :style="{'padding': '15px', 'overflow': 'auto'}"> <div v-if="currentTag=='常规作业'" :style="{'padding': '15px', 'overflow': 'auto'}">
<div style="margin: 5px; background-color: white"> <div style="margin: 5px; background-color: white">
@ -476,7 +476,8 @@ const debounceOpenWin = debounce(() => {
// //
const onClickItem = (item) => { const onClickItem = (item) => {
console.log('防抖开启弹窗') console.log('防抖开启弹窗')
sessionStore.set('teachClassWorkItem', item); // item // sessionStore.set('teachClassWorkItem', item); // item
localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
debounceOpenWin(); debounceOpenWin();
} }

View File

@ -652,16 +652,7 @@ const handleClassWorkSave = async () => {
// //
classWorkForm.chooseWorkLists = []; // list classWorkForm.chooseWorkLists = []; // list
classWorkForm.whiteboardObj = ''; // ? // classWorkForm.whiteboardObj = ''; // ? //
// refresh the list
//
// this.getClassWorkAllList();
// TODO
//TODO 3
// this.newWorkSpace = false;
// this.newWorkSpaceEdit = false;
// this.workEdit = false;
boardLoading.value = false boardLoading.value = false
}) })
} finally { } finally {
@ -685,16 +676,6 @@ const handleClassWorkSave = async () => {
classWorkForm.chooseWorkLists = []; // list classWorkForm.chooseWorkLists = []; // list
classWorkForm.whiteboardObj = ''; // ? // classWorkForm.whiteboardObj = ''; // ? //
classWorkForm.fileHomeworkList = []; // list classWorkForm.fileHomeworkList = []; // list
// refresh the list
//
// this.getClassWorkAllList();
// TODO
//TODO 3
// this.newWorkSpace = false;
// this.newWorkSpaceEdit = false;
// this.workEdit = false;
fileLoading.value = false fileLoading.value = false
}) })

View File

@ -634,8 +634,9 @@ const closeDialog = () => {
onMounted(() => { onMounted(() => {
// const data = JSON.parse(localStorage.getItem('teachClassWorkItem')); const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
const data = sessionStore.get('teachClassWorkItem'); // const data = sessionStore.get('teachClassWorkItem');
// const data = localStorage.getItem('teachClassWorkItem');
console.log(data,'????????????????????' ) console.log(data,'????????????????????' )
if(data){ if(data){
openDialog(data) openDialog(data)

View File

@ -96,7 +96,8 @@ const debounceOpenWin = debounce(() => {
// //
const onClickItem = (item) => { const onClickItem = (item) => {
console.log('防抖开启弹窗') console.log('防抖开启弹窗')
sessionStore.set('teachClassWorkItem', item); // item // sessionStore.set('teachClassWorkItem', item); // item
localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
debounceOpenWin(); debounceOpenWin();
} }

View File

@ -19,6 +19,8 @@
<!-- 试题详情 --> <!-- 试题详情 -->
<el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%"> <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
<div style="height: calc(100% - 50px);">
<el-scrollbar style="background: #e9e9e9;border-radius: 8px;">
<el-row class="drawer-main"> <el-row class="drawer-main">
<el-col :span="24"> <el-col :span="24">
<span>{{activeExam.worktag}}</span> <span>{{activeExam.worktag}}</span>
@ -35,6 +37,11 @@
<el-col :span="3" class="drawer-main-col" ><em>点评</em></el-col> <el-col :span="3" class="drawer-main-col" ><em>点评</em></el-col>
<el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col> <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
</el-row> </el-row>
</el-scrollbar>
</div>
<div class="drawer-footer">
<el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
</div>
</el-drawer> </el-drawer>
</template> </template>
@ -89,13 +96,17 @@ const showExamAnalyseDrawer = (row) => {
.drawer-main{ .drawer-main{
margin: 1%; margin: 1%;
padding: 1% 2%; padding: 2%;
border: 2px dotted;
display: flex; display: flex;
text-align: left; text-align: left;
.drawer-main-col{ .drawer-main-col{
padding: 10px 0px; padding: 10px 0px;
} }
} }
.drawer-footer{
padding-top: 15px;
display: flex;
justify-content: flex-end;
box-sizing: border-box;
}
</style> </style>