zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

This commit is contained in:
zdg 2024-08-21 09:18:15 +08:00
parent c57f21461a d669b6ee42
commit 6d77d54bc1
3 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/renderer/src/components/choose-textbook/index.vue
View File

@ -75,8 +75,7 @@ const curBookImg = ref('')
const curBookPath = ref('') const curBookPath = ref('')
// 上册 // 上册
const volumeOne = ref([]) const volumeOne = ref([])
// 下册
const volumeTwo = ref([])
// 当前节点 // 当前节点
const currentNode = reactive({ const currentNode = reactive({
data:{} data:{}
@ -111,9 +110,11 @@ const getSubjectContent = async () => {
//获取教材版本 //获取教材版本
await getSubject() await getSubject()
//上册 //上册
volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册') /**
//下册 * 不区分上下册
volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册') * 2024/08/20调整
*/
volumeOne.value = data.filter(item => item.level == 1)
getTreeData() getTreeData()
} }
@ -132,12 +133,8 @@ const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
const getTreeData = () => { const getTreeData = () => {
//数据过滤 //数据过滤
let upData = transData(volumeOne.value) let upData = transData(volumeOne.value)
let downData = transData(volumeTwo.value) if(upData.length){
if(upData.length && downData.length){ treeData.value = [...upData]
treeData.value = [...upData,...downData]
}
else if(upData.length || downData.length){
treeData.value = upData.length ? upData : downData
} }
else{ else{
treeData.value = [] treeData.value = []

20
src/renderer/src/components/move-file/index.vue
View File

@ -88,8 +88,6 @@ const curBookId = ref(-1)
const curBookName = ref('') const curBookName = ref('')
// 上册 // 上册
const volumeOne = ref([]) const volumeOne = ref([])
// 下册
const volumeTwo = ref([])
// 当前节点 // 当前节点
const currentNode = reactive({ const currentNode = reactive({
data: {} data: {}
@ -127,9 +125,12 @@ const getSubjectContent = async () => {
//获取教材版本 //获取教材版本
getSubject() getSubject()
//上册 //上册
volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册') /**
//下册 * 不区分上下册
volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册') * 2024/08/20调整
*/
volumeOne.value = data.filter(item => item.level == 1)
getTreeData() getTreeData()
} }
@ -160,13 +161,8 @@ const isHaveUnit = (id) => {
const getTreeData = () => { const getTreeData = () => {
//数据过滤 //数据过滤
let upData = transData(volumeOne.value) let upData = transData(volumeOne.value)
let downData = transData(volumeTwo.value) if(upData.length){
treeData.value = [...upData]
if(upData.length && downData.length){
treeData.value = [...upData,...downData]
}
else if(upData.length || downData.length){
treeData.value = upData.length ? upData : downData
} }
else{ else{
treeData.value = [] treeData.value = []

17
src/renderer/src/views/tool/components/lesson.vue
View File

@ -42,18 +42,17 @@ const getTreeData = () => {
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList')) evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
//上册 //上册
let volumeOne = evaluationList.value.filter(item => item.level == 1 && item.semester == '上册') /**
//下册 * 不区分上下册
let volumeTwo = evaluationList.value.filter(item => item.level == 1 && item.semester == '下册') * 2024/08/20调整
*/
let volumeOne = evaluationList.value.filter(item => item.level == 1)
//数据过滤 //数据过滤
let upData = transData(volumeOne) let upData = transData(volumeOne)
let downData = transData(volumeTwo) if(upData.length){
if(upData.length && downData.length){ treeData.value = [...upData]
treeData.value = [...upData,...downData]
}
else if(upData.length || downData.length){
treeData.value = upData.length ? upData : downData
} }
else{ else{
treeData.value = [] treeData.value = []