zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' into zhuhao_dev 

# Conflicts:
#	src/renderer/src/views/classTask/classTaskAssign.vue
#	src/renderer/src/views/classTask/teachClassTask.vue
This commit is contained in:
朱浩 2024-10-19 16:42:36 +08:00
parent 68de31c569 8dba05c0d4
commit 6fe5ee5703
7 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/public/pdfjs-dist/web/pdfjs-qinqing-custome/pdfjs-qinqing-custome.js
View File

File diff suppressed because one or more lines are too long

5
src/renderer/src/views/classTask/classTask.vue
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();
} }

5
src/renderer/src/views/classTask/classTaskAssign.vue
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();
} }

19
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
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
}) })

5
src/renderer/src/views/classTask/teachClassTask.vue
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)

3
src/renderer/src/views/desktop/container/work-trend.vue
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();
} }

49
src/renderer/src/views/examReport/container/examReview.vue
View File

@ -19,22 +19,29 @@
<!-- 试题详情 --> <!-- 试题详情 -->
<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%">
<el-row class="drawer-main"> <div style="height: calc(100% - 50px);">
<el-col :span="24"> <el-scrollbar style="background: #e9e9e9;border-radius: 8px;">
<span>{{activeExam.worktag}}</span> <el-row class="drawer-main">
<span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span> <el-col :span="24">
</el-col> <span>{{activeExam.worktag}}</span>
<el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat"> <span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span>
</el-col> </el-col>
<el-col :span="3" class="drawer-main-col"><em>【答案】</em></el-col> <el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat">
<el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col> </el-col>
<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.method"></el-col> <el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col>
<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.analyse"></el-col> <el-col :span="20" class="drawer-main-col" v-html="activeExam.method"></el-col>
<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.analyse"></el-col>
</el-row> <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-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>