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

Merge pull request 'lyc-dev' (#234) from lyc-dev into main

This commit is contained in:
lyc 2024-09-20 14:43:21 +08:00
parent 7da4defed4 b5fd1f2a9d
commit d4cfedf883
8 changed files with 196 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "aix-win",
"version": "2.0.1",
"version": "2.0.2",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "example.com",

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

@ -2,12 +2,12 @@
<div class="book-wrap">
<el-scrollbar height="100%">
<div class="book-name flex" @click="dialogVisible = true">
<span>{{ curBookName }}</span>
<span>{{ curBook.data.itemtitle }}</span>
<i class="iconfont icon-xiangyou"></i>
</div>
<div class="book-list" v-loading="treeLoading">
<el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
:default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
<el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
:default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
@node-click="handleNodeClick">
<template #default="{ node }">
<span :title="node.label" class="tree-label">{{ node.label }}</span>
@ -28,7 +28,7 @@
<div class="textbook-container">
<el-scrollbar height="450px">
<div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
<div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
:key="item.id" @click="changeBook(item)">
<img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
<div v-else class="textbook-img">
@ -42,173 +42,71 @@
</template>
<script setup>
import { onMounted, ref, nextTick, toRaw, reactive, computed } from 'vue'
import useUserStore from '@/store/modules/user'
import { listEvaluation } from '@/api/subject'
import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
import { cloneDeep } from 'lodash'
import { useGetSubject } from '@/hooks/useGetSubject'
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
// 定义要发送的emit事件
const emit = defineEmits(['nodeClick', 'changeBook'])
// store
const userStore = useUserStore()
const { edustage, edusubject, userId } = userStore.user
//
let useSubject = null
const subjectList = ref([])
const evaluationList = ref([])
const dialogVisible = ref(false)
// 当前教材下面单元内容数据
const treeData = ref([])
const defaultProps = {
children: 'children',
label: 'label',
label: 'itemtitle',
class: 'textbook-tree'
}
/*let coverImgUrl = computed((item)=>{
if(!item.avartar){
return ""
}
return item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar
})*/
const treeLoading = ref(false)
//当前教材ID
const curBookId = ref(-1)
//当前教材名称
const curBookName = ref('')
//当前教材封面图
const curBookImg = ref('')
//当前教材文件路径
const curBookPath = ref('')
// 上册
const volumeOne = ref([])
//
const volumeTwo = ref([])
// 当前选中的教材
const curBook = reactive({
data: {}
})
// 当前节点
const currentNode = reactive({
const curNode = reactive({
data:{}
})
// 当前选中的节点ID
const currentNodeId = ref(0)
// 当前选中的节点名称
const currentNodeName = ref('')
const treeLoading = ref(false)
// 默认展开的节点
const defaultExpandedKeys = ref([])
// tree
const refTree = ref(null)
//获取教材下面的单元 + 章节
const getSubjectContent = async () => {
treeLoading.value = true
const params = {
edusubject,
edustage,
// entpcourseedituserid: userId,
itemgroup: 'textbook',
orderby: 'orderidx asc',
pageSize: 10000
}
if(localStorage.getItem('evaluationList')){
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
}
else{
localStorage.removeItem('defaultExpandedKeys')
localStorage.removeItem('currentNodeId')
const { rows } = await listEvaluation(params)
localStorage.setItem('evaluationList', JSON.stringify(rows))
evaluationList.value = rows
}
treeLoading.value = false
//获取教材版本
await getSubject()
//上册
/**
* 不区分上下册
* 2024/08/20调整
*/
// volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
// volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
getTreeData()
}
//选择教材
const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
curBookId.value = id
curBookName.value = itemtitle
curBookImg.value = BaseUrl + avartar
curBookPath.value = fileurl
const changeBook = (data) => {
curBook.data = data
localStorage.removeItem('defaultExpandedKeys')
localStorage.removeItem('currentNodeId')
localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
getTreeData()
localStorage.setItem('curBook', JSON.stringify(data))
treeData.value = useSubject.getTreeData(data.id)
//切换教材后默认展开第一个并选中
nextTick(() =>{
defaultExpandedKeys.value = [treeData.value[0].id]
curNode.data = getLastLevelData(treeData.value)[0]
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
localStorage.setItem('curNode',JSON.stringify(curNode.data))
emitChangeBook()
})
// 延迟关闭 视觉上选中
setTimeout(() => {
dialogVisible.value = false
}, 100);
}
const getTreeData = () => {
//数据过滤
let upData = transData(evaluationList.value)
if(upData.length){
treeData.value = [...upData]
}
else{
treeData.value = []
return
}
nextTick(() => {
let defaultCurNodeId = localStorage.getItem('currentNodeId')
if(defaultCurNodeId){
defaultCurNodeId = JSON.parse(defaultCurNodeId)
const data = findNode(defaultCurNodeId)
currentNode.data = findNode(defaultCurNodeId)
currentNodeId.value = data.id
currentNodeName.value = data.label
}
else{
defaultExpandedKeys.value = [treeData.value[0].id]
currentNode.data = getLastLevelData(treeData.value)[0]
currentNodeId.value = getLastLevelData(treeData.value)[0].id
currentNodeName.value = getLastLevelData(treeData.value)[0].label
}
emitChangeBook()
})
}
const emitChangeBook = () => {
let curNode = {
id: currentNodeId.value,
label: currentNodeName.value,
itemtitle: currentNode.data.itemtitle,
edudegree: currentNode.data.edudegree,
edustage: currentNode.data.edustage,
edusubject: currentNode.data.edusubject,
}
let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
curNode.parentNode = toRaw(parentNode)
const emitChangeBook = async () => {
let curData = cloneDeep(toRaw(curNode.data))
let parentNode = findParentByChildId(treeData.value, curNode.id)
curData.parentNode = toRaw(parentNode)
const data = {
textBook: {
curBookId: curBookId.value,
curBookName: curBookName.value,
curBookImg: curBookImg.value,
curBookPath: curBookPath.value
curBookId: curBook.data.id,
curBookName: curBook.data.itemtitle,
curBookImg: BaseUrl + curBook.data.avartar,
curBookPath: curBook.data.fileurl
},
node: curNode
node: curData
}
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
emit('changeBook', data)
}
@ -256,122 +154,77 @@ const findParentByChildId = (treeData, targetNodeId) => {
return null;
}
const findNode = (id) =>{
if(!id) return
return evaluationList.value.find( item => item.id == id)
}
const transData = (data) => {
let ary = []
data.forEach(item => {
let obj = {}
// 根据当前教材ID 过滤出对应的单元、章节
if (item.rootid == curBookId.value) {
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)
}
obj.children = ary2
})
ary.push(obj)
}
}
})
return ary
}
//获取教材
const getSubject = async () => {
if(localStorage.getItem('subjectList')){
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
}
else{
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', })
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
subjectList.value = rows
localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
}
// 默认第一个
if(!subjectList.value.length) return
let curBook = localStorage.getItem('curBook')
if(curBook){
curBook = JSON.parse(curBook)
curBookName.value = curBook.itemtitle
curBookId.value = curBook.id
curBookImg.value = BaseUrl + curBook.avartar
curBookPath.value = curBook.fileurl
}
else{
curBookName.value = subjectList.value[0].itemtitle
curBookId.value = subjectList.value[0].id
curBookImg.value = BaseUrl + subjectList.value[0].avartar
curBookPath.value = subjectList.value[0].fileurl
localStorage.setItem('curBookId', curBookId.value)
}
}
const isHaveUnit = (id) => {
return evaluationList.value.some(item => {
return item.rootid == id
})
}
const handleNodeClick = (data, node) => {
/**
* data : 当前节点数据
* node : 当前节点对象 包含当前节点所有数据 parent属性 指向父节点Node对象
*/
const nodeData = data;
const nodeData = cloneDeep(toRaw(data));
const parentNode = node.parent.data;
// parentNode 为数组 则点击的是一级节点
if (Array.isArray(parentNode)) {
//
nodeData.parentNode = null
}
else {
// 否则 点击的为二级节点 parentNode 为它的父级节点
nodeData.parentNode = parentNode
}
let curData = {
textBook: {
curBookId: curBookId.value,
curBookName: curBookName.value,
curBookImg: curBookImg.value,
curBookPath: curBookPath.value
curBookId: curBook.data.id,
curBookName: curBook.data.itemtitle,
curBookImg: BaseUrl + curBook.data.avartar,
curBookPath: curBook.data.fileurl
},
node: toRaw(nodeData)
}
currentNode.data = curData
localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
localStorage.setItem('currentNodeId', JSON.stringify(data.id))
localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
localStorage.setItem('curNode', JSON.stringify(nodeData))
emit('nodeClick', curData)
}
onMounted(() => {
getSubjectContent()
onMounted( async () => {
treeLoading.value = true
try{
useSubject = await useGetSubject()
subjectList.value = useSubject.subjectList
let book = localStorage.getItem('curBook')
if(book){
book = JSON.parse(book)
curBook.data = book
treeData.value = useSubject.getTreeData(book.id)
}
else{
curBook.data = useSubject.subjectList[0]
treeData.value = useSubject.treeData
}
// 设置展开并选中
nextTick(() =>{
// 取缓存
let node = localStorage.getItem('curNode')
if(node){
curNode.data = JSON.parse(node)
defaultExpandedKeys.value = JSON.parse(localStorage.getItem('defaultExpandedKeys'))
}
else{
defaultExpandedKeys.value = [treeData.value[0].id]
curNode.data = getLastLevelData(treeData.value)[0]
//缓存记录当前展开以及选中节点
localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
localStorage.setItem('curNode', JSON.stringify(curNode.data))
}
emitChangeBook()
})
} finally{
treeLoading.value = false
}
})
</script>

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

@ -137,7 +137,7 @@ const getSubjectContent = async () => {
}
const getSubject = async () => {
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
if (localStorage.getItem('subjectList')) {
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))

82
src/renderer/src/hooks/useGetSubject.js Normal file
View File

@ -0,0 +1,82 @@
import { ref } from 'vue'
import useUserStore from '@/store/modules/user'
import { listEvaluation } from '@/api/subject'
export const useGetSubject = async () =>{
// user store
const userStore = useUserStore()
const { edustage, edusubject, userId } = userStore.user
const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
// 章节List
const unitList = ref([])
// 教材List
let subjectList = null
// 单元章节树结构
let treeData = null
// 根据 学科 + 学段 获取所有单元章节
const getSubjectUnit = async () =>{
let strUnit = localStorage.getItem('unitList')
if(strUnit){
unitList.value = JSON.parse(strUnit)
}
else{
const unitParams = {
edusubject,
edustage,
itemgroup: 'textbook',
orderby: 'orderidx asc',
pageSize: 10000
}
const { rows } = await listEvaluation(unitParams)
unitList.value = rows
localStorage.setItem('unitList', JSON.stringify(rows))
}
await getSubject()
}
// 获取 学科 + 学段 获取教材
const getSubject = async () =>{
let strSubject = localStorage.getItem('subjectList')
if(strSubject){
subjectList = JSON.parse(strSubject)
}
else{
const subjectParams = {
itemkey: "version",
edusubject,
edustage,
pageSize: 10000,
orderby: 'orderidx asc'
}
const { rows } = await listEvaluation(subjectParams)
subjectList = rows
localStorage.setItem('subjectList', JSON.stringify(rows))
}
// 默认选中第一个教材
if(subjectList && subjectList.length){
treeData = getTreeData(subjectList[0].id)
}
}
// 单元章节数据转为“树”结构
const getTreeData = (bookId) =>{
// 根据当前教材的id 查找出对应的章节
let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)
data.forEach( item => {
item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
})
return data
}
await getSubjectUnit()
return { subjectList, treeData, getTreeData }
}

13
src/renderer/src/layout/components/Header.vue
View File

@ -37,7 +37,7 @@
<div class="user-info flex">
<span class="user-name">{{ userStore.user.nickName }}</span>
<div class="flex">
<div class="user-depname">{{ userStore.user.deptName }}</div>
<el-dropdown @command="changeSubject">
<div class="user-subject">{{ userStore.user.edusubject }}
<el-icon class="el-icon--right"><arrow-down />
@ -52,6 +52,7 @@
</template>
</el-dropdown>
</div>
<div class="user-depname">{{ userStore.user.deptName }}</div>
</div>
</div>
@ -72,6 +73,7 @@ import { updateUserInfo } from '@/api/system/user'
import outLink from '@/utils/linkConfig'
import logoIco from '@/assets/images/logo.png'
import { listEvaluation } from '@/api/classManage/index'
import { clearBookInfo } from '@/utils/ruoyi'
const { ipcRenderer } = window.electron || {}
const userStore = useUserStore()
@ -190,6 +192,7 @@ function setLayout() {
}
// 切换学科
const changeSubject = async (command) =>{
clearBookInfo()
const { userId, userName, phonenumber, plainpwd } = userStore.user
const data = {
userId,
@ -200,8 +203,6 @@ const changeSubject = async (command) =>{
await updateUserInfo(data)
await userStore.login({username: phonenumber, password: plainpwd})
await userStore.getInfo()
localStorage.removeItem('subjectList')
localStorage.removeItem('evaluationList')
router.go()
}
@ -331,7 +332,7 @@ onMounted(() => {
justify-content: space-around;
.user-depname {
margin-right: 5px;
margin-right: 0;
}
.user-subject {
@ -351,8 +352,8 @@ onMounted(() => {
align-items: center;
.user-avatar {
width: 35px;
height: 35px;
width: 45px;
height: 45px;
border-radius: 10px;
margin-right: 10px;
}

14
src/renderer/src/utils/ruoyi.js
View File

@ -257,3 +257,17 @@ export const getFileName = (filename) => {
if(!filename) return
return filename.replace(/\.[^/.]+$/, "");
}
// 清除当前选中的教材 章节 相关信息
export const clearBookInfo = () =>{
//当前选中的教材
localStorage.removeItem('curBook')
// 当前选中的节点
localStorage.removeItem('curNode')
// 所有章节单元数据
localStorage.removeItem('unitList')
// 所有教材数据
localStorage.removeItem('subjectList')
// 展开的节点
localStorage.removeItem('defaultExpandedKeys')
}

4
src/renderer/src/views/profile/userInfo.vue
View File

@ -45,6 +45,7 @@ import {updateUserInfo } from '@/api/system/user'
import { listEvaluation } from '@/api/subject/index'
import useUserStore from '@/store/modules/user'
import {ElMessage} from 'element-plus'
import { clearBookInfo } from '@/utils/ruoyi'
const props = defineProps({
user: {
@ -137,8 +138,7 @@ function submit() {
userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
userStore.getInfo().then(res => {
if(res.code === 200){
localStorage.removeItem('subjectList')
localStorage.removeItem('evaluationList')
clearBookInfo()
ElMessage.success('修改成功')
}else{
ElMessage.error(response.msg)

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

@ -38,7 +38,7 @@ const curBookId = ref('')
const evaluationList = ref([])
const getTreeData = () => {
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
evaluationList.value = JSON.parse(localStorage.getItem('unitList'))
//上册
/**