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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2025-02-11 16:41:09 +08:00
parent c69bc91185 5b10c4b5d5
commit 159cb75ca9
6 changed files with 248 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,9 +222,11 @@ export const createWindow = async (type, data) => {
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
let events = {} // 事件处理函数对象
Object.keys(data)
.filter(k => typeof data[k] === 'function')
.filter(k => typeof data[k] === 'function' && k!=='success')
.forEach(k => events[k] = data[k])
eventHandles(type, win, events) // 事件监听处理
// 创建成功后触发回调
data.success && data.success(win)
return win
}
default:
@ -306,9 +308,9 @@ const eventHandles = (type, win, events) => {
// 监听主窗口-关闭事件
mainWin.once('close', () => {winPdf=null;win.destroy();})
win.on('closed', () => {
if(!!onClosed) onClosed() // 自定义关闭事件
if(!!closed) closed() // 自定义关闭事件
if(!!close) close() // 自定义关闭事件
if(!!onClosed) onClosed(win) // 自定义关闭事件
if(!!closed) closed(win) // 自定义关闭事件
if(!!close) close(win) // 自定义关闭事件
win = null
wins_tool = null
winChild=null

3
src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
View File

@ -51,7 +51,8 @@ onMounted(() => {
})
defineExpose({
updateLabel
updateLabel,
onSelectOption
})

170
src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
View File

@ -1,6 +1,9 @@
<template>
<div style="display: flex;">
<div style="margin-left: 15px">
<el-cascader v-model="bindSubject" :options="subjectList" @change="handleChange" />
</div>
<!-- <div style="margin-left: 15px">
<el-dropdown @command="handleUserEduStage">
<span class="el-dropdown-link">
<el-button class="custom-button" type="default" round >{{ useClassTaskStore().experimentObj.edustage }}
@ -9,7 +12,6 @@
</span>
<template #dropdown>
<el-dropdown-menu>
<!-- <el-dropdown-item command="幼儿园">幼儿园</el-dropdown-item> -->
<el-dropdown-item command="小学">小学</el-dropdown-item>
<el-dropdown-item command="初中">初中</el-dropdown-item>
<el-dropdown-item command="高中">高中</el-dropdown-item>
@ -33,7 +35,7 @@
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
</div> -->
</div>
</template>
@ -47,17 +49,119 @@ import useClassTaskStore from '@/store/modules/classTask'
const userStore = useUserStore().user
// 定义要发送的emit事件
// let emit = defineEmits(['experlist'])
let emit = defineEmits(['experlist'])
// const expObj = ref({
// edustage: useClassTaskStore().experimentObj.edustage,
// edusubject: useClassTaskStore().experimentObj.edusubject,
// })
const subjectList = ref([])
//const subjectList = ref([])
const chooseGrade= ref({})
const expList = ref([]) // 当前年级的所有课程
const checkList = ref([])// 当前年级对应学科的课程，
const isLoaded = ref(false);
const bindSubject = ref([useClassTaskStore().experimentObj.edustage, useClassTaskStore().experimentObj.edusubject]); // 默认为小学数学
const subjectList = [
{
value: '小学',
label: '小学',
children: [
{
value: '数学',
label: '数学',
},
{
value: '物理',
label: '物理',
},
{
value: '化学',
label: '化学',
},
{
value: '生物',
label: '生物',
},
{
value: '科学',
label: '科学',
}]
},
{
value: '初中',
label: '初中',
children: [
{
value: '数学',
label: '数学',
},
{
value: '物理',
label: '物理',
},
{
value: '化学',
label: '化学',
},
{
value: '生物',
label: '生物',
},
{
value: '科学',
label: '科学',
}]
},
{
value: '高中',
label: '高中',
children: [
{
value: '数学',
label: '数学',
},
{
value: '物理',
label: '物理',
},
{
value: '化学',
label: '化学',
},
{
value: '生物',
label: '生物',
},
{
value: '科学',
label: '科学',
}]
}
]
const handleChange = (val) => {
useClassTaskStore().experimentObj.edustage = val[0];
useClassTaskStore().experimentObj.edusubject = val[1];
handleUserEduStage(useClassTaskStore().experimentObj.edustage);
}
// 获取基础的学科
const getSubject = () => {
//没有学科则不进行下面的步骤
@ -67,19 +171,20 @@ const getSubject = () => {
// subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
// console.log(subjectList,'subjectList');
// })
//这里获取死数据 学科list
const edustageList = ['小学','初中','高中'];
const subList = ['数学','物理','化学','生物','科学'];
edustageList.forEach((item) => {
subList.forEach((subItems) => {
subjectList.value.push({
edustage: item,
edusubject: subItems,
itemtitle: subItems
})
})
})
console.log(subjectList,'subjectList');
// const edustageList = ['小学','初中','高中'];
// const subList = ['数学','物理','化学','生物','科学'];
// edustageList.forEach((item) => {
// subList.forEach((subItems) => {
// subjectList.value.push({
// edustage: item,
// edusubject: subItems,
// itemtitle: subItems
// })
// })
// })
// console.log(subjectList,'subjectList');
// 默认读取一个学科
const edusubject = useClassTaskStore().experimentObj.edusubject;
@ -90,6 +195,8 @@ const getSubject = () => {
isLoaded.value = true;
//console.log('初始化执行完毕----');
}
// 展示有 实验科目的学科
const isExpList = (edusubject) => {
let list = [];
@ -101,7 +208,7 @@ const isExpList = (edusubject) => {
list = expList.value.filter(item => item.subject === 'physics')
break;
case '化学':
checkList.value = expList.value.filter(item => item.subject === 'chemistry')
list = expList.value.filter(item => item.subject === 'chemistry')
break;
case '生物':
list = expList.value.filter(item => item.subject === 'biology')
@ -112,19 +219,19 @@ const isExpList = (edusubject) => {
}
return list.length > 0
}
// 选择学段
const handleUserEduStage = (item) => {
// userStore.edustage = item
useClassTaskStore().experimentObj.edustage = item;
//清空操作
expList.value = []
if(item === '小学'){
chooseGrade.value = jsonData.data.primary
expList.value = chooseGrade.value
const newSubjectList = subjectList.value.filter(item => item.edustage === '小学');
for(let i in newSubjectList){
const name = newSubjectList[i].itemtitle
const newSubjectList = subjectList.filter(item => item.value === '小学');
for(let i of newSubjectList[0].children){
const name = i.value
if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
//useClassTaskStore().experimentObj.edusubject = name;
// 更改学科默认与学科下的实验科目
@ -135,9 +242,9 @@ const handleUserEduStage = (item) => {
}else if(item === '初中'){
chooseGrade.value = jsonData.data.junior
expList.value = chooseGrade.value
const newSubjectList = subjectList.value.filter(item => item.edustage === '初中');
for(let i in newSubjectList){
const name = newSubjectList[i].itemtitle
const newSubjectList = subjectList.filter(item => item.value === '初中');
for(let i of newSubjectList[0].children){
const name = i.value
if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
//useClassTaskStore().experimentObj.edusubject = name;
// 更改学科默认与学科下的实验科目
@ -148,9 +255,9 @@ const handleUserEduStage = (item) => {
}else if(item === '高中'){
chooseGrade.value = jsonData.data.senior
expList.value = chooseGrade.value
const newSubjectList = subjectList.value.filter(item => item.edustage === '高中');
for(let i in newSubjectList){
const name = newSubjectList[i].itemtitle
const newSubjectList = subjectList.filter(item => item.value === '高中');
for(let i of newSubjectList[0].children){
const name = i.value
if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
//useClassTaskStore().experimentObj.edusubject = name;
// 更改学科默认与学科下的实验科目
@ -161,7 +268,7 @@ const handleUserEduStage = (item) => {
}
}
// 选择学科
const handleUserEduSubject = (item) => {
const handleUserEduSubject = (item, isEmit=true) => {
// userStore.edusubject = item;
useClassTaskStore().experimentObj.edusubject = item;
console.log(item,'选择的学科-------')
@ -185,7 +292,9 @@ const handleUserEduSubject = (item) => {
}
console.log(checkList.value,'checkList')
useClassTaskStore().experimentObj.experimentList = checkList.value;
// emit('experlist',checkList.value)
if (isEmit) {
emit('experlist',checkList.value)
}
}
const updateCheckList = async () => {
@ -205,7 +314,8 @@ const updateCheckList = async () => {
}
expList.value = chooseGrade.value
const edusubject = useClassTaskStore().experimentObj.edusubject;
handleUserEduSubject(edusubject);
bindSubject.value = [edustage, edusubject];
handleUserEduSubject(edusubject, false);
} catch (error) {
console.error(error);
}

22
src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
View File

@ -3,7 +3,7 @@
<div class="activeExp-header">
<div class="infomation" v-if="isStadium() !== true" >
<!-- <selectClass v-if="!isSubject" @experlist="getExperimentList" /> -->
<selectClass ref="selectClassRef"/>
<selectClass ref="selectClassRef" @experlist="initExperimentFirst"/>
</div>
<div>
<selectExperiment ref="selectExperimentRef" @selectItem="getExperimentListItem" />
@ -69,20 +69,28 @@ onMounted(() => {
// // mainDiv 为需控制高度自适应盒子，通过 ref="mainDiv" 绑定
// }
// 选择的学科 获取实验课程信息
// const getExperimentList = (val) => {
// console.log(val,'选择的学科，获取实验课程list信息')
// // experimentList.value = val;
// }
// 根据选择的学科 自动选中实验课程的第一个
/**
* warn: 这部分后续需优化(handleUserEduSubject存在多次调用):
* 目前会因为初始化时而watch到props的fileurl变化而额外总共执行2次. 而初始化时直接选择任务时, 会额外总共执行3次
*/
const initExperimentFirst = (val) => {
// 默认选中第一个实验
if (val[0].label && val[0].label !='') {
selectExperimentRef.value.onSelectOption(val[0].label);
}
}
// 选择的实验课
const getExperimentListItem = (val) => {
console.log(val,'选择的实验课程信息')
activeExp.value = val;
emit('clickExpObj', val)
}
// 监听实验课程信息
watch(() => props.expObj.fileurl, (newVal, oldVal) => {
console.log(props.expObj,'科学实验科目')
console.log(props.expObj,'监听-科学实验科目')
activeExp.value = props.expObj;
//

48
src/renderer/src/views/model/index.vue
View File

@ -288,14 +288,17 @@ const createAIPPT = () => {
})
})
}
const isPgDialogClose = ref(false) // 弹窗-进度条-是否关闭
const pgDialog = ref({ // 弹窗-进度条
visible: false,
title: 'PPT解析中...',
width: 300,
showClose: false,
showClose: true,
draggable: true,
beforeClose: done => {}, // 阻止-弹窗事件
beforeClose: done => { // 弹窗关闭前回调
isPgDialogClose.value = true
done()
},
pg: { // 进度条-参数
percentage: 0, // 百分比
color: [
@ -316,20 +319,26 @@ const openFilePicker = () =>{
const handleFileChange = ()=> {
const file = event.target.files[0];
fileInput.value.value = ''
if (file) {
console.log(file);
createAIPPTByFile(file)
}
}
// ppt文件转PPT线上数据
const createAIPPTByFile = async (file)=> {
isPgDialogClose.value = false // 默认没有关闭
pgDialog.value.visible = true
pgDialog.value.pg.percentage = 0
const closePgDialog = () => {
pgDialog.value.pg.percentage = 0
pgDialog.value.visible = false
}
pptMedia = {} // 清空媒体数据
const resPptJson = await PPTXFileToJson(file).catch(() => {
ElMessageBox.alert('PPT文件转换失败！请点击素材右侧...下载文件后打开另存为PPTX文件格式再进行导入！')
pgDialog.value.visible = false
})
if(isPgDialogClose.value) return closePgDialog() // 弹窗关闭了,终止进行
const { def, slides, ...content } = resPptJson
// 生成缩略图
const thumbnails = await slidesToImg(slides, content.width)
@ -337,13 +346,13 @@ const createAIPPTByFile = async (file)=> {
let completed = 0
const total = slides.length
for( let o of slides ) {
if(isPgDialogClose.value) return closePgDialog() // 弹窗关闭了,终止进行
completed++
await toRousrceUrl(o)
// 设置进度条
pgDialog.value.pg.percentage = Math.floor(completed / total * 100)
}
pgDialog.value.pg.percentage = 0
pgDialog.value.visible = false
closePgDialog() // 关闭进度条弹窗
listEntpcourse({
evalid: currentNode.value.id,
edituserid: userStore.userId,
@ -564,13 +573,38 @@ const changeClass = async (type, row, other) => {
switch(type) {
case 'click': { // 点击-打开课件-aippt
if (row.fileFlag === 'aippt' && !!row.fileId) {
const id = Number(row.fileId)
const openFileIds = sessionStore.get('curr.openFileIds')||[] // 已打开课件列表id
const isHasOpen = openFileIds.includes(id) // 是否已打开
if (isHasOpen) return ElMessage.warning('该课件已打开！')
const res = await getEntpcoursefile(row.fileId)
if (res && res.code === 200) {
openFileIds.push(id) // 课堂资源缓存-允许打开多个
sessionStore.set('curr.openFileIds', openFileIds) // 更新窗口课件列表id
sessionStore.set('curr.resource', res.data) // 缓存当前资源信息
sessionStore.set('curr.smarttalk', row) // 缓存当前文件smarttalk
createWindow('open-win', {
url: '/pptist', // 窗口关闭时，清除缓存
close: () => {
success: (win) => { // 窗口打开成功
const map = sessionStore.get('curr.winMap') || {}
map[win.id] = id // 将当前窗口id和课件id进行关联
sessionStore.set('curr.winMap', map)
},
close: (win) => {
const openFileIds = sessionStore.get('curr.openFileIds')||[] // 已打开课件列表id
const map = sessionStore.get('curr.winMap') || {}
const resourceId = map[win.id] // 当前窗口关联的课件id
if (resourceId){
const ind = openFileIds.findIndex(id => id == resourceId) // 是否存在打开的课件
if (ind >= 0) { // 存在打开的课件
openFileIds.splice(ind, 1) // 删除关联课件
if (openFileIds.length) sessionStore.set('curr.openFileIds', openFileIds) // 更新窗口课件列表
else sessionStore.delete('curr.openFileIds') // 清除缓存
delete map[win.id] // 删除 当前窗口课件关联
if(Object.keys(map).length) sessionStore.set('curr.winMap', map) // 更新窗口课件关联
else sessionStore.delete('curr.winMap') // 清除缓存
}
}
sessionStore.delete('curr.resource') // 清除缓存
sessionStore.delete('curr.smarttalk') // 清除缓存
getSmarttalkPage({

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

@ -274,13 +274,17 @@ export default {
treelogRef:null,
// 获取当前章节对应的课程信息 Entpcourse
entp: null,
isPgDialogClose: false, // 关闭进度条弹窗
pgDialog: { // 弹窗-进度条
visible: false,
title: 'PPT解析中...',
width: 300,
showClose: false,
showClose: true,
draggable: true,
beforeClose: done => {}, // 阻止-弹窗事件
beforeClose: done => { // 弹窗关闭前回调
this.isPgDialogClose = true
done()
},
pg: { // 进度条-参数
percentage: 0, // 百分比
color: [
@ -453,6 +457,9 @@ export default {
}
case 'click': { // 点击-打开课件-aippt
if (row.fileFlag === 'aippt' && !!row.fileId) {
const openFileIds = sessionStore.get('curr.openFileIds')||[] // 已打开课件列表id
const isHasOpen = openFileIds.includes(Number(row.fileId)) // 是否已打开
if (isHasOpen) return ElMessage.warning('该课件已打开！')
sessionStore.delete('curr.classcourse') // 清除上课相关信息
const res = await getEntpcoursefile(row.fileId)
if (res && res.code === 200) {
@ -496,12 +503,37 @@ export default {
* @param {object} currData 当前数据 type: edit/class 备课信息 | 课堂信息
*/
openPublicScreen(type, resource, currData) {
const openFileIds = sessionStore.get('curr.openFileIds')||[]
const isNoOpen = !openFileIds.includes(Number(resource.id)) // 是否不存在
if (isNoOpen) {
openFileIds.push(resource.id) // 课堂资源缓存-允许打开多个
sessionStore.set('curr.openFileIds', openFileIds) // 更新窗口课件列表id
}
sessionStore.set('curr.resource', resource) // 缓存当前资源信息
if (type=='edit') sessionStore.set('curr.smarttalk', currData) // 缓存当前文件smarttalk
else sessionStore.set('curr.classcourse', currData) // 缓存当前当前上课
createWindow('open-win', {
url: '/pptist', // 窗口关闭时，清除缓存
close: () => {
success: (win) => { // 窗口打开成功
const map = sessionStore.get('curr.winMap') || {}
map[win.id] = resource.id // 将当前窗口id和课件id进行关联
sessionStore.set('curr.winMap', map)
},
close: (win) => {
const openFileIds = sessionStore.get('curr.openFileIds')||[] // 课件列表
const map = sessionStore.get('curr.winMap') || {}
const resourceId = map[win.id] // 当前窗口关联的课件id
if (resourceId){
const ind = openFileIds.findIndex(id => id == resourceId) // 是否存在打开的课件
if (ind >= 0) { // 存在打开的课件
openFileIds.splice(ind, 1) // 删除关联课件
if (openFileIds.length) sessionStore.set('curr.openFileIds', openFileIds) // 更新窗口课件列表
else sessionStore.delete('curr.openFileIds') // 清除缓存
delete map[win.id] // 删除 当前窗口课件关联
if(Object.keys(map).length) sessionStore.set('curr.winMap', map) // 更新窗口课件关联
else sessionStore.delete('curr.winMap') // 清除缓存
}
}
sessionStore.delete('curr.resource') // 清除缓存
if (type=='edit') {
sessionStore.delete('curr.smarttalk') // 清除缓存
@ -584,6 +616,7 @@ export default {
},
handleFileChange(){
const file = event.target.files[0];
this.$refs.fileInput.value = ''
if (file) {
console.log(file);
console.log('文件名:', file.name);
@ -659,14 +692,20 @@ export default {
}
},
async createAIPPTByFile(file,fileShowName) {
this.isPgDialogClose = false // 默认不关闭
this.pgDialog.visible = true
this.pgDialog.pg.percentage = 0
const closePgDialog = () => {
this.pgDialog.pg.percentage = 0
this.pgDialog.visible = false
}
this.pptMedia = {} // 清空媒体数据
const resPptJson = await PPTXFileToJson(file).catch(() => {
ElMessageBox.alert('PPT文件转换失败！请点击素材右侧...下载文件后打开另存为PPTX文件格式再进行导入！')
this.pgDialog.visible = false
})
if (!resPptJson) return
if(this.isPgDialogClose) return closePgDialog() // 弹窗关闭了,终止进行
const { def, slides, ...content } = resPptJson
// 生成缩略图
const thumbnails = await slidesToImg(slides, content.width)
@ -674,13 +713,13 @@ export default {
let completed = 0
const total = slides.length
for( let o of slides ) {
if(this.isPgDialogClose) return closePgDialog() // 弹窗关闭了,终止进行
completed++
await this.toRousrceUrl(o)
// 设置进度条
this.pgDialog.pg.percentage = Math.floor(completed / total * 100)
}
this.pgDialog.pg.percentage = 0
this.pgDialog.visible = false
closePgDialog() // 关闭进度条弹窗
listEntpcourse({
evalid: this.currentNode.id,
edituserid: this.userStore.userId,