model/index.vue 冲突 解决

This commit is contained in:
lyc 2024-11-21 17:33:36 +08:00
commit 663ecb962c
23 changed files with 522 additions and 270 deletions

View File

@ -8,7 +8,7 @@
http-equiv="Content-Security-Policy"
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
/> -->
<meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *;img-src * 'self' data: blob:" />
<meta http-equiv="Content-Security-Policy" content="connect-src * blob: data:; default-src 'self'; script-src 'self' 'unsafe-eval' http://www.wiris.net; style-src 'self' 'unsafe-inline' http://www.wiris.net; media-src * blob:;img-src * 'self' data: blob:;font-src 'self' http://www.wiris.net;" />
</head>

View File

@ -0,0 +1,42 @@
import request from '@/utils/request'
// 新增图片存eos
export function saveUploadFile(data) {
return request({
url: '/education/uploadfile/saveUploadFile',
method: 'post',
headers: {
'Content-Type': 'multipart/form-data'
},
data: data
})
}
// 新增批量图片存eos
export function saveUploadFiles(data) {
return request({
url: '/education/uploadfile/saveUploadFiles',
method: 'post',
headers: {
'Content-Type': 'multipart/form-data'
},
data: data
})
}
// 修改basecomment
export function updateUploadFile(data) {
return request({
url: '/education/uploadfile',
method: 'put',
data: data
})
}
// 删除basecomment
export function delUploadFile(id) {
return request({
url: '/education/uploadfile/' + id,
method: 'delete'
})
}

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1731913617367') format('woff2'),
url('iconfont.woff?t=1731913617367') format('woff'),
url('iconfont.ttf?t=1731913617367') format('truetype');
src: url('iconfont.woff2?t=1732173266977') format('woff2'),
url('iconfont.woff?t=1732173266977') format('woff'),
url('iconfont.ttf?t=1732173266977') format('truetype');
}
.iconfont {
@ -13,6 +13,26 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-jiqiren_o:before {
content: "\eb62";
}
.icon-zhaoxiangji:before {
content: "\e679";
}
.icon-huaban:before {
content: "\e6e2";
}
.icon-tubiao_wuxing-:before {
content: "\e612";
}
.icon-soutibao-:before {
content: "\e605";
}
.icon-baocun:before {
content: "\e60e";
}

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,41 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "5387814",
"name": "机器人_o",
"font_class": "jiqiren_o",
"unicode": "eb62",
"unicode_decimal": 60258
},
{
"icon_id": "630128",
"name": "照相机",
"font_class": "zhaoxiangji",
"unicode": "e679",
"unicode_decimal": 59001
},
{
"icon_id": "12592146",
"name": "画板",
"font_class": "huaban",
"unicode": "e6e2",
"unicode_decimal": 59106
},
{
"icon_id": "6025688",
"name": "图标_五星-2",
"font_class": "tubiao_wuxing-",
"unicode": "e612",
"unicode_decimal": 58898
},
{
"icon_id": "11756625",
"name": "搜题宝-37",
"font_class": "soutibao-",
"unicode": "e605",
"unicode_decimal": 58885
},
{
"icon_id": "11467388",
"name": "保存",

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

@ -46,7 +46,8 @@ import "tinymce/plugins/anchor"; //锚点
import { ref, reactive, defineProps, defineEmits, nextTick, onMounted, computed, watch } from 'vue'
import { getStaticUrl } from '@/utils/tool'
//import { listUploadfile, getUploadFile, delUploadFile, addUploadFile, saveUploadFile } from "@/api/comm/uploadfile";
import useUserStore from '@/store/modules/user'
import { saveUploadFile } from "@/api/file/img";
const emits = defineEmits(["update:modelValue", "setHtml"]);
//props便
@ -107,6 +108,8 @@ const props = defineProps({
default: () => ({ userId: 0, fileAlias: '单题上传' }),
},
});
const userStore = useUserStore().user;
const pasteImgName = ref('');
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); //
@ -184,10 +187,10 @@ const init = reactive({
min_height: props.minHeight,
draggable_modal: true,
extended_valid_elements: '*[.*]',
// external_plugins: {
// tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
// //tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
// },
external_plugins: {
tiny_mce_wiris: `/tinymce/tool/@wiris/mathtype-tinymce6/plugin.min.js`,
//tiny_mce_wiris: `https://www.wiris.net/demo/plugins/tiny_mce/plugin.js`,
},
// setup: function (editor) {
// },
@ -212,29 +215,31 @@ const init = reactive({
// /() - , [images_upload_handler]
file_picker_callback: function(callback, value, meta) {
return;
//
let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4';
let upURL = '/common/upload';
//
switch(meta.filetype){
case 'image':
filetype='.jpg, .jpeg, .png, .gif';
//upURL='upimg.php';
break;
case 'media':
filetype='.mp3, .mp4';
//upURL='upfile.php';
break;
case 'file':
default:
}
// let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4';
// let upURL = '/common/upload';
// //
// switch(meta.filetype){
// case 'image':
// filetype='.jpg, .jpeg, .png, .gif';
// //upURL='upimg.php';
// break;
// case 'media':
// filetype='.mp3, .mp4';
// //upURL='upfile.php';
// break;
// case 'file':
// default:
// }
// input
let input = document.createElement('input');
input.setAttribute('type', 'file');
input.setAttribute('accept', filetype);
// // input
// let input = document.createElement('input');
// input.setAttribute('type', 'file');
// input.setAttribute('accept', filetype);
//
// //
// input.onchange = function() {
// const file = this.files[0];
// const formData = new FormData();
@ -250,7 +255,7 @@ const init = reactive({
// });
// };
input.click();
// input.click();
},
// /()
@ -278,22 +283,25 @@ const init = reactive({
formData.append("entpcourseid", 0);
formData.append("filetype", "image");
formData.append("suffix", "image");
formData.append("status", '0');
if(props.upFileParams?.hasOwnProperty('deptId')){
formData.append("entpid", props.upFileParams.deptId);
formData.append("status", '1');
if(userStore.deptId && userStore.deptId != null){
formData.append("entpid", userStore.deptId);
}
if(props.upFileParams?.hasOwnProperty('userId')){
formData.append("userid", props.upFileParams.userId);
if(userStore.userId && userStore.userId != null){
formData.append("userid", userStore.userId);
}
if(props.upFileParams?.hasOwnProperty('edudegree')){
let edudegree = props.upFileParams.edudegree.toString();
if(userStore.edudegree && userStore.edudegree != null){
let edudegree = userStore.edudegree.toString();
if(edudegree != '' && edudegree.indexOf('年级') == -1){
edudegree += '年级';
}
formData.append("edudegree", edudegree);
}
if(props.upFileParams?.hasOwnProperty('edusubject')){
formData.append("edusubject", props.upFileParams.edusubject);
if(userStore.edusubject && userStore.edusubject != null){
formData.append("edusubject", userStore.edusubject);
}
if(userStore.edustage && userStore.edustage != null){
formData.append("edustage", userStore.edustage);
}
if(props.upFileParams?.hasOwnProperty('lessionId')){
formData.append("evalid", props.upFileParams.lessionId);
@ -301,19 +309,22 @@ const init = reactive({
if(props.upFileParams?.hasOwnProperty('fileAlias')){
formData.append("filegroup", props.upFileParams.fileAlias);
}
loading.value = true;
console.log('formData->', formData);
//
// saveUploadFile(formData)
// .then((res) => {
// loading.value = false;
// return resolve(res.fileurl);
// })
// .catch((err) => {
// loading.value = false;
// return reject('err:' + err);
// });
saveUploadFile(formData)
.then((res) => {
console.log('res->', res);
loading.value = false;
return resolve(res.fileurl);
})
.catch((err) => {
loading.value = false;
return reject('err:' + err);
});
}
),

View File

@ -1,5 +1,5 @@
<template>
<div class="whiteboart-container">
<div class="whiteboart-container" :style="{ height: height + 'px' }">
<div class="canvasBox" ref="box"></div>
<div class="footerLeft" @click.stop
@ -15,7 +15,7 @@
</el-tooltip>
</div>
<div class="blockBox">
<el-button @click="currentType = 'selection'"><el-image src="/src/assets/icons/pngjpg/mouse-pointer.png"
<el-button @click="currentType = 'selection'"><el-image src="/src/assets/images/mouse-pointer.png"
style="width: 14px; height: 14px; color: silver" /></el-button>
</div>
<template v-if="type == 'design'">
@ -53,7 +53,8 @@
</el-radio-group>
</template>
<div class="blockBox">
<el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button>
<!-- <el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button> -->
<el-button @click="handleToolTypeChange('image')">图片</el-button>
</div>
<div class="blockBox" v-if="!readonly">
<el-dropdown @command="handleToolTypeChange" placement="top">
@ -71,7 +72,7 @@
<template v-if="type != 'design'">
<el-dropdown-item command="freedraw">画笔</el-dropdown-item>
<el-dropdown-item command="text">文字</el-dropdown-item>
<el-dropdown-item command="image">图片</el-dropdown-item>
<!-- <el-dropdown-item command="image">图片</el-dropdown-item> -->
</template>
</el-dropdown-menu>
</template>
@ -122,7 +123,7 @@
<!-- 边框样式 -->
<div class="blockBox">
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
<el-button><el-image src="/src/assets/icons/pngjpg/borderstyle.png"
<el-button><el-image src="/src/assets/images/borderstyle.png"
style="width: 14px; height: 14px"></el-image></el-button>
<template #dropdown>
<el-dropdown-menu>
@ -134,8 +135,7 @@
</el-dropdown>
</div>
<!--透明度-->
<div class="blockBox" style="width: 120px"
v-if="type == 'design' ? true : ['image'].includes(activeElement?.type) || hasSelectedElements">
<div class="blockBox" style="width: 120px">
<el-tooltip effect="light" content="透明度" placement="top">
<el-input-number v-model="globalAlpha" :min="0" :max="1" :step="0.1"
@change="updateStyle('globalAlpha', $event)"></el-input-number>
@ -145,7 +145,7 @@
<!-- 边框粗细 -->
<div class="blockBox">
<el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
<el-button><el-image src="/src/assets/icons/pngjpg/borderwidth.png"
<el-button><el-image src="/src/assets/images/borderwidth.png"
style="width: 14px; height: 14px"></el-image></el-button>
<template #dropdown>
<el-dropdown-menu>
@ -309,11 +309,11 @@ const props = defineProps({
default: true
},
height: {
type: Number,
type: [Number,String],
default: 700,
},
width: {
type: Number,
type: [Number,String],
default: 1000,
},
data: {
@ -685,6 +685,20 @@ const getCanvasBase64 = async () =>{
return base64
}
const getCanvasBlob = async () =>{
return await app.exportImage({
type: 'image/jpeg',
renderBg: exportRenderBackground.value,
paddingX: exportImagePaddingX.value,
paddingY: exportImagePaddingY.value,
onlySelected: exportOnlySelected.value,
useBlob: true,
backgroundColor: '#ffffff'
})
}
watch(() => props.data, (newVal) => {
if (newVal) {
setCanvasData(newVal)
@ -773,7 +787,8 @@ defineExpose({
showFit,
getCanvasJson,
getCanvasBase64,
setCanvasData
setCanvasData,
getCanvasBlob
})
</script>
@ -895,7 +910,7 @@ ol {
font-size: 14px;
color: #000;
:deep(.jsontree_tree) {
/deep/ .jsontree_tree {
font-family: 'Trebuchet MS', Arial, sans-serif !important;
}
}

View File

@ -1,12 +1,23 @@
<template>
<div class="list-container">
<div class="content-list" v-for="(item, index) in items" :key="index" @click="handleClick(item)">
<div class="item-content">
<div class="item-text">
<div class="item-title">{{ item.title }}</div>
<div class="item-description">{{ item.description }}</div>
<div class="list-content">
<div class="list-container">
<div class="content-list" v-for="(item, index) in items" :key="index" @click="handleClick(item)">
<div class="item-content">
<div class="item-text">
<div class="title-header">
<div class="item-title">{{ item.title }}</div>
<div class="icon-box">
<svg class="icon iconfont" aria-hidden="true" style="font-size: 35px;">
<use :xlink:href="item.icon"></use>
</svg>
</div>
</div>
<div class="item-description">{{ item.description }}</div>
<div class="item-bottom">
<el-tag :type="item.type" size="default">{{ item.title }}</el-tag>
</div>
</div>
</div>
<el-icon class="item-icon"><component :is="item.icon" /></el-icon>
</div>
</div>
</div>
@ -15,17 +26,16 @@
<script setup>
import { shallowRef } from 'vue';
import { ElMessage } from 'element-plus'
import { Plus, ArrowDown, Document, User, Setting } from '@element-plus/icons-vue';
const emit = defineEmits(['itemClick'])
const items = shallowRef([
{ title: '自主搜题', description: '1111111', icon: Document },
{ title: '校本题库', description: '222222', icon: User },
{ title: '个人题库', description: '333333', icon: Setting },
{ title: '智能推荐', description: '444444', icon: Plus },
{ title: '课堂展示', description: '555555', icon: ArrowDown },
{ title: '常规作业', description: '555555', icon: ArrowDown },
{ title: 'AI设计作业', description: '555555', icon: ArrowDown },
{ title: '自主搜题', description: '1111111111111111111111111111111111111', icon: '#icon-soutibao-',type:'primary' },
{ title: '校本题库', description: '222222', icon: '#icon-soutibao-',type:'success' },
{ title: '个人题库', description: '333333', icon: '#icon-soutibao-',type:'default' },
{ title: '智能推荐', description: '444444', icon: '#icon-tubiao_wuxing-',type:'default' },
{ title: '课堂展示', description: '555555', icon: '#icon-huaban',type:'primary' },
{ title: '常规作业', description: '555555', icon: '#icon-zhaoxiangji',type:'primary' },
{ title: 'AI设计作业', description: '555555', icon: '#icon-jiqiren_o',type:'danger' },
]);
const handleClick = (item) => {
@ -42,20 +52,25 @@ const handleClick = (item) => {
</script>
<style scoped>
.list-content{
padding: 8px;
background-color: #f5f5f5;
border-radius: 8px;
height: 100%;
margin-left: 10px
}
.list-container {
display: flex;
flex-wrap: wrap;
gap: 16px;
padding: 16px;
/* background-color: #f5f5f5; */
}
.content-list {
background-color: #fff;
border-radius: 8px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
padding: 16px;
width: calc(33.333% - 32px); /* 3列布局每列减去gap */
padding: 8px;
width: calc(25% - 16px);
cursor: pointer;
transition: all 0.3s ease;
}
@ -68,6 +83,7 @@ const handleClick = (item) => {
.item-content {
display: flex;
align-items: center;
height: 100%;
}
.item-icon {
@ -78,6 +94,10 @@ const handleClick = (item) => {
.item-text {
flex: 1;
justify-content: space-between;
display: flex;
flex-direction: column;
height: 100%;
}
.item-title {
@ -85,10 +105,38 @@ const handleClick = (item) => {
font-weight: 500;
color: #303133;
margin-bottom: 4px;
font-weight: bold;
}
.item-description {
font-size: 14px;
color: #909399;
text-align: left;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 设置最大行数 */
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
}
.title-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.item-bottom {
text-align: right;
}
/* 过渡动画 */
.fade-enter-active, .fade-leave-active {
transition: opacity 0.3s;
}
.fade-enter, .fade-leave-to {
opacity: 0;
}
</style>

View File

@ -6,14 +6,14 @@
<el-button type="success" @click="handleTaskAssignToAllClass()">批量推送</el-button>
</div>
<div v-if="currentRow.id > 0" class="page-top-right">
<el-button type="primary" @click="handleNewAllClass">设计新作业</el-button>
<el-button type="primary" @click="handleNewAllClass" :icon="Plus">设计新作业</el-button>
</div>
</div>
<div class="page-resource">
<div class="page-resource">
<div class="page-left">
<el-table
ref="taskTable"
v-loading="loading"
v-loading="tasklist_loading"
:data="taskList"
:tree-props="{checkStrictly: true}"
row-key="id"
@ -22,18 +22,25 @@
@current-change="handleCurrentChange"
>
<el-table-column type="selection" min-width="2%" align="center" :selectable="selectable"/>
<el-table-column label="作业布置" min-width="18%" align="center">
<el-table-column label="作业布置" min-width="15%" align="center">
<template #default="scope">
<div style="height: 100px;">
<div class="pageleft-table-top">
<span>{{ scope.row.uniquekey }}</span>
</div>
<div class="pageleft-table-top">
<el-tag :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
<span>{{ scope.row.timestamp }}</span>
</div>
<div class="pageleft-table-cont">
<p class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</p>
<div style="height: 100px;cursor: pointer">
<div style="display: flex;align-items: center;justify-content: space-between;">
<div style="width: 90%;">
<div class="pageleft-table-top">
<span>{{ scope.row.uniquekey }}</span>
</div>
<div class="pageleft-table-top" style="display: flex;justify-content: space-between">
<el-tag style="padding:0 2px" :type="scope.row.workclass" size="default">{{ scope.row.worktype }}</el-tag>
<el-text size="small" style="color:#ccc;white-space:nowrap">{{ scope.row.timestamp }}</el-text>
</div>
<div class="pageleft-table-cont">
<div :title="scope.row.worktag || scope.row.title" class="ellipsis "> {{ scope.row.worktype == "课堂展示" ? scope.row.worktag : scope.row.title }}</div>
</div>
</div>
<svg class="icon iconfont" aria-hidden="true">
<use xlink:href="#icon-xiangyou"></use>
</svg>
</div>
</div>
</template>
@ -41,11 +48,11 @@
</el-table>
</div>
<div v-if="currentRow.id == 0" style="width: 100%; height: 100%;">
<div v-if="currentRow.id == 0" style="width: 100%; height: 100%;">
<!-- 默认的习题类型卡片 -->
<Right @itemClick="handleItemClick" />
</div>
<div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id>0" class="page-center">
<el-tabs v-model="activeAptTab" style="height: 100%;">
<el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
@ -62,7 +69,7 @@
<div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id>0" class="page-center">
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
<!-- <whiteboard v-if="isShowBoard" ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="whiteboardObj"/> -->
<whiteboard ref="boardref" height=" 100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
<whiteboard ref="boardref" height="100%" width="100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
</div>
</div>
<div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业')&& currentRow.id>0" class="page-center">
@ -70,20 +77,20 @@
<FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
</div>
</div>
<div v-if="currentRow.id>0 " class="page-right">
<div class="prepare-top" >
<el-button v-if="currentRow.id != 1 " type="success" @click="openSet(currentRow,'item')"> </el-button>
<el-button type="primary" @click="handleClassWorkSave"> </el-button>
</div>
<div class="prepare-con" >
<el-form
ref="classWorkFormRef"
:model="classWorkForm"
label-width="90"
<el-form
ref="classWorkFormRef"
:model="classWorkForm"
label-width="90"
style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;"
>
<div >
<div >
<el-form-item label="作业名称">
<el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称"/>
</el-form-item>
@ -93,8 +100,8 @@
<el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea" placeholder="请输入作业说明" />
</el-form-item>
</div>
<div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
<div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
<div :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
<template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
<div style="margin: 5px; background-color: white">
@ -122,6 +129,7 @@
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash'
import { Plus } from '@element-plus/icons-vue'
import { delClasswork } from '@/api/teaching/classwork'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -136,6 +144,10 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
import FileUpload from "@/components/FileUpload/index.vue";
import Right from './Right/index.vue'
import {
Delete
} from '@element-plus/icons-vue'
import SetHomework from '@/components/set-homework/index.vue'
import { useGetHomework } from '@/hooks/useGetHomework'
import { sessionStore } from '@/utils/store'
@ -221,7 +233,7 @@ const selectable=(row, index)=>{
* 获取 entpcourseid 获取作业列表
*/
const initHomeWork = async()=> {
tasklist_loading.value = true;
tasklist_loading.value = true;
// const { res, chapterId } = await useGetHomework(courseObj.node);
const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
console.log('entpcourseid', chapterId);
@ -233,7 +245,7 @@ const initHomeWork = async()=> {
const handleNewAllClass = () => {
taskTable.value.setCurrentRow({});//
currentRow.value = {id:0}; //
currentRow.value = {id:0}; //
//--------
classWorkForm.id = 0;
classWorkForm.uniquekey = ""; //
@ -260,7 +272,7 @@ const handleDelete =() => {
return delClasswork(ids.join(','));
}).then(() => {
taskTable.value.setCurrentRow({});//
currentRow.value = {id:0}; //
currentRow.value = {id:0}; //
taskList.value = [];
// initHomeWork();
setTimeout(() => {
@ -351,17 +363,17 @@ let propsformobj = reactive({
* 选中的布置作业行
*/
const handleCurrentChange = (val) => {
console.log(val,'???????????')
if(val && val.id >0 ) {
currentRow.value = val;
classWorkForm.worktype = val.worktype; //
editListItem(val, courseObj).then((obj) => {
if(obj){
propsformobj = obj;
//
classWorkForm.id = obj.id;
classWorkForm.uniquekey = cloneDeep(obj.uniquekey); //
classWorkForm.worktype = cloneDeep(obj.worktype); //
classWorkForm.title = cloneDeep(obj.title); //
classWorkForm.quizlist = cloneDeep(obj.quizlist); //
classWorkForm.chooseWorkLists = cloneDeep(obj.chooseWorkLists); // list
@ -375,7 +387,7 @@ const handleCurrentChange = (val) => {
/**
* 添加作业
* @param entpcourseworkid
* @param entpcourseworkid
*/
const handleClassWorkQuizAdd = (entpcourseworkid) => {
var exist = false;
@ -679,7 +691,7 @@ const editWork = async (cform) =>{
// //
// router.back()
}
}
//----
@ -712,7 +724,7 @@ const editWork = async (cform) =>{
}
}
.page-left {
width: 300px;
width: 240px;
background-color: white;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
@ -731,20 +743,23 @@ const editWork = async (cform) =>{
// overflow: hidden;
// flex-direction: row;
// text-overflow: ellipsis;
width: 230px; /* 设置容器的宽度 */
width: 100%; /* 设置容器的宽度 */
overflow: hidden; /* 隐藏超出容器的部分 */
white-space: nowrap; /* 防止文本换行 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
.ellipsis {
width: 100%;
text-align: left;
overflow: hidden; /* 隐藏超出容器的部分 */
white-space: nowrap; /* 防止文本换行 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
}
}
.page-center{
flex: 1;
// width: 100%;
//min-width: calc(100% - 675px);
height: 100%;
padding: 0 5px;
margin: 0 5px;
@ -756,8 +771,8 @@ const editWork = async (cform) =>{
height: 100%;
display: flex;
flex-direction: column;
}
.prepare-center-xbtk{
height: 100%;

View File

@ -1,5 +1,5 @@
<template>
<div class="page">
<div class="page-myquest">
<!-- 习题筛选1 -->
<el-row style="width: 100%; height: 50px;">
<el-col :span="7">
@ -72,7 +72,9 @@
<template #default="scope">
<div>
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
<div style="padding: 5px;"></div>
<div style="padding: 2px;"></div>
<el-button type="warning" @click="handleImportSingleDlg(scope.row)">纠错</el-button>
<div style="padding: 2px;"></div>
<el-button type="danger" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
</div>
</template>
@ -91,9 +93,28 @@
</div>
<!-- 试题详细信息 -->
<examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
<!-- 单题上传的对话框/ 纠错对话框 close-on-click-modal|close-on-press-escape 避免误点dialog区域外导致白填入大量题目内容
style="width: 70%; height: 80%; overflow: hidden"-->
<el-dialog
v-model="dlgImportSingle.open"
class="my-custom-dialog"
:title="dlgImportSingle.title"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<QuesItem
ref="refquesItem"
:bookobj="props.bookobj"
@submit-exam-single-callback="onSubmitExamSingleCallback"
@cancel-exam-single-callback="onCancelExamSingleCallback"
>
</QuesItem>
</el-dialog>
</div>
</template>
<script setup>
import { Search } from '@element-plus/icons-vue'
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import { useRouter, useRoute } from 'vue-router'
@ -102,6 +123,7 @@ import { listEvaluationclue } from '@/api/classTask'
import { delEntpcoursework } from "@/api/education/entpCourseWork";
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
import { useHandleData } from "@/hooks/useHandleData";
import { processList } from '@/hooks/useProcessList'
@ -190,6 +212,11 @@ const workResource = reactive({
entpCourseWorkTotal: 0, //
}); //
const dlgImportSingle = reactive({
title: '单题上传',
open: false,
})
onMounted(() => {
debounceQueryData(); //
})
@ -356,6 +383,44 @@ const getPaginationList = ( page, limit ) => {
handleQueryFromEntpCourseWork(0);
}
/** 单题上传弹出框----纠错修改框 */
const handleImportSingleDlg=(item, index) => {
dlgImportSingle.open = true;
//
// this.handleImportSingle();
//console.log("")
if (item == '{}') {
//
//
proxy.$nextTick(() => {
proxy.$refs.refquesItem.resetForm();
})
dlgImportSingle.title = "单题上传";
} else {
//
proxy.$nextTick(() => {
item.status = '1';
proxy.$refs.refquesItem.updateForm(item, index, 1);
})
dlgImportSingle.title = "纠错上传";
}
}
//
const onCancelExamSingleCallback=()=>{
//
dlgImportSingle.open = false;
};
/** 单题上传/纠错 完成后的回调 */
const onSubmitExamSingleCallback=(callback) =>{
if (callback.submitType !== 1) {
console.log('999-999');
return;
}
//
debounceQueryData();
//
dlgImportSingle.open = false;
};
/** 删除题目按钮操作 */
const handleDelete = async(item, index) => {
@ -412,8 +477,19 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
})
</script>
<style>
.my-custom-dialog{
width: 60% !important;
height: 77vh !important;
overflow: hidden !important;
}
.my-custom-dialog .el-dialog__body {
height: 90% !important;
overflow: auto !important;
}
</style>
<style scoped lang="scss">
.page {
.page-myquest {
height: 100%;
display: flex;
flex-direction: column;
@ -422,7 +498,28 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
width: 100%;
height: calc(100% - 100px);
}
// :deep(.el-dialog .question-dialog){
// height: 80vh !important;
// width: 80% !important;
// overflow: hidden !important;
// }
// .el-dialog .question-dialog{
// height: 80vh !important;
// width: 80% !important;
// overflow: hidden !important;
// }
}
// .question-dialog{
// width: 80% !important;
// }
// :deep(.el-dialog) {
// width: 80% !important;
// }
</style>
<style src="@/assets/styles/JYStyle.css"></style>

View File

@ -174,22 +174,22 @@ const initHomeWork = async()=> {
// taskList.value = res;
// tasklist_loading.value = false;
}
const getBase64 = (file) =>{
return new Promise(function (resolve, reject) {
let reader = new FileReader();
let imgResult = "";
reader.readAsDataURL(file);
reader.onload = function () {
imgResult = reader.result;
};
reader.onerror = function (error) {
reject(error);
};
reader.onloadend = function () {
resolve(imgResult);
};
});
}
// const getBase64 = (file) =>{
// return new Promise(function (resolve, reject) {
// let reader = new FileReader();
// let imgResult = "";
// reader.readAsDataURL(file);
// reader.onload = function () {
// imgResult = reader.result;
// };
// reader.onerror = function (error) {
// reject(error);
// };
// reader.onloadend = function () {
// resolve(imgResult);
// };
// });
// }
/**
* @desc: 上传本地图片
* @return: {*}
@ -203,37 +203,7 @@ const handleImportImg = (uploadFile) => {
});
return;
}
console.log('uploadFile', uploadFile);
//
getBase64(uploadFile.raw).then(res => {
// console.log('res-------', res);
// Electron 使 URL.createObjectURL
// const base64Data = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/...'; // Base64
// const base64Data = res; // Base64
// const buffer = Buffer.from(base64Data.split(',')[1], 'base64');
// const filePath = path.join(Remote.app.getPath('userData'), 'image.jpg');
// console.log(filePath,'???????????????????');
// fs.writeFileSync(filePath, buffer);
// const buf = fs.readFileSync(filePath)
// console.log(buf);
// const uint8Buffer = Uint8Array.from(buf)
// cropOption.img = window.URL.createObjectURL(new Blob([uint8Buffer]));
// cropOption.img = URL.createObjectURL(new Blob([fs.readFileSync(filePath)]));
// cropOption.img = URL.createObjectURL(new Blob([buffer]));
cropOption.img = res;
// console.log(cropOption.img);
// cropOption.img = window.URL.createObjectURL(new Blob([res]));
// console.log(cropOption.img);
})
// cropOption.img = window.URL.createObjectURL(uploadFile.raw);
// cropOption.img = window.URL.createObjectURL(new Blob([uploadFile.raw]));
// cropOption.img = window.URL.createObjectURL(new Blob([uploadFile.raw]));
// console.log(cropOption.img);
cropOption.img = window.URL.createObjectURL(uploadFile.raw);
ElMessage.success('上传成功');
};
/**
@ -246,9 +216,6 @@ const getClipboardImg = async() => {
for (const item of clipboardItems) {
for (const type of item.types) {
if (type.includes('image/')) {
console.log('剪贴板图片type', type);
console.log('剪贴板图片item', item);
console.log('剪贴板图片clipboardItems', clipboardItems);
const blob = await item.getType(type);
// blob Blob
cropOption.img = URL.createObjectURL(blob);

View File

@ -67,17 +67,13 @@
<div class="questForm-item-cover">
<el-form-item :label="questForm.worktype == '复合题' ? '背景材料' : questForm.worktype == '主观题' ? '背景资料' : '题目'" prop="title">
<Tinymce v-model="questForm.title" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}"
/>
</el-form-item>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('title')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('title')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -87,10 +83,6 @@
<el-form-item :label=Options(1,index) :prop="`list.${index}.text`"
:rules="{required: true, message: '选项不能为空', trigger: 'blur'}">
<Tinymce v-model="item.text" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
@ -106,7 +98,7 @@
</el-form-item>
</div>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -122,10 +114,6 @@
v-model="item.text"
:minHeight="150"
:upFileParams = "{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
@ -141,7 +129,7 @@
</el-form-item>
</div>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -151,10 +139,6 @@
<el-form-item :label=Options(3,index) :prop="`list.${index}.text`"
:rules="{required: true, message: '填空选项不能为空', trigger: 'blur'}">
<Tinymce v-model="item.text" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
@ -169,7 +153,7 @@
</el-form-item>
</div>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"></el-button>
</div>
</div>
@ -196,16 +180,12 @@
<div v-if="questForm.worktype.indexOf('主观题') != -1" class="questForm-item-cover">
<el-form-item label="答案">
<Tinymce v-model="questForm.workanswer" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
</el-form-item>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workanswer')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('workanswer')"><el-icon><Search /></el-icon></el-button>
</div>
<!-- subjList -->
@ -273,7 +253,8 @@
<el-tag v-else type="danger" style=" margin-left: 10px ">温馨提示这里 - 号删除的是最后一道题目哟</el-tag>
</el-form-item>
<div class="item-cropper-btn-multi">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button>
<!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
<el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
</div>
@ -281,10 +262,6 @@
<el-form-item :label="`${item.type}目${index+1}.`" :prop="`mulList.params.${index}.title`" :rules="{
required: true, message: '题目不能为空', trigger: 'blur'}" :key='index'>
<Tinymce v-model="item.title" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}"
@ -296,10 +273,6 @@
<el-form-item :label=Options(1,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
:rules="{ required: true, message: '单题不能为空', trigger: 'blur' }" :key='indexOp'>
<Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}"
@ -320,10 +293,6 @@
<el-form-item :label=Options(3,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
:rules="{required: true, message: '填空选项不能为空', trigger: 'blur'}">
<Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}"
@ -344,10 +313,6 @@
<el-form-item :label=Options(1,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
:rules="{required: true, message: '多选不能为空', trigger: 'blur'}">
<Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}"
@ -378,10 +343,6 @@
<div v-if="item.type == '主观题'">
<el-form-item :label=Options(6,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`">
<Tinymce v-model="itemOp.text" :upFileParams="{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
@ -394,18 +355,15 @@
<!-- 答案分析 -->
<div class="questForm-item-cover">
<el-form-item label="答案分析" prop="method">
<Tinymce v-model="questForm.method"
<Tinymce
v-model="questForm.method"
:upFileParams = "{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
</el-form-item>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('method')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('method')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -414,16 +372,12 @@
<el-form-item label="答案解答" prop="analyse">
<Tinymce v-model="questForm.analyse"
:upFileParams = "{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
</el-form-item>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('analyse')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('analyse')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -432,16 +386,12 @@
<el-form-item label="答案点评" prop="discuss">
<Tinymce v-model="questForm.discuss"
:upFileParams = "{
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
}" />
</el-form-item>
<div class="item-cropper-btn">
<el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('discuss')"></el-button>
<el-button v-show="isCropper" circle @click="cropperFormItem('discuss')"><el-icon><Search /></el-icon></el-button>
</div>
</div>
@ -455,6 +405,7 @@
</template>
<script setup>
import { ElMessage, ElNotification } from 'element-plus'
import { Search } from '@element-plus/icons-vue'
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import { getBindlist } from '@/api/education/knowledgePoint'
@ -466,7 +417,7 @@ import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user
const { proxy } = getCurrentInstance()
// emit
const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-questForm-item'])
const emit = defineEmits(['submit-exam-single-callback','cancel-exam-single-callback','cropper-exam-form-item'])
const props = defineProps({
bookobj: {
type: Object,
@ -521,7 +472,7 @@ const initKonwPointFlagByUpdateForm = ref(true);
// []
const curKnowledgePointList = ref([]);
//
let questForm = reactive({
const questForm = reactive({
id: 0,
title: '',
worktype: '单选题',
@ -648,10 +599,6 @@ const loading = ref(false);
onMounted(() => {
lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId; // id
upFileParams.value = {
deptId: userStore.deptId,
userId: userStore.userId,
edudegree: userStore.edudegree,
edusubject: userStore.edusubject,
lessionId: lessionid,
fileAlias: '单题上传',
};
@ -717,7 +664,7 @@ const checkBoxChangefh=(item, index, indexOp)=>{
};
/** 表单重置 */
const resetForm = () =>{
questForm = {
Object.assign(questForm, {
id: 0,
title: '',
worktype: '单选题',
@ -768,7 +715,7 @@ const resetForm = () =>{
},
],
},
};
});
};
/**
* @desc: 赋值表单
@ -1061,7 +1008,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
});
}
questForm = {
Object.assign(questForm,{
id: item.id,
title: item.worktype == '复合题' ? titleMulList : item.title,
worktype: item.worktype,
@ -1090,7 +1037,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
worktype: '填空题',
params: newSubjListparams,
},
};
});
// proxy.resetForm("questFormRef");
//
@ -1654,7 +1601,7 @@ const cropperFormItem=(curItem)=> {
// : /////
const examType = questForm.worktype;
emit('cropper-exam-questForm-item', examType, curItem);
emit('cropper-exam-form-item', examType, curItem);
};
/**
@ -1712,6 +1659,7 @@ const myMessageShow=(title, msg, status)=>{
// deep: true //
// },
// },
watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
console.log(props.bookobj,'课程选择')
// props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId
@ -1721,7 +1669,9 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
// ()
defineExpose({
updateForm
updateForm,
resetForm,
cropperFormItemCallBack,
})
</script>
<style scoped lang="scss">

View File

@ -52,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> </el-button>
<el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon></el-button>
</el-col>
</el-row>
<!-- 习题表格 -->
@ -102,6 +102,8 @@
</div>
</template>
<script setup>
import { Search } from '@element-plus/icons-vue'
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'

View File

@ -2,7 +2,13 @@
<div>
<div class="form-item-cover">
<el-form-item label="答案点评" prop="discuss">
<tinymce v-model="discuss"/>
<tinymce
v-model="discuss"
:upFileParams="{
lessionId: 123456,
fileAlias: '单题上传',
}"
/>
</el-form-item>
</div>
</div>

View File

@ -127,7 +127,6 @@ onMounted(() => {
.title-header{
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: column;
}

View File

@ -1,16 +1,22 @@
<template>
<div>
<div class="mb-4">
<el-button type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
<el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
<el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
<el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
<el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
<el-button type="success" @click="openPPTist">打开PPTist</el-button>
<el-button type="warning" @click="onchange('/model/examination')">考试分析</el-button>
</div>
<ChooseTextbook @change-book="getData" @node-click="getData" />
<div class="page-resource flex">
<!-- 左侧 教材 目录 -->
<ChooseTextbook @change-book="getData" @node-click="getData" />
<div class="page-right">
<div class="button-container">
<el-button style="margin-left: 12px;" type="primary" @click="onchange('/model/curriculum')">课标研读</el-button>
<el-button type="primary" @click="onchange('/model/management')">作业管理1</el-button>
<el-button type="primary" @click="onchange('/model/newClassTaskAssign')">作业管理2</el-button>
<el-button type="success" @click="onchange('/model/teaching')">教材研读</el-button>
<el-button type="info" @click="onchange('/model/design')">教学框架设计</el-button>
<el-button type="success" @click="openPPTist">打开PPTist</el-button>
<el-button type="info" @click="onchange('/model/examination')">考试分析</el-button>
</div>
</div>
</div>
</div>
</template>
<script setup>
@ -26,10 +32,10 @@ const courseObj = reactive({
textbookId: '',
levelFirstId: '',
levelSecondId: '',
coursetitle:'',
coursetitle: '',
node: null, //
//
})
//
const getData = (data) => {
const { textBook, node } = data
@ -50,22 +56,53 @@ const getData = (data) => {
courseObj.node = node; //
// ID
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId }))
}
const openPPTist = () =>{
createWindow('open-win', {url: '/pptist'})
const openPPTist = () => {
createWindow('open-win', { url: '/pptist' })
}
const onchange = (path) =>{
if(path == '/model/newClassTaskAssign'){
const onchange = (path) => {
if (path == '/model/newClassTaskAssign') {
//
router.push({path, query: { courseObj: JSON.stringify(courseObj)}})
}else{
router.push({ path, query: { courseObj: JSON.stringify(courseObj) } })
} else {
router.push(path)
}
}
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.page-resource {
height: 100%;
padding: 10px 15px 0;
.page-right {
min-width: 0;
display: flex;
flex-direction: column;
flex: 1;
margin-left: 20px;
height: 100%;
background: #ffffff;
border-radius: 10px;
box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
}
.button-container {
display: flex;
flex-wrap: wrap;
gap: 10px;
margin: 1rem 0;
justify-content: flex-start;
.el-button {
flex: 1 1 15%;
max-width: 15%;
min-width: 15%;
box-sizing: border-box;
}
}
}
</style>

View File

@ -62,10 +62,18 @@ const handleUserEduStage = (item) => {
//
userStore.edusubject = '语文'
}
else if(item === '高中' && userStore.edusubject === "道德与法治"){
//
userStore.edusubject = '政治'
}
else if(item != '高中' && userStore.edusubject === "政治"){
//
userStore.edusubject = '道德与法治'
}
}
//
const handleUserEduSubject = (item) => {
userStore.edusubject = item
userStore.edusubject = item;
}
onMounted(() => {
getSubject()