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

Compare commits

base: zhuhao:770a847e91659b56c421e933d03ad550fc93efd0
Branches Tags
zhuhao:main
zhuhao:zhuhao_dev
zhuhao:lyc-dev
zhuhao:yangws
zhuhao:baigl
zhuhao:zouyf_dev
zhuhao:qinqing_dev
zhuhao:zdg
zhuhao:cys
zhuhao:2.1.35
zhuhao:2.1.30
zhuhao:2.1.22
zhuhao:2.1.19
zhuhao:2.1.16
zhuhao:2.1.12
zhuhao:2.1.4
zhuhao:2.1.3
zhuhao:2.0.7
zhuhao:2.0.6
zhuhao:2.0.0
zhuhao:1.2.5
zhuhao:1.2.1
zhuhao:1.2.0
zhuhao:1.1.8
zhuhao:1.1.7
zhuhao:1.1.6
zhuhao:1.1.5
zhuhao:1.1.3
zhuhao:1.1.2
zhuhao:1.1.0
zhuhao:1.0.6
zhuhao:1.0.4
zhuhao:v1.0.2
zhuhao:1.0.1
zhuhao:V1.0.0(测试版)
..
compare: zhuhao:6de43cbab3f20d6d2cb767360df65c74037277c8
Branches Tags
zhuhao:zhuhao_dev
zhuhao:lyc-dev
zhuhao:main
zhuhao:yangws
zhuhao:baigl
zhuhao:zouyf_dev
zhuhao:qinqing_dev
zhuhao:zdg
zhuhao:cys
zhuhao:2.1.35
zhuhao:2.1.30
zhuhao:2.1.22
zhuhao:2.1.19
zhuhao:2.1.16
zhuhao:2.1.12
zhuhao:2.1.4
zhuhao:2.1.3
zhuhao:2.0.7
zhuhao:2.0.6
zhuhao:2.0.0
zhuhao:1.2.5
zhuhao:1.2.1
zhuhao:1.2.0
zhuhao:1.1.8
zhuhao:1.1.7
zhuhao:1.1.6
zhuhao:1.1.5
zhuhao:1.1.3
zhuhao:1.1.2
zhuhao:1.1.0
zhuhao:1.0.6
zhuhao:1.0.4
zhuhao:v1.0.2
zhuhao:1.0.1
zhuhao:V1.0.0(测试版)

No commits in common. "770a847e91659b56c421e933d03ad550fc93efd0" and "6de43cbab3f20d6d2cb767360df65c74037277c8" have entirely different histories.
770a847e91 ... 6de43cbab3

22 changed files with 273 additions and 206 deletions
Show Stats Expand all files Collapse all files

2
.env.development
View File

@ -15,5 +15,3 @@ VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/' VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/' VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
VITE_SHOW_DEV_TOOLS = 'true'

2
.env.production
View File

@ -17,5 +17,3 @@ VITE_BUILD_COMPRESS = gzip
VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/' VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/' VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
VITE_SHOW_DEV_TOOLS = 'true'

6
src/main/index.js
View File

@ -73,7 +73,8 @@ function createLoginWindow() {
loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' }) loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
updateInit(loginWindow) updateInit(loginWindow)
} }
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') loginWindow.webContents.openDevTools()
loginWindow.webContents.openDevTools()
loginWindow.once('ready-to-show', () => { loginWindow.once('ready-to-show', () => {
loginWindow.show() loginWindow.show()
}) })
@ -127,7 +128,7 @@ function createMainWindow() {
shell.openExternal(details.url) shell.openExternal(details.url)
return { action: 'deny' } return { action: 'deny' }
}) })
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools() mainWindow.webContents.openDevTools()
if (is.dev && process.env['ELECTRON_RENDERER_URL']) { if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']) mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
@ -137,7 +138,6 @@ function createMainWindow() {
// mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口 // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
// mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
mainWindow.maximize();
// 第三步： 开启remote服务 // 第三步： 开启remote服务
remote.enable(mainWindow.webContents) remote.enable(mainWindow.webContents)
} }

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

3
src/renderer/src/hooks/useClassTask.js
View File

@ -34,7 +34,6 @@ export const editListItem = (row, courseObj) => {
chooseWorkLists: [],// 设计中的框架梳理list chooseWorkLists: [],// 设计中的框架梳理list
fileHomeworkList: [],// 设计中的常规作业list fileHomeworkList: [],// 设计中的常规作业list
whiteboardObj: '',// 设计中的课堂展示对象 whiteboardObj: '',// 设计中的课堂展示对象
question: '', // 设计中的[课堂展示]的问题
}; };
console.log('编辑的行', row); console.log('编辑的行', row);
@ -100,7 +99,7 @@ export const editListItem = (row, courseObj) => {
console.log('row.课堂展示', row.workcodes); console.log('row.课堂展示', row.workcodes);
const workcodes = JSON.parse(row.workcodes); const workcodes = JSON.parse(row.workcodes);
classtaskObj.whiteboardObj = JSON.stringify(workcodes.json); classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
classtaskObj.question = row.worktag; //
// console.log('课堂展示', classtaskObj); // console.log('课堂展示', classtaskObj);
return resolve(classtaskObj); return resolve(classtaskObj);
} }

7
src/renderer/src/plugins/imChat/index.js
View File

@ -285,11 +285,8 @@ export class ImChat {
// callback: (data) => {} // callback: (data) => {}
} }
// console.log('发送消息', option) // console.log('发送消息', option)
this.setConsole('%cim-chat: 发送消息【req】', conv_id, msg) this.setConsole('%cim-chat: 发送消息', option)
return this.timChat.TIMMsgSendMessageV2(option).then(res => { return this.timChat.TIMMsgSendMessageV2(option)
this.setConsole('%cim-chat: 发送消息【res】', JSON.stringify(res))
return res
})
} }
/** /**
* @description 发送群消息 * @description 发送群消息

4
src/renderer/src/utils/tool.js
View File

@ -138,7 +138,7 @@ export const createWindow = async (type, data) => {
wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口 wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口
wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口 wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口
wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') wins_tool.webContents.openDevTools() // 打开调试工具 wins_tool.webContents.openDevTools() // 打开调试工具
eventHandles(type, wins_tool) // 事件监听处理 eventHandles(type, wins_tool) // 事件监听处理
return wins_tool return wins_tool
} }
@ -165,7 +165,7 @@ export const createWindow = async (type, data) => {
win.type = type // 唯一标识 win.type = type // 唯一标识
win.show() win.show()
win.setFullScreen(true) // 设置窗口为全屏 win.setFullScreen(true) // 设置窗口为全屏
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具 win.webContents.openDevTools() // 打开调试工具
eventHandles(type, win) // 事件监听处理 eventHandles(type, win) // 事件监听处理
winPdf=win winPdf=win
break break

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",// // orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
// pageSize: 1000, // pageSize: 1000,
// }) // })
@ -401,8 +401,7 @@ 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();
} }

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

@ -6,7 +6,7 @@
:collapse="isCollapse" :collapse="isCollapse"
> >
<!--左侧 教材 目录--> <!--左侧 教材 目录-->
<div v-if="!isCollapse" style="height: 100%;overflow: hidden;"> <div v-if="!isCollapse" style="height: 100%;overflow: hidden;">
<ChooseTextbook @change-book="getData" @node-click="getData" /> <ChooseTextbook @change-book="getData" @node-click="getData" />
</div> </div>
</el-menu> </el-menu>
@ -15,11 +15,10 @@
<!-- 标题 --> <!-- 标题 -->
<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">
<div class="unit-top-left"> <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>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -34,7 +33,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 作业类型:内容 --> <!-- 作业类型:内容 -->
<div style="flex: 1;overflow: hidden;"> <div style="flex: 1;overflow: hidden;">
<el-table <el-table
ref="taskTable" ref="taskTable"
v-loading="loading" v-loading="loading"
@ -140,7 +139,7 @@
<div style="color: silver; display: flex;align-items: center;"> <div style="color: silver; display: flex;align-items: center;">
<div style="flex: 1;">{{ _item.worktype }}</div> <div style="flex: 1;">{{ _item.worktype }}</div>
<div style="flex: 1;">分值：{{ _item.score }}</div> <div style="flex: 1;">分值：{{ _item.score }}</div>
<div style="display: flex;align-items: center;flex: 1;justify-content: flex-end;"> <div style="display: flex;align-items: center;flex: 1;justify-content: flex-end;">
<el-button @click="prevRead(_item)">预览</el-button> <el-button @click="prevRead(_item)">预览</el-button>
</div> </div>
</div> </div>
@ -148,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">
@ -188,7 +187,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="workConfObj.teachFileList.length > 0"> <div v-if="workConfObj.teachFileList.length > 0">
<div style="margin: 10px 0;text-align: left; margin: auto 0; cursor: pointer;"> <div style="margin: 10px 0;text-align: left; margin: auto 0; cursor: pointer;">
<span style="color: #409eff" @click="openFile">预览其他类型附件！</span> <span style="color: #409eff" @click="openFile">预览其他类型附件！</span>
@ -220,7 +219,7 @@
<!-- 已推送历史 --> <!-- 已推送历史 -->
<el-dialog v-model="pushRecordsOpen" title="推送历史记录" width="80%" append-to-body> <el-dialog v-model="pushRecordsOpen" title="推送历史记录" width="80%" append-to-body>
<div style="flex: 1;overflow: hidden; min-height: 400px;"> <div style="flex: 1;overflow: hidden; min-height: 400px;">
<el-table <el-table
ref="pushRecordsRef" ref="pushRecordsRef"
:data="pushRecordsList" :data="pushRecordsList"
@ -287,7 +286,7 @@
<prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="courseObj"/> <prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="courseObj"/>
<!-- 其他附件预览框 acceptParams--> <!-- 其他附件预览框 acceptParams-->
<prevReadImgFileDialog ref="prevReadImgFileDialogRef"/> <prevReadImgFileDialog ref="prevReadImgFileDialogRef"/>
</div> </div>
</div> </div>
</template> </template>
@ -309,7 +308,7 @@ import SetHomework from '@/components/set-homework/index.vue'
import {sessionStore} from '@/utils/store' import {sessionStore} from '@/utils/store'
import {createWindow} from '@/utils/tool' import {createWindow} from '@/utils/tool'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import {throttle,debounce } from '@/utils/comm' import {throttle,debounce } from '@/utils/comm'
const toolState = useToolState(); const toolState = useToolState();
@ -343,7 +342,7 @@ const courseObj = reactive({
}) })
const taskList = ref([]); // 作业列表 const taskList = ref([]); // 作业列表
const loading = ref(false); const loading = ref(false);
const pushRecordsList = ref([]); // 作业推送历史 const pushRecordsList = ref([]); // 作业推送历史
const pushRecordsOpen = ref(false); // 推送历史记录弹窗 const pushRecordsOpen = ref(false); // 推送历史记录弹窗
const pushRecordsLoading = ref(false); // 推送历史记录loading const pushRecordsLoading = ref(false); // 推送历史记录loading
@ -415,7 +414,7 @@ const initHomeWork = async()=> {
} }
/** /**
* 查看推送历史 * 查看推送历史
* *
*/ */
const queryPushRecords = (row) => { const queryPushRecords = (row) => {
// 获取已推送历史 // 获取已推送历史
@ -438,7 +437,7 @@ const queryPushRecords = (row) => {
// if (res.rows[i].worktype == '学习目标定位') { // if (res.rows[i].worktype == '学习目标定位') {
// res.rows[i].workclass = 'success'; // res.rows[i].workclass = 'success';
// res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes); // res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
// } else // } else
// 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加 // 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加
if (res.rows[i].worktype == '课堂展示') { if (res.rows[i].worktype == '课堂展示') {
res.rows[i].workclass = 'primary'; res.rows[i].workclass = 'primary';
@ -477,12 +476,11 @@ 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();
} }
/** /**
* 删除按钮操作 TODO 待完善 * 删除按钮操作 TODO 待完善
* */ * */
const handleDelete =() => { const handleDelete =() => {
@ -620,8 +618,8 @@ const handleWorkTitleEdit = (row, index, type) => {
}; };
/** /**
* 作业内容-查看详情 * 作业内容-查看详情
* */ * */
const handleWorkEdit = (row, index) =>{ const handleWorkEdit = (row, index) =>{
console.log(row, index) console.log(row, index)
workEdit.value = true workEdit.value = true
@ -639,7 +637,7 @@ const handleWorkTitleEdit = (row, index, type) => {
if ( res.data==null || res.data==undefined ) { if ( res.data==null || res.data==undefined ) {
return; return;
} }
res.data.worktype = '框架梳理'; res.data.worktype = '框架梳理';
res.data.score = listCourseWork[0].score; res.data.score = listCourseWork[0].score;
@ -708,7 +706,7 @@ const handleWorkTitleEdit = (row, index, type) => {
}; };
/** /**
* 作业内容-前往作业设计 编辑页面 * 作业内容-前往作业设计 编辑页面
* @param row * @param row
*/ */
const handleWorkEditItem = (row) => { const handleWorkEditItem = (row) => {
editListItem(row, courseObj).then((obj) => { editListItem(row, courseObj).then((obj) => {
@ -780,11 +778,11 @@ const handleTaskAssignToAllClass = () => {
*/ */
const handleNewClassWorkDialog = () => { const handleNewClassWorkDialog = () => {
// 打开作业设计页面 // 打开作业设计页面
router.push({ router.push({
path: '/newClassTask', path: '/newClassTask',
query: { query: {
isBack: true, isBack: true,
} }
}); });
} }
@ -880,20 +878,18 @@ watch(() => courseObj.node, (newVal,oldVal) => {
</script> </script>
<!--
<style> <style>
.el-table .hidden-row { .el-table .hidden-row {
display: none !important; display: none !important;
/* color: #ccc !important; */ /* color: #ccc !important; */
} }
.el-table .father-row { .el-table .father-row {
&#45;&#45;el-table-tr-bg-color: #fff; --el-table-tr-bg-color: #fff;
} }
.el-table .son-row { .el-table .son-row {
&#45;&#45;el-table-tr-bg-color: #f0f0f08a; --el-table-tr-bg-color: #f0f0f08a;
} }
</style> </style>
-->
<style lang="scss" scoped> <style lang="scss" scoped>
.page-classTaskAssign { .page-classTaskAssign {
@ -910,6 +906,7 @@ 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;
@ -937,4 +934,4 @@ watch(() => courseObj.node, (newVal,oldVal) => {
} }
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style> <style src="@/assets/styles/JYStyle.css"></style>

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

@ -13,7 +13,7 @@
<template #header> <template #header>
<div style="font-size: 18px; display: flex; flex-wrap: nowrap"> <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
<div style="flex: 1"> <div style="flex: 1">
{{ classWorkAnalysis.title }}完成情况 {{ classWorkAnalysis.title }}答题情况
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{ <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
classWorkAnalysis.worktype classWorkAnalysis.worktype
}}</el-tag> }}</el-tag>
@ -33,13 +33,13 @@
v-if="classWorkAnalysis.row.worktype == '习题训练'" v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''" :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
@click="workHandle('quizStats')" @click="workHandle('quizStats')"
>逐题讲评</el-button >逐题分析</el-button
> >
<el-button <el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'" v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'report' ? 'success' : ''" :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
@click="handleClassOverviewOpen('report')" @click="handleClassOverviewOpen('report')"
>训练报告</el-button >整体分析</el-button
> >
</el-button-group> </el-button-group>
</el-row> </el-row>
@ -141,12 +141,12 @@
</div> </div>
</div> </div>
<!-- 逐题讲评 --> <!-- 逐题分析 -->
<div v-else-if="classWorkAnalysis.view == 'quizStats'"> <div v-else-if="classWorkAnalysis.view == 'quizStats'">
<quiz-stats :active-data="classWorkActiveData" /> <quiz-stats :active-data="classWorkActiveData" />
</div> </div>
<!-- 训练报告--> <!-- 整体分析-->
<div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll"> <div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> --> <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
<ClassOverview :table-list="overviewData"></ClassOverview> <ClassOverview :table-list="overviewData"></ClassOverview>
@ -193,7 +193,7 @@ const tableRadio = reactive({
const loading_dt_table = ref(false) const loading_dt_table = ref(false)
const isopen_dtwk_table = ref(false) const isopen_dtwk_table = ref(false)
// zdg: 逐题讲评 // zdg: 逐题分析
const classWorkActiveData = reactive({ const classWorkActiveData = reactive({
quizlist: [], // 当前习题列表 quizlist: [], // 当前习题列表
studentList: [], // 当前课程-所有学生 studentList: [], // 当前课程-所有学生
@ -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 = []
@ -536,7 +536,7 @@ const escapeHtmlQuotes = (str) => {
return result; return result;
} }
//#region 逐题讲评 //#region 逐题分析
// 查看学生-作业概览 // 查看学生-作业概览
const workHandle = (type) => { const workHandle = (type) => {
// 关闭右侧批阅ui // 关闭右侧批阅ui
@ -571,11 +571,11 @@ const getWorkFeedList = async() =>{
//#endregion //#endregion
//#regin 训练报告 //#regin 整体分析
/* /*
author: yangws author: yangws
time: 2024-8-06 16:35:33 time: 2024-8-06 16:35:33
function: 训练报告的处理 function: 整体分析的处理
*/ */
const handleClassOverviewOpen = (type) =>{ const handleClassOverviewOpen = (type) =>{
// 关闭右侧批阅ui // 关闭右侧批阅ui
@ -643,12 +643,12 @@ const closeDialog = () => {
watch(classWorkAnalysis, (newVal, oldVal) => { watch(classWorkAnalysis, (newVal, oldVal) => {
if(newVal.view != 'quizStats'){ if(newVal.view != 'quizStats'){
console.log('关闭zdg: 定时执行') console.log('关闭zdg: 定时执行')
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的 clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
} }
}) })
onUnmounted(() => { onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的 clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
}) })
defineExpose({ defineExpose({
@ -656,6 +656,8 @@ defineExpose({
}) })
</script> </script>
<style src="@/assets/styles/JYStyle.css"></style>
<style scoped lang="scss"> <style scoped lang="scss">
/*:deep(.reserv-date-pick) { /*:deep(.reserv-date-pick) {
width: 140px; width: 140px;
@ -763,4 +765,3 @@ defineExpose({
overflow-y: auto; overflow-y: auto;
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style>

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

@ -21,7 +21,7 @@
<div v-if="classWorkForm.worktype == '课堂展示'" style="height: 100%; display: flex; flex-direction: column;"> <div v-if="classWorkForm.worktype == '课堂展示'" style="height: 100%; display: flex; flex-direction: column;">
<div style="flex: 0 0 auto;"> <div style="flex: 0 0 auto;">
<el-form-item label="问题"> <el-form-item label="问题">
<el-input v-model="classWorkForm.question" type="text" placeholder="请输入问题" /> <el-input v-model="classWorkForm.title" type="text" placeholder="请输入问题" />
</el-form-item> </el-form-item>
</div> </div>
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;"> <div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
@ -29,7 +29,7 @@
<whiteboard ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="classWorkForm.whiteboardObj"/> <whiteboard ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
</div> </div>
</div> </div>
<div v-else class="el-form-work-list"> <div v-else class="el-form-work-list">
<el-form-item label="作业资源:" class="el-form-work-list"> <el-form-item label="作业资源:" class="el-form-work-list">
<!-- 左侧作业资源 --> <!-- 左侧作业资源 -->
<el-col :span="15" class="work-left"> <el-col :span="15" class="work-left">
@ -54,7 +54,7 @@
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="知识点" label-width="70"> <el-form-item label="知识点" label-width="70">
<el-cascader <el-cascader
v-model="entpCourseWorkQueryParams.point" v-model="entpCourseWorkQueryParams.point"
clearable clearable
style="width: 100%" style="width: 100%"
@ -80,8 +80,8 @@
<el-col :span="15"> <el-col :span="15">
<el-form-item label="关键词" label-width="70"> <el-form-item label="关键词" label-width="70">
<el-input <el-input
v-model="entpCourseWorkQueryParams.keyWord" v-model="entpCourseWorkQueryParams.keyWord"
style="width: 70%" type="text" style="width: 70%" type="text"
placeholder="请输入关键词" placeholder="请输入关键词"
/> />
<el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button> <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button>
@ -89,7 +89,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 习题表格 --> <!-- 习题表格 -->
<div class="middle" > <div class="middle" >
<el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;"> <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
<el-table-column type="index" width="60" /> <el-table-column type="index" width="60" />
<el-table-column align="left" > <el-table-column align="left" >
@ -119,10 +119,10 @@
<!-- 分页 这里不用--> <!-- 分页 这里不用-->
<!-- <div style="height: 55px;"> <!-- <div style="height: 55px;">
<pagination <pagination
v-show="entpCourseWorkTotal > 0" v-show="entpCourseWorkTotal > 0"
v-model:page="paginationParams.pageNum" v-model:page="paginationParams.pageNum"
v-model:limit="paginationParams.pageSize" v-model:limit="paginationParams.pageSize"
:total="entpCourseWorkTotal" :total="entpCourseWorkTotal"
:style="{ position: 'relative', 'margin-top': '5px' }" :style="{ position: 'relative', 'margin-top': '5px' }"
@pagination="getPaginationList" /> @pagination="getPaginationList" />
</div> --> </div> -->
@ -189,7 +189,7 @@
<el-form-item label="分值"> <el-form-item label="分值">
<el-input-number v-model="item.score" :min="1" :max="100" size="small"></el-input-number > <el-input-number v-model="item.score" :min="1" :max="100" size="small"></el-input-number >
</el-form-item> </el-form-item>
<div style="display: flex;align-items: center;flex: 1;justify-content: flex-end;"> <div style="display: flex;align-items: center;flex: 1;justify-content: flex-end;">
<el-button @click="prevRead(item)">预览</el-button> <el-button @click="prevRead(item)">预览</el-button>
<el-button type="danger" @click="deleteClassWorkAddOfResource(item)">删除</el-button> <el-button type="danger" @click="deleteClassWorkAddOfResource(item)">删除</el-button>
</div> </div>
@ -349,11 +349,9 @@ let classWorkForm = reactive({
chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表 fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板 whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
}); // 提交的作业内容 }); // 提交的作业内容
// --------------------------------------------------- // ---------------------------------------------------
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型 const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
// 课堂展示------- // 课堂展示-------
const boardLoading = ref(false); const boardLoading = ref(false);
@ -364,7 +362,7 @@ const fileLoading = ref(false); // 常规作业loading
* 作业类型切换 * 作业类型切换
*/ */
const changeFormType = (val) => { const changeFormType = (val) => {
classWorkForm.worktype = val; classWorkForm.worktype = val;
} }
/** /**
@ -373,7 +371,7 @@ const changeFormType = (val) => {
* @param {*} queryType * @param {*} queryType
* 1 - 按条件查询 * 1 - 按条件查询
* 2 - 按关键词查询 * 2 - 按关键词查询
*/ */
const handleQueryParamFromEntpCourseWork = (queryType) => { const handleQueryParamFromEntpCourseWork = (queryType) => {
// 确保更改了搜索参数后从第一页开始查询 // 确保更改了搜索参数后从第一页开始查询
// this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了 // this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
@ -412,7 +410,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'', keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
} }
// 分页参数 // 分页参数
// pageNum: paginationParams.pageNum, // pageNum: paginationParams.pageNum,
// pageSize: paginationParams.pageSize, // pageSize: paginationParams.pageSize,
@ -422,7 +420,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
// // [初中+政治]需改为[初中+道德与法治] // // [初中+政治]需改为[初中+道德与法治]
// queryForm.edusubject = '道德与法治'; // queryForm.edusubject = '道德与法治';
// } // }
listEntpcourseworkNew(queryForm).then(entpcourseworkres => { listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
// if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') { // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
// // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】 // // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
@ -433,7 +431,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
// } else { // } else {
// workResource.entpCourseWorkList = entpcourseworkres.rows; // workResource.entpCourseWorkList = entpcourseworkres.rows;
// } // }
if(entpcourseworkres.data&&entpcourseworkres.data.length>0){ if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
workResource.entpCourseWorkList = entpcourseworkres.data; workResource.entpCourseWorkList = entpcourseworkres.data;
workResource.entpCourseWorkTotal = entpcourseworkres.data.length; workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
@ -511,7 +509,7 @@ const getEntpCourseWorkPointList = () => {
/** /**
* 添加资源 * 添加资源
* @param fromsrc - 试题来源 * @param fromsrc - 试题来源
* @param entpcourseworkid * @param entpcourseworkid
*/ */
const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => { const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => {
var exist = false; var exist = false;
@ -610,11 +608,11 @@ const handleClassWorkSave = async () => {
uniquekey: classWorkForm.uniquekey,// 作业名称、编码 uniquekey: classWorkForm.uniquekey,// 作业名称、编码
classid: 0, classid: 0,
classcourseid: 0, classcourseid: 0,
entpcourseid: chapterId, // 这个字段很特别 entpcourseid: chapterId, // 这个字段很特别
slideid: 0, slideid: 0,
title: classWorkForm.title, // 作业说明？ title: classWorkForm.title, // 作业说明？
workcodes: JSON.stringify(classWorkForm.workcodes), // 作业内容？ workcodes: JSON.stringify(classWorkForm.workcodes), // 作业内容？
edusubject: userStore.edusubject, // 学科 语文 数学 edusubject: userStore.edusubject, // 学科 语文 数学
evalid: props.bookobj.levelSecondId, //userStore.evalid, // // 单元下的课ID evalid: props.bookobj.levelSecondId, //userStore.evalid, // // 单元下的课ID
edustage: userStore.edustage, // 学段 年纪 高中,初中,小学 edustage: userStore.edustage, // 学段 年纪 高中,初中,小学
status: '10', //2024-09-11 作业布置分离后的 新模版数据； 之前老版本为空 status: '10', //2024-09-11 作业布置分离后的 新模版数据； 之前老版本为空
@ -630,17 +628,16 @@ const handleClassWorkSave = async () => {
return; return;
} }
if (classWorkForm.worktype === "课堂展示") { if (classWorkForm.worktype === "课堂展示") {
boardLoading.value = true boardLoading.value = true
let canvasJson = proxy.$refs.boardref.getCanvasJson() let canvasJson = proxy.$refs.boardref.getCanvasJson()
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64() let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
// 课堂展示提交内容 // 课堂展示提交内容
cform.worktag = classWorkForm.question; cform.title = classWorkForm.title;
cform.title = classWorkForm.title;
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64}); cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]); cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
try { try {
@ -650,19 +647,27 @@ const handleClassWorkSave = async () => {
classWorkForm.worktype = "课堂展示"; classWorkForm.worktype = "课堂展示";
classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称 classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
classWorkForm.title = ""; classWorkForm.title = "";
classWorkForm.question = "";
classWorkForm.quizlist = [], // 作业习题列表内容 classWorkForm.quizlist = [], // 作业习题列表内容
// 情况选择的资源缓存 // 情况选择的资源缓存
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 {
boardLoading.value = false boardLoading.value = false
} }
} }
else if(classWorkForm.worktype === "常规作业"){ else if(classWorkForm.worktype === "常规作业"){
fileLoading.value = true fileLoading.value = true
cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList); cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
@ -680,6 +685,16 @@ 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
}) })
@ -710,7 +725,7 @@ const handleClassWorkSave = async () => {
} }
console.log(cform,'提交的数据'); console.log(cform,'提交的数据');
if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'}); if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
addClassworkReturnId(cform).then(workres => { addClassworkReturnId(cform).then(workres => {
ElMessage({ type: 'success', message: '作业设计成功!'}); ElMessage({ type: 'success', message: '作业设计成功!'});
// 重置提交表单 // 重置提交表单
@ -728,7 +743,7 @@ const handleClassWorkSave = async () => {
}) })
} }
if(props.isback){ if(props.isback){
// 其他页面进入的 返回上一页 // 其他页面进入的 返回上一页
router.back(); router.back();
@ -767,20 +782,20 @@ const editWork = async (cform) =>{
// 根据作业类型分类处理 // 根据作业类型分类处理
if (classWorkForm.worktype=='习题训练'){ if (classWorkForm.worktype=='习题训练'){
// 1.判断当前添加的作业是否与原来不同（跟父组件传来的值对比） // 1.判断当前添加的作业是否与原来不同（跟父组件传来的值对比）
let needUplEval = false; let needUplEval = false;
if (classWorkForm.quizlist.length != props.propsformobj.quizlist.length) { if (classWorkForm.quizlist.length != props.propsformobj.quizlist.length) {
needUplEval = true; needUplEval = true;
}else { }else {
// 只要有一个不一致则说明需要更新 // 只要有一个不一致则说明需要更新
needUplEval = classWorkForm.quizlist.some(cur => needUplEval = classWorkForm.quizlist.some(cur =>
!props.propsformobj.quizlist.some(last => !props.propsformobj.quizlist.some(last =>
last.id === cur.id && last.score === cur.score last.id === cur.id && last.score === cur.score
) )
); );
} }
// 2.需要重新更新eval的数据 // 2.需要重新更新eval的数据
if (needUplEval) { if (needUplEval) {
// 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加 // 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
@ -791,7 +806,7 @@ const editWork = async (cform) =>{
arrEvalids.push(element.id); arrEvalids.push(element.id);
}); });
const ids = arrEvalids.join(','); const ids = arrEvalids.join(',');
// 2.2.删除原作业 // 2.2.删除原作业
const delRes = await delClassworkeval(ids); const delRes = await delClassworkeval(ids);
@ -822,8 +837,8 @@ const editWork = async (cform) =>{
needUplEval = true; needUplEval = true;
}else { }else {
// 只要有一个不一致则说明需要更新 // 只要有一个不一致则说明需要更新
needUplEval = classWorkForm.chooseWorkLists.some(cur => needUplEval = classWorkForm.chooseWorkLists.some(cur =>
!props.propsformobj.chooseWorkLists.some(last => !props.propsformobj.chooseWorkLists.some(last =>
last.id === cur.id && last.score === cur.score last.id === cur.id && last.score === cur.score
) )
); );
@ -842,7 +857,6 @@ const editWork = async (cform) =>{
let canvasJson = proxy.$refs.boardref.getCanvasJson() let canvasJson = proxy.$refs.boardref.getCanvasJson()
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64() let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64}); cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
cform.worktag = classWorkForm.question;
} }
else if (classWorkForm.worktype=='常规作业') { else if (classWorkForm.worktype=='常规作业') {
// 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去) // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
@ -888,15 +902,15 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
.container { .container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
} }
.top, .bottom { .top, .bottom {
flex: 0 0 auto; flex: 0 0 auto;
} }
.middle { .middle {
flex: 1; flex: 1;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
@ -923,8 +937,8 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
.work-right { .work-right {
height: 100%; height: 100%;
padding: 0 0 0 5px; padding: 0 0 0 5px;
overflow: auto; overflow: auto;
line-height: 26px; line-height: 26px;
overflow: hidden; overflow: hidden;
} }
@ -935,19 +949,19 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-bottom: 5px; margin-bottom: 5px;
.choose-work-title{ .choose-work-title{
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
margin-right: 5px margin-right: 5px
} }
.choose-work-content{ .choose-work-content{
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
:deep(.el-form-item__label){ :deep(.el-form-item__label){
width: 50px !important; width: 50px !important;

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

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

@ -6,7 +6,7 @@
:collapse="isCollapse" :collapse="isCollapse"
> >
<!--左侧 教材 目录--> <!--左侧 教材 目录-->
<div v-if="!isCollapse" style="height: 100%;overflow: hidden;"> <div v-if="!isCollapse" style="height: 100%;overflow: hidden;">
<ChooseTextbook @change-book="getData" @node-click="getData" /> <ChooseTextbook @change-book="getData" @node-click="getData" />
</div> </div>
</el-menu> </el-menu>
@ -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" @click="onOpenLeftBook"> <div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @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>
@ -69,7 +69,6 @@ const classWorkForm = reactive({
chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业 whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题
}) })
@ -114,7 +113,7 @@ const onOpenLeftBook = () => {
proxy.$modal.msgError(`当前为编辑状态不可选择课程！`); proxy.$modal.msgError(`当前为编辑状态不可选择课程！`);
}else{ }else{
// 新增状态 // 新增状态
// isCollapse.value = !isCollapse.value isCollapse.value = !isCollapse.value
} }
} }
// 返回上一页---返回布置页面 // 返回上一页---返回布置页面

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

@ -3,7 +3,7 @@
<div class="teachClassTask_header"> <div class="teachClassTask_header">
<div style="font-size: 18px; display: flex; flex-wrap: nowrap"> <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
<div style="flex: 1"> <div style="flex: 1">
{{ classWorkAnalysis.title }}完成情况 {{ classWorkAnalysis.title }}答题情况
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{ <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
classWorkAnalysis.worktype classWorkAnalysis.worktype
}}</el-tag> }}</el-tag>
@ -23,13 +23,13 @@
v-if="classWorkAnalysis.row.worktype == '习题训练'" v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''" :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
@click="workHandle('quizStats')" @click="workHandle('quizStats')"
>逐题讲评</el-button >逐题分析</el-button
> >
<el-button <el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'" v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'report' ? 'success' : ''" :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
@click="handleClassOverviewOpen('report')" @click="handleClassOverviewOpen('report')"
>训练报告</el-button >整体分析</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -131,12 +131,12 @@
</div> </div>
</div> </div>
<!-- 逐题讲评 --> <!-- 逐题分析 -->
<div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;"> <div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/> <quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
</div> </div>
<!-- 训练报告--> <!-- 整体分析-->
<div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll"> <div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> --> <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
<ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview> <ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
@ -180,7 +180,7 @@ const tableRadio = reactive({
const loading_dt_table = ref(false) const loading_dt_table = ref(false)
const isopen_dtwk_table = ref(false) const isopen_dtwk_table = ref(false)
// zdg: 逐题讲评 // zdg: 逐题分析
const classWorkActiveData = reactive({ const classWorkActiveData = reactive({
quizlist: [], // 当前习题列表 quizlist: [], // 当前习题列表
studentList: [], // 当前课程-所有学生 studentList: [], // 当前课程-所有学生
@ -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 = []
@ -528,7 +528,7 @@ const escapeHtmlQuotes = (str) => {
return result; return result;
} }
//#region 逐题讲评 //#region 逐题分析
// 查看学生-作业概览 // 查看学生-作业概览
const workHandle = (type) => { const workHandle = (type) => {
// 关闭右侧批阅ui // 关闭右侧批阅ui
@ -563,11 +563,11 @@ const getWorkFeedList = async() =>{
//#endregion //#endregion
//#regin 训练报告 //#regin 整体分析
/* /*
author: yangws author: yangws
time: 2024-8-06 16:35:33 time: 2024-8-06 16:35:33
function: 训练报告的处理 function: 整体分析的处理
*/ */
const handleClassOverviewOpen = (type) =>{ const handleClassOverviewOpen = (type) =>{
// 关闭右侧批阅ui // 关闭右侧批阅ui
@ -633,10 +633,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)
@ -646,18 +645,20 @@ onMounted(() => {
watch(classWorkAnalysis, (newVal, oldVal) => { watch(classWorkAnalysis, (newVal, oldVal) => {
if(newVal.view != 'quizStats'){ if(newVal.view != 'quizStats'){
console.log('关闭zdg: 定时执行') console.log('关闭zdg: 定时执行')
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的 clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
} }
}) })
onUnmounted(() => { onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的 clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
}) })
// defineExpose({ // defineExpose({
// }) // })
</script> </script>
<style src="@/assets/styles/JYStyle.css"></style>
<style scoped lang="scss"> <style scoped lang="scss">
.teachClassTask{ .teachClassTask{
height: 100%; height: 100%;
@ -703,6 +704,94 @@ onUnmounted(() => {
} }
} }
} }
// .clwk_dialog {
// }
// .clwk_dialog {
// display: flex;
// justify-content: center;
// overflow: hidden;
// }
// .clwk_dialog .el-dialog {
// margin: 0 auto !important;
// height: 85%!important;
// overflow: hidden;
// }
// .clwk_dialog .el-dialog__header {
// /* position: absolute;
// top: 0;
// left: 0; */
// width: 100%!important;
// }
// .clwk_dialog .el-dialog__body {
// position: absolute;
// left: 0;
// top: 15px;
// bottom: 1px;
// right:0;
// padding:5px;
// z-index:1;
// display: flex;
// flex-direction: column;
// overflow: hidden;
// /* overflow:hidden;
// overflow-y: auto; */
// }
// .clwk_dialog .el-dialog__footer{
// position: absolute;
// bottom: 10px;
// right: 10px;
// }
// .clwk_dialog .classwork-score{
// overflow-y: auto;
// }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style> <style scoped>
/* .clwk_dialog {
display: flex;
justify-content: center;
overflow: hidden;
}
.clwk_dialog .el-dialog {
margin: 0 auto !important;
height: 85%!important;
overflow: hidden;
}
.clwk_dialog .el-dialog__header {
/* position: absolute;
top: 0;
left: 0;
width: 100%!important;
}
.clwk_dialog .el-dialog__body {
position: absolute;
left: 0;
top: 15px;
bottom: 1px;
right:0;
padding:5px;
z-index:1;
display: flex;
flex-direction: column;
overflow: hidden;
/* overflow:hidden;
overflow-y: auto;
}
.clwk_dialog .el-dialog__footer{
position: absolute;
bottom: 10px;
right: 10px;
}
.clwk_dialog .classwork-score{
overflow-y: auto;
} */
</style>

3
src/renderer/src/views/desktop/container/work-trend.vue
View File

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

22
src/renderer/src/views/examReport/index.vue
View File

@ -14,7 +14,7 @@
</template> </template>
</el-popover> </el-popover>
<div style="margin-top: 7px">&nbsp;&nbsp;<el-icon><ArrowRight /></el-icon>&nbsp;&nbsp;</div> <div style="margin-top: 7px">&nbsp;&nbsp;<el-icon><ArrowRight /></el-icon>&nbsp;&nbsp;</div>
<el-popover disabled placement="top-start" title="考点分析" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习"> <el-popover disabled placement="top-start" title="考点分析" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference> <template #reference>
<el-button-group> <el-button-group>
@ -24,7 +24,7 @@
</template> </template>
</el-popover> </el-popover>
<div style="margin-top: 7px">&nbsp;&nbsp;<el-icon><ArrowRight /></el-icon>&nbsp;&nbsp;</div> <div style="margin-top: 7px">&nbsp;&nbsp;<el-icon><ArrowRight /></el-icon>&nbsp;&nbsp;</div>
<el-popover disabled placement="top-start" title="模拟命题" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习"> <el-popover disabled placement="top-start" title="模拟命题" trigger="hover" content="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference> <template #reference>
<el-button-group> <el-button-group>
@ -51,15 +51,15 @@
<examReview <examReview
:loading="loading" :loading="loading"
:listExamQuestion="listExamQuestion" :listExamQuestion="listExamQuestion"
v-if="curTask.viewkey=='真题回顾' " v-if="curTask.viewkey=='真题回顾' "
/> />
<pointAnalysis <pointAnalysis
v-else-if="curTask.viewkey=='考点分析' " v-else-if="curTask.viewkey=='考点分析' "
/> />
<examMocks <examMocks
v-else v-else
/> />
</div> </div>
</div> </div>
@ -88,9 +88,9 @@ const sourceStore = useResoureStore();
const viewportHeight = ref(0); const viewportHeight = ref(0);
const viewportWidth = ref(0); const viewportWidth = ref(0);
// 当前选中的章节或单元 // 当前选中的章节或单元
const curNode = ref({}); const curNode = ref({});
// 试题集合 // 试题集合
const listExamQuestion = ref([]); const listExamQuestion = ref([]);
const loading = ref(false); const loading = ref(false);
const curTask = reactive({ const curTask = reactive({
viewkey: '真题回顾', viewkey: '真题回顾',
@ -299,4 +299,4 @@ onMounted(() => {
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style> <style src="@/assets/styles/JYStyle.css"></style>

20
src/renderer/src/views/prepare/container/kj-list-item.vue
View File

@ -98,7 +98,7 @@ import FileImage from '@/components/file-image/index.vue'
import { asyncLocalFile } from '@/utils/talkFile' import { asyncLocalFile } from '@/utils/talkFile'
import { toTimeText } from '@/utils/date' import { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file' import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import outLink from '@/utils/linkConfig' import outLink from '@/utils/linkConfig'
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
@ -208,7 +208,6 @@ export default {
} }
if (action === 'cancel'){ if (action === 'cancel'){
// 继续上课 // 继续上课
console.log(obj.bookImg)
if (obj.bookImg) { if (obj.bookImg) {
//PPT //PPT
listEntpcourse({ listEntpcourse({
@ -242,20 +241,9 @@ export default {
} }
}) })
}else { }else {
console.log(obj) //APT
getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{ this.$emit('on-start-class', item, obj)
console.log(res2) done()
//APT
if (res2&&res2.rows.length>0) {
this.$emit('on-start-class', res2.rows[0], obj)
}else {
ElMessage({
message: '该文件未关联PPT，无法打开！',
type: 'warning'
})
}
done()
})
} }
} }
if (action === 'close') { if (action === 'close') {

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

@ -106,7 +106,7 @@
:item="item" :item="item"
:index="index" :index="index"
@on-set="openSet" @on-set="openSet"
@on-reSet="openReSet" @on-reSet="openReSet"
@on-delhomework="delhomework" @on-delhomework="delhomework"
> >
</file-list-item> </file-list-item>
@ -657,7 +657,7 @@ export default {
this.$refs['reservDialog'].openDialog() this.$refs['reservDialog'].openDialog()
}, },
// 打开外部链接 // 打开外部链接
// handleOutLink(key) { // handleOutLink(key) {
// if (key == 'homeWork') { // if (key == 'homeWork') {
// this.isOpenHomework = true // this.isOpenHomework = true
@ -689,11 +689,11 @@ export default {
// 前往作业设计页面 // 前往作业设计页面
goNewClassTask(){ goNewClassTask(){
// router.push({ path: '/newClassTask' }); // router.push({ path: '/newClassTask' });
this.$router.push({ this.$router.push({
path: '/newClassTask', path: '/newClassTask',
query: { query: {
isBack: true, isBack: true,
} }
}); });
}, },
getWeekday1(date) { getWeekday1(date) {
@ -730,7 +730,7 @@ export default {
} }
}); });
//--------------------- //---------------------
// 暂时弃用 外链 新窗口打开标识 // 暂时弃用 外链 新窗口打开标识
// this.isOpenHomework = true; // this.isOpenHomework = true;
// // key 对应的 linkConfig.js 外部链接配置 // // key 对应的 linkConfig.js 外部链接配置
// let configObj = outLink()['homeWork'] // let configObj = outLink()['homeWork']

2
src/renderer/src/views/tool/components/homework.vue
View File

@ -128,7 +128,7 @@ const closeHomework = async() => {
const successHomework = (data)=>{ const successHomework = (data)=>{
// console.log('推送成功', data) // console.log('推送成功', data)
// 发送im消息-推送作业(app|平板) // 发送im消息-推送作业(app|平板)
// ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016) ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
} }
// 章节目录change // 章节目录change
const changeChapter = async (data)=>{ const changeChapter = async (data)=>{

2
src/renderer/src/views/tool/components/imChat.vue
View File

@ -12,7 +12,7 @@ const props = defineProps({
}) })
const imChatObj = reactive({imChat:null}) const imChatObj = reactive({imChat:null})
onMounted(() => { onMounted(() => {
// ipcMainHandle() // 绑定-监听ipcMain im相关消息 ipcMainHandle() // 绑定-监听ipcMain im相关消息
}) })
// 初始化 im-chat // 初始化 im-chat
const initImChat = async (timGroupId) => { const initImChat = async (timGroupId) => {

4
src/renderer/src/views/tool/sphere.vue
View File

@ -105,7 +105,7 @@ const getClassInfo = async () => {
const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat
if (!timGroupId) timGroupId = chat?.timGroupId if (!timGroupId) timGroupId = chat?.timGroupId
if (!timGroupId) return ElMessage.error('房间创建-失败') if (!timGroupId) return ElMessage.error('房间创建-失败')
if (data.status != '上课中') classManageApi.startClass(classObj.id, timGroupId) // 开始上课 classManageApi.startClass(classObj.id, timGroupId) // 开始上课
} }
// 切换tab-change // 切换tab-change
const tabChange = (val) => { const tabChange = (val) => {
@ -158,7 +158,7 @@ const touchChange = (e) => {
const chatChange = (type, data, ...args) => { const chatChange = (type, data, ...args) => {
if (type == 'createGroup') { // 创建群-监听 if (type == 'createGroup') { // 创建群-监听
console.log('创建群:', data) console.log('创建群:', data)
// !!data && classManageApi.startClass(classObj.id, data) !!data && classManageApi.startClass(classObj.id, data)
} else if (type == 'msg') { // im-chat 消息监听 } else if (type == 'msg') { // im-chat 消息监听
if (!data) return // 没有msg数据 message_msg_id if (!data) return // 没有msg数据 message_msg_id
const msgId = (args||[])[0].message_msg_id const msgId = (args||[])[0].message_msg_id