zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2024-12-20 11:18:00 +08:00
parent 8e0b9f72d5 6dbd140f80
commit 795c4d82c7
6 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/renderer/src/layout/components/Aside.vue
View File

@ -84,7 +84,7 @@ const isStadium = () => {
const headerMenus = isStadium() ?[{
name: '教学实践',
id: 4,
id: 6,
icon: 'icon-jiaoxueshijian',
path: '/prepare'
},]:[
@ -94,12 +94,12 @@ const headerMenus = isStadium() ?[{
icon: 'icon-shouye',
path: '/model/index'
},
{
name: '教学工作台',
id: 2,
icon: 'icon-gongzuotai',
path: '/desktop'
},
// {
// name: '教学工作台',
// id: 2,
// icon: 'icon-gongzuotai',
// path: '/desktop'
// },
{
name: '教学实践',
id: 4,

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

@ -141,7 +141,8 @@
v-if="
dialogProps.studentObj.worktype == '常规作业' ||
dialogProps.studentObj.worktype == '课堂展示' ||
dialogProps.studentObj.worktype == '框架梳理'
dialogProps.studentObj.worktype == '框架梳理' ||
dialogProps.studentObj.worktype == '科学实验'
"
>
<div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
@ -157,7 +158,8 @@
v-if="
dialogProps.studentObj.worktype == '常规作业' ||
dialogProps.studentObj.worktype == '课堂展示' ||
dialogProps.studentObj.worktype == '框架梳理'
dialogProps.studentObj.worktype == '框架梳理' ||
dialogProps.studentObj.worktype == '科学实验'
"
>
<!-- 文件内容格式：mp3/mp4/doc/docx/excel/pdf/ppt/pptx/jpg/jpeg/gif/png/txt ->
@ -210,7 +212,13 @@
<!-- 学生答题展示 -->
<div v-if="feedContentList.length > 0">
<div v-if="dialogProps.studentObj.worktype == '常规作业' && stuItem.rightanswer != ''&& stuItem.rightanswer != null">
<div
v-if="
(dialogProps.studentObj.worktype == '常规作业' || dialogProps.studentObj.worktype == '科学实验') &&
stuItem.rightanswer != '' &&
stuItem.rightanswer != null
"
>
<!-- 常规作业：学生有的会答复 -->
<p style="padding: 10px 0;text-align: left;">学生答复内容</p>
<div style="padding: 0 20px;text-align: left;">{{stuItem.rightanswer}}</div>
@ -700,7 +708,7 @@ const acceptParams = async (params) => {
})
} else {
// 学生回答
if (params.studentObj.worktype == '常规作业') {
if (params.studentObj.worktype == '常规作业' || params.studentObj.worktype == '科学实验') {
try {
// 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入
const res = await getClassworkdata(params.studentObj.id);

6
src/renderer/src/views/classTask/newClassTaskAssign/Right/index.vue
View File

@ -30,12 +30,12 @@ import { ElMessage } from 'element-plus'
const emit = defineEmits(['itemClick'])
const items = shallowRef([
{ title: '自主搜题', description: '上千万高质量习题资源，历届考试真题，每道题均有习题解析', icon: '#icon-soutibao-',type:'primary' },
{ title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'primary' },
// { title: '校本题库', description: '本校公共题库资源。', icon: '#icon-soutibao-',type:'primary' },
{ title: '个人题库', description: '老师上传维护自己的个人题库。', icon: '#icon-soutibao-',type:'primary' },
{ title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
// { title: '智能推荐', description: '通过对学生的薄弱知识点分析，推送不同难度的习题进行强化训练。', icon: '#icon-tubiao_wuxing-',type:'primary' },
{ title: '课堂展示', description: '通过课堂白板绘制作业，提升学生的创作思维能力。', icon: '#icon-huaban',type:'danger' },
{ title: '常规作业', description: '推送pdf、视频、音频、图片，学生可以拍照上传。', icon: '#icon-zhaoxiangji',type:'danger' },
{ title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
// { title: 'AI设计作业', description: '通过AI助手，根据课标、教材、考试等分析结果，智能创建作业。', icon: '#icon-jiqiren_o',type:'danger' },
{ title: '习题上传', description: '自己上传个人题库。', icon: '#icon-shangchuan',type:'danger' },
]);

4
src/renderer/src/views/classTask/newClassTaskAssign/index.vue
View File

@ -58,9 +58,9 @@
<el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
<SearchQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd" />
</el-tab-pane>
<el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
<!-- <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
<SchoolQuestion />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
<MyQuestion :bookobj="courseObj" @addQuiz="handleClassWorkQuizAdd"/>
</el-tab-pane>

4
src/renderer/src/views/classTask/newClassTaskAssign/questToPPTist/index.vue
View File

@ -6,9 +6,9 @@
<el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
<SearchQuestion :bookobj="courseObj" :isHtml2canvas="true" @addQuizImgBs64="handleaddQuizImgBs64" />
</el-tab-pane>
<el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
<!-- <el-tab-pane label="校本题库" name="校本题库" class="prepare-center-xbtk">
<SchoolQuestion />
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="个人题库" name="个人题库" class="prepare-center-grst">
<MyQuestion :bookobj="courseObj" :isHtml2canvas="true" @addQuizImgBs64="handleaddQuizImgBs64"/>
</el-tab-pane>

1
src/renderer/src/views/prepare/index.vue
View File

@ -461,7 +461,6 @@ export default {
}
case 'wsApp': { // 发送app端待开课消息
// console.log('wsApp', row)
window.test = sessionStore
if (!!sessionStore.get('curr.classcourse')) return ElMessage.warning('公屏已打开，请勿重复操作')
const head = MsgEnum.HEADS.MSG_0000
const data = { id: row.id }