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

Merge pull request 'fix: 样式修改，以及第三方资源名称不对应的情况;' (#198) from yangws into main 

Reviewed-on: #198
This commit is contained in:
yangws 2024-09-12 09:31:57 +08:00
parent e985417675 3fdf500366
commit 3357cf8a78
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,9 @@ const getSubject = (value) => {
gradeName:gradeList[currentIndex].label gradeName:gradeList[currentIndex].label
} }
}) })
const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject) //判断是否有名称或者包括名称就对应哪个学科
const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject || item.subjectName.includes(useStore.user.edusubject))
if(nameIndex === -1) return;
getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName}) getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
if(textbookVersionId.value === 0){ if(textbookVersionId.value === 0){
getTagId(subjectList.value[0]) getTagId(subjectList.value[0])

1
src/renderer/src/views/classManage/aside.vue
View File

@ -34,7 +34,6 @@ const emits = defineEmits(['handleSelect'])
//点击跳转路由 //点击跳转路由
const handleSelect = (itemDom,pathKey) => { const handleSelect = (itemDom,pathKey) => {
console.log(itemDom,pathKey)
const parts = pathKey[1].split("-") const parts = pathKey[1].split("-")
const result = parts.slice(0, 2).join("-") const result = parts.slice(0, 2).join("-")
const index = props.menuItems.findIndex(item=>item.index===result) const index = props.menuItems.findIndex(item=>item.index===result)

4
src/renderer/src/views/classManage/index.vue
View File

@ -2,8 +2,8 @@
<div class="common-layout"> <div class="common-layout">
<el-container> <el-container>
<el-aside style="width: 200px;margin-top: 20px"> <el-aside style="width: 200px;margin-top: 20px">
<el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px'}"> <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px','max-height': (viewportHeight - 164) + 'px'}">
<div :style="{'max-height': (viewportHeight - 164) + 'px','overflow-y': 'auto'}"> <div >
<Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside> <Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
</div> </div>
<!-- 隐藏操作按钮--> <!-- 隐藏操作按钮-->