Compare commits

...

6 Commits

Author SHA1 Message Date
白了个白 f7a3aa6e53 科学实验:学科写死 2024-12-20 16:37:08 +08:00
白了个白 1488d7cc03 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:06:55 +08:00
白了个白 045b44b833 1 2024-12-20 16:06:41 +08:00
baigl b47a3bb63a Merge pull request 'baigl' (#164) from baigl into main
Reviewed-on: #164
2024-12-20 16:02:49 +08:00
白了个白 5e954bab0b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:02:07 +08:00
白了个白 7322056dad 1 2024-12-20 16:01:46 +08:00
2 changed files with 33 additions and 16 deletions

View File

@ -61,12 +61,25 @@ const checkList = ref([])// 当前年级对应学科的课程,
//
const getSubject = () => {
//
if(!userStore.subject) return
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
const arr = userStore.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
console.log(subjectList,'subjectList');
// if(!userStore.subject) return
// listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
// const arr = userStore.subject.split(',')
// 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');
//
handleUserEduStage(useClassTaskStore().experimentObj.edustage)
}

View File

@ -200,7 +200,7 @@ const fileLoading = ref(false); // 常规作业loading
onMounted(() => {
console.log("----onMounted-------")
currentRow.value = {id:0};
currentRow.value.id = 0
if(propsQueryCourseObj){
if(JSON.parse(propsQueryCourseObj)){
courseObj.textbookId = JSON.parse(propsQueryCourseObj).bookObj //
@ -235,7 +235,7 @@ const isInToMyQuestion = () => {
if(useClassTaskStores.isOpenQuestUploadView){
useClassTaskStores.isOpenQuestUploadView = false;
currentRow.value = {id:1}; //
currentRow.value.id = 1; //
activeAptTab.value = "个人题库";
//
classWorkForm.id = 0;
@ -282,7 +282,7 @@ const handleItemClick = (itemName) => {
return;
}
currentRow.value = {id:1}; //
currentRow.value.id = 1; //
/**
* 智能推荐AI设计作业
* 习题训练 自主搜题 校本题库 个人题库
@ -325,7 +325,7 @@ const initHomeWork = async()=> {
const handleNewAllClass = () => {
taskTable.value.setCurrentRow({});//
currentRow.value = {id:0}; //
currentRow.value.id = 0; //
//--------
classWorkForm.id = 0;
classWorkForm.uniquekey = ""; //
@ -352,7 +352,7 @@ const handleDelete =() => {
return delClasswork(ids.join(','));
}).then(() => {
taskTable.value.setCurrentRow({});//
currentRow.value = {id:0}; //
currentRow.value.id = 0; //
taskList.value = [];
// initHomeWork();
setTimeout(() => {
@ -446,7 +446,7 @@ const handleCurrentChange = (val) => {
console.log(val,'???????????')
if(val && val.id >0 ) {
currentRow.value = val;
currentRow.value.id = 1;
classWorkForm.worktype = val.worktype; //
editListItem(val, courseObj).then((obj) => {
if(obj){
@ -670,9 +670,9 @@ const handleClassWorkFormQuizRemove = (index) =>{
console.log('该清空左侧列表数据了');
//
if(isShow.value){
currentRow.value = {id:1};
currentRow.value.id = 1;
}else{
currentRow.value = {id:0};
currentRow.value.id = 0;
}
initHomeWork();
@ -814,7 +814,11 @@ const editWork = async (cform) =>{
if (res.code == 200) {
ElMessage.success('更新成功');
//
currentRow.value = {id:0};
if(isShow.value){
currentRow.value.id = 1;
}else{
currentRow.value.id = 0;
}
initHomeWork();
// //
// router.back()