@@ -140,6 +145,7 @@ import { editListItem } from '@/hooks/useClassTask'
import MyQuestion from '@/views/classTask/newClassTaskAssign/myQuestion/index.vue'
import SchoolQuestion from '@/views/classTask/newClassTaskAssign/schoolQuestion/index.vue'
import SearchQuestion from '@/views/classTask/newClassTaskAssign/searchQuestion/index.vue'
+import ExperimentQuestion from "@/views/classTask/newClassTaskAssign/experimentQuestion/index.vue";
import whiteboard from '@/components/whiteboard/whiteboard.vue'
import FileUpload from "@/components/FileUpload/index.vue";
import Right from './Right/index.vue'
@@ -258,6 +264,16 @@ watch(() => props.currentCourse, (newVal, oldVal) => {
}
console.log(newVal,'newval');
},{deep:true})
+
+// ------------科学实验
+const getExpObj = (obj)=>{
+ // obj:{
+ // fileurl: "https://phet.colorado.edu/sims/html/number-compare/latest/number-compare_zh_CN.html"
+ // label: "数量比较"
+ // subject: "math"
+ // }
+ classWorkForm.fileHomeworkList = [obj];
+}
//---------作业设计---
const handleItemClick = (itemName) => {
console.log('itemName', itemName);
@@ -582,6 +598,32 @@ const handleClassWorkFormQuizRemove = (index) =>{
fileLoading.value = false
}
}
+ else if(classWorkForm.worktype === "科学实验"){
+ if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验的课程!'});
+ cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+ cform.entpcourseworklist = JSON.stringify([{'id':-3, 'score': '10'}]);
+ try {
+ console.log(cform,'科学实验')
+ addClassworkReturnId(cform).then((res) => {
+ ElMessage({ type: 'success', message: '作业设计成功!'});
+ // 重置提交表单
+ classWorkForm.worktype = "常规作业";
+ classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称
+ classWorkForm.title = "";
+ classWorkForm.quizlist = [], // 作业习题列表内容
+
+ // 情况选择的资源缓存
+ classWorkForm.chooseWorkLists = []; // 框架梳理list
+ classWorkForm.whiteboardObj = ''; // ? // 清空白板
+ classWorkForm.fileHomeworkList = []; // 常规作业list
+ classWorkForm.id = res
+ // emits('getData',classWorkForm)
+ // TODO 科学实验 待完善
+ })
+ } finally{
+ //
+ }
+ }
else {
// 正常新任务
var ll = [];
@@ -667,7 +709,10 @@ const editWork = async (cform) =>{
}else{
if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请上传常规作业附件!'});
}
- }else {
+ }else if( classWorkForm.worktype == '科学实验') {
+ if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验科目!'});
+ }
+ else {
if (classWorkForm.chooseWorkLists.length == 0) {
// 框架梳理
ElMessage.error('请先添加作业资源!');
@@ -759,6 +804,10 @@ const editWork = async (cform) =>{
// 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
}
+ else if (classWorkForm.worktype=='科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
+ // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
+ cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+ }
// 3.更新作业任务本身
let res = await updateClasswork(cform);
@@ -865,6 +914,11 @@ const editWork = async (cform) =>{
padding: 20px;
box-sizing: border-box;
}
+
+ .experiment-homework{
+ padding: 15px;
+ height: 100%;
+ }
}
.page-right {
overflow: hidden;
--
2.44.0.windows.1
From 622a71253f97bf3baee788e25d0aceea30279f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 20 Dec 2024 15:23:34 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1?=
=?UTF-8?q?=EF=BC=9A=E7=A7=91=E5=AD=A6=E5=AE=9E=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/src/hooks/useClassTask.js | 2 +
src/renderer/src/store/modules/classTask.js | 5 +
.../components/experimentList.vue | 6 +-
.../components/selectClass.vue | 114 +++++++++++-------
.../experimentQuestion/index.vue | 38 +++---
5 files changed, 94 insertions(+), 71 deletions(-)
diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js
index 7e58c45..72fe882 100644
--- a/src/renderer/src/hooks/useClassTask.js
+++ b/src/renderer/src/hooks/useClassTask.js
@@ -117,6 +117,8 @@ export const editListItem = (row, courseObj) => {
classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
//
// console.log('科学实验', classtaskObj);
+ // 更新默认的科学实验（ 学段 学科 以及实验科目）
+ console.log('科学实验', classtaskObj);
return resolve(classtaskObj);
}
}
diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index 05a9491..e93be20 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -5,6 +5,11 @@ import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuesti
const useClassTaskStore = defineStore('classTask',{
state: () => ({
+ experimentObj:{
+ edustage: '小学', // 教育阶段
+ edusubject: '', // 学科
+ experimentList: [], // 实验科目列表
+ },
isOpenQuestUploadView: false, // 是否打开习题上传的页面
classListIds: [],
entpCourseWorkTypeList: [
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
index 8c0505f..9755859 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
@@ -8,7 +8,7 @@
@change="onSelectOption"
>
{
const onSelectOption = (option) => {
console.log(option,'选择的实验课-------')
- emit('selectItem', props.list.filter(item => item.label === option)[0])
+ emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
}
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
index 87ce096..e539610 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
@@ -3,7 +3,7 @@
- {{ userStore.edustage }}
+ {{ useClassTaskStore().experimentObj.edustage }}
@@ -20,14 +20,14 @@
- {{ userStore.edusubject }}
+ {{ useClassTaskStore().experimentObj.edusubject }}
- {{
+ {{
item.itemtitle }}
@@ -43,11 +43,15 @@ import {ArrowDown} from '@element-plus/icons-vue'
import { onMounted,ref } from 'vue';
import { listEvaluation } from '@/api/subject/index'
import jsonData from "@/utils/phetData.json";
+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 chooseGrade= ref({})
const expList = ref([]) // 当前年级的所有课程
@@ -62,63 +66,82 @@ const getSubject = () => {
const arr = userStore.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
console.log(subjectList,'subjectList');
-
})
+ // 默认读取一个学科
+ handleUserEduStage(useClassTaskStore().experimentObj.edustage)
+}
+// 展示有 实验科目的学科
+const isExpList = (edusubject) => {
+ let list = [];
+ switch (edusubject){
+ case '数学':
+ list = expList.value.filter(item => item.subject === 'math')
+ break;
+ case '物理':
+ list = expList.value.filter(item => item.subject === 'physics')
+ break;
+ case '化学':
+ checkList.value = expList.value.filter(item => item.subject === 'chemistry')
+ break;
+ case '生物':
+ list = expList.value.filter(item => item.subject === 'biology')
+ break;
+ case '科学':
+ list = expList.value.filter(item => item.subject === 'sciences')
+ break;
+ }
+ return list.length > 0
}
// 选择学段
const handleUserEduStage = (item) => {
- userStore.edustage = item
- // sessionStore.set('edustageSelf',item)
- // if(item === '幼儿园'){
- // // 默认语文
- // userStore.edusubject = '语文'
- // // sessionStore.set('edusubjectSelf','语文')
- // }
- // else
- if(item === '高中' && userStore.edusubject === "道德与法治"){
- // 默认语文
- userStore.edusubject = '政治'
- // sessionStore.set('edusubjectSelf','政治')
- }
- else if(item != '高中' && userStore.edusubject === "政治"){
- // 默认语文
- userStore.edusubject = '道德与法治'
- // sessionStore.set('edusubjectSelf','道德与法治')
- }
-
- // 在此处处理筛选年级实验的逻辑
+ // 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
+ if(isExpList(name)){
+ useClassTaskStore().experimentObj.edusubject = name;
+ // 更改学科默认与学科下的实验科目
+ handleUserEduSubject(name)
+ }
+ }
}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
+ if(isExpList(name)){
+ useClassTaskStore().experimentObj.edusubject = name;
+ // 更改学科默认与学科下的实验科目
+ handleUserEduSubject(name)
+ }
+ }
}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
+ if(isExpList(name)){
+ useClassTaskStore().experimentObj.edusubject = name;
+ // 更改学科默认与学科下的实验科目
+ handleUserEduSubject(name)
+ }
+ }
}
- for(let i in chooseGrade.value){
- expList.value.push(chooseGrade.value[i])
- }
- console.log(expList.value,'expList.value')
- // const queryGrages = this.subjectList.filter(itemSubject => itemSubject.edustage === item)
- // selectSubject(item, subjectList.value)
-
-
}
// 选择学科
const handleUserEduSubject = (item) => {
- userStore.edusubject = item;
- // sessionStore.set('edusubjectSelf',item)
+ // userStore.edusubject = item;
+ useClassTaskStore().experimentObj.edusubject = item;
console.log(item,'选择的学科-------')
- //更改学科
- // this.chooseSubject = item
checkList.value = []
- // const queryGrages = expList.value.filter(itemSubject => itemSubject.edustage === item) || []
- //这里是年级切换的时候，判断一下下一个年级是否有这一门课程，如果有继续执行，没有就清空
- // const subjectNameList = queryGrages.map(itemSubName => {
- // return itemSubName.edusubject
- // })
- // if(!subjectNameList.includes(item)) return
switch (item){
case '数学':
checkList.value = expList.value.filter(item => item.subject === 'math')
@@ -137,7 +160,8 @@ const handleUserEduSubject = (item) => {
break;
}
console.log(checkList.value,'checkList')
- emit('experlist',checkList.value)
+ useClassTaskStore().experimentObj.experimentList = checkList.value;
+ // emit('experlist',checkList.value)
}
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
index d8dcf57..6728919 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
@@ -2,14 +2,16 @@
@@ -18,21 +20,10 @@
import { Search } from '@element-plus/icons-vue'
//import html2canvas from 'html2canvas';
import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
-
-
-import { getBindlist } from '@/api/education/knowledgePoint'
-import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
-import { processList } from '@/hooks/useProcessList'
-import { useGetHomework } from '@/hooks/useGetHomework'
-import { sessionStore } from '@/utils/store'
-import {throttle,debounce } from '@/utils/comm'
import useUserStore from '@/store/modules/user'
import useClassTaskStore from '@/store/modules/classTask'
-
-//选择学校和班级
-import selectClass from './components/selectClass.vue'
-// 选择的 学科实验
-import selectExperiment from './components/experimentList.vue'
+import selectClass from './components/selectClass.vue' //选择学校和班级
+import selectExperiment from './components/experimentList.vue' // 选择的 学科实验
// 定义要发送的emit事件
@@ -51,7 +42,7 @@ const props = defineProps({
}
})
// 学科的 实验列
-const experimentList = ref([]);
+// const experimentList = ref([]);
const activeExp = ref({});
const isStadium = () => {
@@ -77,20 +68,19 @@ onMounted(() => {
// }
// 选择的学科 获取实验课程信息
-const getExperimentList = (val) => {
- console.log(val,'选择的学科，获取实验课程list信息')
- experimentList.value = val;
-}
+// const getExperimentList = (val) => {
+// console.log(val,'选择的学科，获取实验课程list信息')
+// // experimentList.value = val;
+// }
// 选择的实验课
const getExperimentListItem = (val) => {
console.log(val,'选择的实验课程信息')
activeExp.value = val;
emit('clickExpObj', val)
}
-
-console.log(props.expObj,'科学props.expObj实验科目')
+// 监听实验课程信息
watch(() => props.expObj.fileurl, (newVal, oldVal) => {
- console.log(newVal,'科学实验科目')
+ console.log(props.expObj,'科学实验科目')
activeExp.value = props.expObj;
})
--
2.44.0.windows.1
From 57cd8ea45a841f79673a5d309adfc10d95eb21e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 20 Dec 2024 15:24:27 +0800
Subject: [PATCH 3/4] 1
---
src/renderer/src/hooks/useClassTask.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js
index 72fe882..934caf6 100644
--- a/src/renderer/src/hooks/useClassTask.js
+++ b/src/renderer/src/hooks/useClassTask.js
@@ -58,7 +58,7 @@ export const editListItem = (row, courseObj) => {
if (row.worktype == '框架梳理') {
- // 框架梳理对应只有一个内容
+ // 框架梳理对应只有一个内容
getEvaluationclue(listCourseWork[0].id).then(res => {
if ( res.data==null || res.data==undefined ) {
return ;
--
2.44.0.windows.1
From 502c772b4602c3cdf33975395ebd19e1afaed18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Fri, 20 Dec 2024 15:42:19 +0800
Subject: [PATCH 4/4] 1
---
.../Editor/Toolbar/ElementStylePanel/Active/index.vue | 10 ++++++++++
src/renderer/src/hooks/useGetHomework.js | 2 ++
.../src/views/classTask/newClassTaskAssign/index.vue | 4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
index 0354fba..9f36ccc 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
@@ -25,6 +25,12 @@
常规作业
+
+
+
@@ -157,6 +163,10 @@ const type = ref([
{
label: '框架梳理',
value: 'primary'
+ },
+ {
+ label: '科学实验',
+ value: 'primary'
}
])
diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js
index e07a2de..0f78590 100644
--- a/src/renderer/src/hooks/useGetHomework.js
+++ b/src/renderer/src/hooks/useGetHomework.js
@@ -94,6 +94,8 @@ const getHomeWorkList = async () => {
res.rows[i].workclass = 'info';
} else if (res.rows[i].worktype == '习题训练') {
res.rows[i].workclass = 'danger';
+ } else if (res.rows[i].worktype == '科学实验') {
+ res.rows[i].workclass = 'danger';
} else {
res.rows[i].workclass = 'primary';
}
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index dcef29f..7af5ff9 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -607,7 +607,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
addClassworkReturnId(cform).then((res) => {
ElMessage({ type: 'success', message: '作业设计成功!'});
// 重置提交表单
- classWorkForm.worktype = "常规作业";
+ classWorkForm.worktype = "科学实验";
classWorkForm.uniquekey = ''; // props.propsformobj.uniquekey, // 作业唯一标识 作业名称
classWorkForm.title = "";
classWorkForm.quizlist = [], // 作业习题列表内容
@@ -617,7 +617,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
classWorkForm.whiteboardObj = ''; // ? // 清空白板
classWorkForm.fileHomeworkList = []; // 常规作业list
classWorkForm.id = res
- // emits('getData',classWorkForm)
+ emits('getData',classWorkForm)
// TODO 科学实验 待完善
})
} finally{
--
2.44.0.windows.1