From eb481e265bd86d789e39c3a32fa0da3e46554290 Mon Sep 17 00:00:00 2001 From: lyc Date: Fri, 30 Aug 2024 18:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=99=E6=9D=90-=E5=8D=95?= =?UTF-8?q?=E5=85=83=E3=80=81=E7=AB=A0=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/choose-textbook/index.vue | 67 +++++++++++-------- .../src/components/move-file/index.vue | 52 ++++++++------ 2 files changed, 70 insertions(+), 49 deletions(-) diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue index 69be80f..3c2a18c 100644 --- a/src/renderer/src/components/choose-textbook/index.vue +++ b/src/renderer/src/components/choose-textbook/index.vue @@ -75,6 +75,8 @@ const curBookImg = ref('') const curBookPath = ref('') // 上册 const volumeOne = ref([]) +// +const volumeTwo = ref([]) // 当前节点 const currentNode = reactive({ @@ -90,13 +92,14 @@ const defaultExpandedKeys = ref([]) const refTree = ref(null) -//获取教材下面的单元内容 +//获取教材下面的单元 + 章节 const getSubjectContent = async () => { treeLoading.value = true const params = { edusubject, edustage, - entpcourseedituserid: userId, + // entpcourseedituserid: userId, + itemgroup: 'textbook', pageSize: 500 } @@ -114,7 +117,8 @@ const getSubjectContent = async () => { * 不区分上下册 * 2024/08/20调整 */ - volumeOne.value = data.filter(item => item.level == 1) + // volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册') + // volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册') getTreeData() } @@ -132,7 +136,9 @@ const changeBook = ({ id, itemtitle, avartar, fileurl }) => { const getTreeData = () => { //数据过滤 - let upData = transData(volumeOne.value) + let upData = transData(evaluationList.value) + + if(upData.length){ treeData.value = [...upData] } @@ -222,30 +228,33 @@ const transData = (data) => { let ary = [] data.forEach(item => { let obj = {} + // 根据当前教材ID 过滤出对应的单元、章节 if (item.rootid == curBookId.value) { - obj.label = item.itemtitle - obj.id = item.id - obj.itemtitle = item.itemtitle - obj.edudegree = item.edudegree - obj.edustage = item.edustage - obj.edusubject = item.edusubject - let ary2 = [] - evaluationList.value.forEach(el => { - let obj2 = {} - if (item.id == el.parentid) { - obj2 = { - label: el.itemtitle, - id: el.id, - itemtitle : el.itemtitle, - edudegree : el.edudegree, - edustage : el.edustage, - edusubject : el.edusubject, + if(item.level == 1){ + obj.label = item.itemtitle + obj.id = item.id + obj.itemtitle = item.itemtitle + obj.edudegree = item.edudegree + obj.edustage = item.edustage + obj.edusubject = item.edusubject + let ary2 = [] + evaluationList.value.forEach(el => { + let obj2 = {} + if (item.id == el.parentid) { + obj2 = { + label: el.itemtitle, + id: el.id, + itemtitle : el.itemtitle, + edudegree : el.edudegree, + edustage : el.edustage, + edusubject : el.edusubject, + } + ary2.push(obj2) } - ary2.push(obj2) - } - obj.children = ary2 - }) - ary.push(obj) + obj.children = ary2 + }) + ary.push(obj) + } } }) return ary @@ -254,8 +263,10 @@ const transData = (data) => { //获取教材 const getSubject = async () => { - const { rows } = await listEvaluation({ itemkey: "version", pageSize: 500 }) - subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject && isHaveUnit(item.id)) + const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 500 }) + + // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject) + subjectList.value = rows localStorage.setItem('subjectList', JSON.stringify(subjectList.value)) // 默认第一个 diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue index 8e0a0bb..dfa7911 100644 --- a/src/renderer/src/components/move-file/index.vue +++ b/src/renderer/src/components/move-file/index.vue @@ -113,7 +113,8 @@ const getSubjectContent = async () => { const params = { edusubject, edustage, - entpcourseedituserid: userId, + // entpcourseedituserid: userId, + itemgroup: 'textbook', pageSize: 500 } let data; @@ -129,7 +130,7 @@ const getSubjectContent = async () => { * 不区分上下册 * 2024/08/20调整 */ - volumeOne.value = data.filter(item => item.level == 1) + // volumeOne.value = data.filter(item => item.level == 1) getTreeData() } @@ -141,8 +142,8 @@ const getSubject = async () => { subjectList.value = JSON.parse(localStorage.getItem('subjectList')) } else { - const { rows } = await listEvaluation({ itemkey: "version", pageSize: 500 }) - subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject && isHaveUnit(item.id)) + const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 500 }) + subjectList.value = rows localStorage.setItem('subjectList', JSON.stringify(subjectList.value)) } @@ -160,7 +161,7 @@ const isHaveUnit = (id) => { const getTreeData = () => { //数据过滤 - let upData = transData(volumeOne.value) + let upData = transData(evaluationList.value) if(upData.length){ treeData.value = [...upData] } @@ -248,26 +249,35 @@ const handleNodeClick = (data, node) => { const transData = (data) => { let ary = [] - data.forEach(item => { let obj = {} - + // 根据当前教材ID 过滤出对应的单元、章节 if (item.rootid == curBookId.value) { - obj.label = item.itemtitle - obj.id = item.id - let ary2 = [] - evaluationList.value.forEach(el => { - let obj2 = {} - if (item.id == el.parentid) { - obj2 = { - label: el.itemtitle, - id: el.id + if(item.level == 1){ + obj.label = item.itemtitle + obj.id = item.id + obj.itemtitle = item.itemtitle + obj.edudegree = item.edudegree + obj.edustage = item.edustage + obj.edusubject = item.edusubject + let ary2 = [] + evaluationList.value.forEach(el => { + let obj2 = {} + if (item.id == el.parentid) { + obj2 = { + label: el.itemtitle, + id: el.id, + itemtitle : el.itemtitle, + edudegree : el.edudegree, + edustage : el.edustage, + edusubject : el.edusubject, + } + ary2.push(obj2) } - ary2.push(obj2) - } - obj.children = ary2 - }) - ary.push(obj) + obj.children = ary2 + }) + ary.push(obj) + } } }) return ary