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

Merge branch 'main' into zouyf_dev 

# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
This commit is contained in:
“zouyf” 2024-10-19 17:19:09 +08:00
parent 38b17333ab d58dff8731
commit 17e8e43ad4
11 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/index.js
View File

@ -96,6 +96,7 @@ function createMainWindow() {
frame: false, // 无边框 frame: false, // 无边框
autoHideMenuBar: true, autoHideMenuBar: true,
maximizable: false, maximizable: false,
fullscreen: true,
icon: join(__dirname, '../../resources/logo2.ico'), icon: join(__dirname, '../../resources/logo2.ico'),
...(process.platform === 'linux' ? { icon } : {}), ...(process.platform === 'linux' ? { icon } : {}),
webPreferences: { webPreferences: {

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();
} }

15
src/renderer/src/views/classTask/classTaskAssign.vue
View File

@ -15,10 +15,11 @@
<!-- 标题 --> <!-- 标题 -->
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto"> <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
<el-col :span="12" style="padding-left: 20px; text-align: left;"> <el-col :span="12" style="padding-left: 20px; text-align: left;">
<div class="unit-top-left" @click="isCollapse = !isCollapse"> <!-- <div class="unit-top-left" @click="isCollapse = !isCollapse"> -->
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> <div class="unit-top-left">
<span>课程目录</span> <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> <span>作业布置</span>
<!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -147,7 +148,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 +477,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();
} }
@ -906,7 +908,6 @@ watch(() => courseObj.node, (newVal,oldVal) => {
min-height: 100%; min-height: 100%;
} }
.unit-top-left { .unit-top-left {
cursor: pointer;
.icon-xiangzuo { .icon-xiangzuo {
margin-right: 5px; margin-right: 5px;

6
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -217,7 +217,7 @@ const classWorkAnalysisScore = reactive({
// } // }
// ) // )
const openDialog = (data) => { const openDialog = (data) => {
console.log(data, '点击的item答题情况') console.log(data, '点击的item完成情况')
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : '' classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
classWorkAnalysis.worktype = data.worktype classWorkAnalysis.worktype = data.worktype
@ -467,7 +467,7 @@ const getStudentClassWorkDataDetail = (row) => {
} }
}) })
.catch(() => { .catch(() => {
console.log('获取答题情况失败') console.log('获取完成情况失败')
ElMessage({ ElMessage({
type: 'warning', type: 'warning',
message: '未获取到答题信息！' message: '未获取到答题信息！'
@ -479,7 +479,7 @@ const onClassWorkScoreSubmit = () => {
console.log('批改后返回的方法') console.log('批改后返回的方法')
loading_dt_table.value = true loading_dt_table.value = true
isopen_dtwk_table.value = false isopen_dtwk_table.value = false
// 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist // 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
// - 左侧学生列表 // - 左侧学生列表
classWorkAnalysis.classworkdata = [] classWorkAnalysis.classworkdata = []
classWorkAnalysis.activeStudentQuizlist = [] classWorkAnalysis.activeStudentQuizlist = []

20
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -352,6 +352,7 @@ let classWorkForm = reactive({
question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题 question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
}); // 提交的作业内容 }); // 提交的作业内容
// --------------------------------------------------- // ---------------------------------------------------
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型 const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
// 课堂展示------- // 课堂展示-------
@ -655,16 +656,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 {
@ -688,16 +680,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
}) })

2
src/renderer/src/views/classTask/container/quizStats.vue
View File

@ -279,7 +279,7 @@ const getStudentName = id => studentList.value.length && (studentList.value.find
// 获取-选中题 // 获取-选中题
const getActive = ind => activeTopic.value != ind const getActive = ind => activeTopic.value != ind
// 答题情况-点击题 // 完成情况-点击题
const clickInfo = async ind => { const clickInfo = async ind => {
activeTopic.value = activeTopic.value != ind ? ind : 0 activeTopic.value = activeTopic.value != ind ? ind : 0
setTimeout(() => {scrollToElement('collapse-' + ind)}, 300); setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);

10
src/renderer/src/views/classTask/newClassTask.vue
View File

@ -15,11 +15,11 @@
<!-- 标题 --> <!-- 标题 -->
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto"> <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
<el-col :span="12" style="padding-left: 20px; text-align: left;"> <el-col :span="12" style="padding-left: 20px; text-align: left;">
<div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook"> <div v-if="!isOpenLeftBook" class="unit-top-left" @click="onOpenLeftBook">
<i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i> <i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
<span>课程目录</span> <span>作业设计</span>
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> <!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
</div> </div>
<div v-else class="unit-top-left"> <div v-else class="unit-top-left">
<i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i> <i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
@ -114,7 +114,7 @@ const onOpenLeftBook = () => {
proxy.$modal.msgError(`当前为编辑状态不可选择课程！`); proxy.$modal.msgError(`当前为编辑状态不可选择课程！`);
}else{ }else{
// 新增状态 // 新增状态
isCollapse.value = !isCollapse.value // isCollapse.value = !isCollapse.value
} }
} }
// 返回上一页---返回布置页面 // 返回上一页---返回布置页面

11
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -204,7 +204,7 @@ const classWorkAnalysisScore = reactive({
// } // }
// ) // )
const openDialog = (data) => { const openDialog = (data) => {
console.log(data, '点击的item答题情况') console.log(data, '点击的item完成情况')
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : '' classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
classWorkAnalysis.worktype = data.worktype classWorkAnalysis.worktype = data.worktype
@ -459,7 +459,7 @@ const getStudentClassWorkDataDetail = (row) => {
} }
}) })
.catch(() => { .catch(() => {
console.log('获取答题情况失败') console.log('获取完成情况失败')
ElMessage({ ElMessage({
type: 'warning', type: 'warning',
message: '未获取到答题信息！' message: '未获取到答题信息！'
@ -471,7 +471,7 @@ const onClassWorkScoreSubmit = () => {
console.log('批改后返回的方法') console.log('批改后返回的方法')
loading_dt_table.value = true loading_dt_table.value = true
isopen_dtwk_table.value = false isopen_dtwk_table.value = false
// 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist // 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
// - 左侧学生列表 // - 左侧学生列表
classWorkAnalysis.classworkdata = [] classWorkAnalysis.classworkdata = []
classWorkAnalysis.activeStudentQuizlist = [] classWorkAnalysis.activeStudentQuizlist = []
@ -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();
} }

17
src/renderer/src/views/examReport/container/examReview.vue
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>