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

Merge pull request 'zhuhao_dev' (#342) from zhuhao_dev into main 

Reviewed-on: #342
This commit is contained in:
朱浩 2024-10-19 17:34:04 +08:00
parent 4e7b9f0a82 770a847e91
commit d03e6e2fbc
12 changed files with 109 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -15,3 +15,5 @@ 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_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
VITE_SHOW_DEV_TOOLS = 'true'

2
.env.production
View File

@ -17,3 +17,5 @@ VITE_BUILD_COMPRESS = gzip
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_SHOW_DEV_TOOLS = 'true'

7
src/main/index.js
View File

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

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

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

@ -6,7 +6,7 @@
: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" />
</div>
</el-menu>
@ -34,7 +34,7 @@
</el-col>
</el-row>
<!-- 作业类型:内容 -->
<div style="flex: 1;overflow: hidden;">
<div style="flex: 1;overflow: hidden;">
<el-table
ref="taskTable"
v-loading="loading"
@ -140,7 +140,7 @@
<div style="color: silver; display: flex;align-items: center;">
<div style="flex: 1;">{{ _item.worktype }}</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>
</div>
</div>
@ -188,7 +188,7 @@
</div>
</div>
</div>
<div v-else>
<div v-else>
<div v-if="workConfObj.teachFileList.length > 0">
<div style="margin: 10px 0;text-align: left; margin: auto 0; cursor: pointer;">
<span style="color: #409eff" @click="openFile">预览其他类型附件！</span>
@ -220,7 +220,7 @@
<!-- 已推送历史 -->
<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
ref="pushRecordsRef"
:data="pushRecordsList"
@ -287,7 +287,7 @@
<prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="courseObj"/>
<!-- 其他附件预览框 acceptParams-->
<prevReadImgFileDialog ref="prevReadImgFileDialogRef"/>
</div>
</div>
</template>
@ -309,7 +309,7 @@ import SetHomework from '@/components/set-homework/index.vue'
import {sessionStore} from '@/utils/store'
import {createWindow} from '@/utils/tool'
import { useToolState } from '@/store/modules/tool'
import {throttle,debounce } from '@/utils/comm'
import {throttle,debounce } from '@/utils/comm'
const toolState = useToolState();
@ -343,7 +343,7 @@ const courseObj = reactive({
})
const taskList = ref([]); // 作业列表
const loading = ref(false);
const loading = ref(false);
const pushRecordsList = ref([]); // 作业推送历史
const pushRecordsOpen = ref(false); // 推送历史记录弹窗
const pushRecordsLoading = ref(false); // 推送历史记录loading
@ -415,7 +415,7 @@ const initHomeWork = async()=> {
}
/**
* 查看推送历史
*
*
*/
const queryPushRecords = (row) => {
// 获取已推送历史
@ -438,7 +438,7 @@ const queryPushRecords = (row) => {
// if (res.rows[i].worktype == '学习目标定位') {
// res.rows[i].workclass = 'success';
// res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
// } else
// } else
// 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加
if (res.rows[i].worktype == '课堂展示') {
res.rows[i].workclass = 'primary';
@ -477,12 +477,12 @@ const debounceOpenWin = debounce(() => {
// 批改作业
const onClickItem = (item) => {
console.log('防抖开启弹窗')
// sessionStore.set('teachClassWorkItem', item); // 缓存点击的item
// sessionStore.set('teachClassWorkItem', item); // 缓存点击的item
localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
debounceOpenWin();
}
/**
/**
* 删除按钮操作 TODO 待完善
* */
const handleDelete =() => {
@ -620,8 +620,8 @@ const handleWorkTitleEdit = (row, index, type) => {
};
/**
* 作业内容-查看详情
* */
* 作业内容-查看详情
* */
const handleWorkEdit = (row, index) =>{
console.log(row, index)
workEdit.value = true
@ -639,7 +639,7 @@ const handleWorkTitleEdit = (row, index, type) => {
if ( res.data==null || res.data==undefined ) {
return;
}
res.data.worktype = '框架梳理';
res.data.score = listCourseWork[0].score;
@ -708,7 +708,7 @@ const handleWorkTitleEdit = (row, index, type) => {
};
/**
* 作业内容-前往作业设计 编辑页面
* @param row
* @param row
*/
const handleWorkEditItem = (row) => {
editListItem(row, courseObj).then((obj) => {
@ -780,11 +780,11 @@ const handleTaskAssignToAllClass = () => {
*/
const handleNewClassWorkDialog = () => {
// 打开作业设计页面
router.push({
router.push({
path: '/newClassTask',
query: {
isBack: true,
}
}
});
}
@ -880,18 +880,20 @@ watch(() => courseObj.node, (newVal,oldVal) => {
</script>
<!--
<style>
.el-table .hidden-row {
display: none !important;
/* color: #ccc !important; */
}
.el-table .father-row {
--el-table-tr-bg-color: #fff;
&#45;&#45;el-table-tr-bg-color: #fff;
}
.el-table .son-row {
--el-table-tr-bg-color: #f0f0f08a;
&#45;&#45;el-table-tr-bg-color: #f0f0f08a;
}
</style>
-->
<style lang="scss" scoped>
.page-classTaskAssign {
@ -935,4 +937,4 @@ watch(() => courseObj.node, (newVal,oldVal) => {
}
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>
<style src="@/assets/styles/JYStyle.css"></style>

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

@ -656,8 +656,6 @@ defineExpose({
})
</script>
<style src="@/assets/styles/JYStyle.css"></style>
<style scoped lang="scss">
/*:deep(.reserv-date-pick) {
width: 140px;
@ -765,3 +763,4 @@ defineExpose({
overflow-y: auto;
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

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

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

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

@ -6,7 +6,7 @@
: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" />
</div>
</el-menu>

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

@ -633,7 +633,7 @@ const closeDialog = () => {
}
onMounted(() => {
const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
// const data = sessionStore.get('teachClassWorkItem');
// const data = localStorage.getItem('teachClassWorkItem');
@ -658,8 +658,6 @@ onUnmounted(() => {
// })
</script>
<style src="@/assets/styles/JYStyle.css"></style>
<style scoped lang="scss">
.teachClassTask{
height: 100%;
@ -705,94 +703,6 @@ 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 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>
<style src="@/assets/styles/JYStyle.css"></style>

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

@ -14,7 +14,7 @@
</template>
</el-popover>
<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="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference>
<el-button-group>
@ -24,7 +24,7 @@
</template>
</el-popover>
<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="勾画、圈点，添加标记等，整理出本课的重点与难点，用于老师讲解和学生自主预习">
<template #reference>
<el-button-group>
@ -51,15 +51,15 @@
<examReview
:loading="loading"
:listExamQuestion="listExamQuestion"
v-if="curTask.viewkey=='真题回顾' "
v-if="curTask.viewkey=='真题回顾' "
/>
<pointAnalysis
v-else-if="curTask.viewkey=='考点分析' "
<pointAnalysis
v-else-if="curTask.viewkey=='考点分析' "
/>
<examMocks
v-else
<examMocks
v-else
/>
</div>
</div>
@ -88,9 +88,9 @@ const sourceStore = useResoureStore();
const viewportHeight = ref(0);
const viewportWidth = ref(0);
// 当前选中的章节或单元
const curNode = ref({});
// 试题集合
const listExamQuestion = ref([]);
const curNode = ref({});
// 试题集合
const listExamQuestion = ref([]);
const loading = ref(false);
const curTask = reactive({
viewkey: '真题回顾',
@ -299,4 +299,4 @@ onMounted(() => {
}
</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 { toTimeText } from '@/utils/date'
import { ElMessage, ElMessageBox } from 'element-plus'
import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file'
import useUserStore from '@/store/modules/user'
import outLink from '@/utils/linkConfig'
import { sessionStore } from '@/utils/store'
@ -208,6 +208,7 @@ export default {
}
if (action === 'cancel'){
// 继续上课
console.log(obj.bookImg)
if (obj.bookImg) {
//PPT
listEntpcourse({
@ -241,9 +242,20 @@ export default {
}
})
}else {
//APT
this.$emit('on-start-class', item, obj)
done()
console.log(obj)
getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{
console.log(res2)
//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') {

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

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