Merge pull request 'zouyf_dev' (#428) from zouyf_dev into main
Reviewed-on: #428
This commit is contained in:
commit
f8a877f62f
|
@ -127,7 +127,10 @@ export const removePropertyOf = function(obj){
|
||||||
export function removeTree(list) {
|
export function removeTree(list) {
|
||||||
var this_ = this
|
var this_ = this
|
||||||
for (var i in list) {
|
for (var i in list) {
|
||||||
if (list[i].children.length == 0) {
|
if (list[i].children == null) {
|
||||||
|
delete list[i].children;
|
||||||
|
}
|
||||||
|
else if (list[i].children.length == 0) {
|
||||||
list[i].children = undefined
|
list[i].children = undefined
|
||||||
} else {
|
} else {
|
||||||
this_.removeTree(list[i].children)
|
this_.removeTree(list[i].children)
|
||||||
|
|
|
@ -286,6 +286,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval
|
||||||
import { listEvaluation } from '@/api/subject'
|
import { listEvaluation } from '@/api/subject'
|
||||||
import { listEntpcoursefile } from '@/api/education/entpcoursefile'
|
import { listEntpcoursefile } from '@/api/education/entpcoursefile'
|
||||||
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
|
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
|
||||||
|
import { isJson } from "@/utils/comm";
|
||||||
|
|
||||||
|
|
||||||
import { useGetHomework } from '@/hooks/useGetHomework'
|
import { useGetHomework } from '@/hooks/useGetHomework'
|
||||||
|
@ -483,12 +484,13 @@ function Apis(key) {
|
||||||
*/
|
*/
|
||||||
const t = function(name, time) {
|
const t = function(name, time) {
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
|
const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
|
||||||
const queryForm = {
|
const queryForm = {
|
||||||
// 分页参数
|
// 分页参数
|
||||||
currentPage: paginationParams.pageNum,
|
currentPage: paginationParams.pageNum,
|
||||||
pageSize: paginationParams.pageSize,
|
pageSize: paginationParams.pageSize,
|
||||||
// 课程相关参数
|
// 课程相关参数
|
||||||
eid: props.bookobj.levelSecondId,
|
eid: evalId,
|
||||||
sectionName: props.bookobj.coursetitle,
|
sectionName: props.bookobj.coursetitle,
|
||||||
edusubject: userStore.edusubject,
|
edusubject: userStore.edusubject,
|
||||||
edustage: userStore.edustage,
|
edustage: userStore.edustage,
|
||||||
|
@ -583,10 +585,14 @@ const getQueryFromEvaluationclue = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (clueres.rows[i].childlist != '') {
|
if (clueres.rows[i].childlist != '') {
|
||||||
clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
|
const tmpJson = '['+clueres.rows[i].childlist+']';
|
||||||
|
if (isJson(tmpJson)){
|
||||||
|
clueres.rows[i].childArray = JSON.parse(tmpJson);
|
||||||
for (var j=0; j<clueres.rows[i].childArray.length; j++) {
|
for (var j=0; j<clueres.rows[i].childArray.length; j++) {
|
||||||
clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
|
clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
clueres.rows[i].childArray = {};
|
clueres.rows[i].childArray = {};
|
||||||
}
|
}
|
||||||
|
@ -1062,9 +1068,27 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
|
||||||
classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
|
classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
|
watch(
|
||||||
|
[
|
||||||
|
() => props.bookobj.levelSecondId,
|
||||||
|
() => props.bookobj.levelFirstId
|
||||||
|
],
|
||||||
|
([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) => {
|
||||||
|
if(props.bookobj.node.edusubject == '英语' && props.bookobj.node.edustage == '高中'){
|
||||||
|
if(newLevelFirstId != oldLevelFirstId){
|
||||||
|
console.log(props.bookobj,'高中英语-课程选择')
|
||||||
|
debounceQueryData();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
// 习题清空
|
||||||
|
workResource.entpCourseWorkList = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
console.log(props.bookobj,'课程选择')
|
console.log(props.bookobj,'课程选择')
|
||||||
debounceQueryData();
|
debounceQueryData();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in New Issue