Merge pull request 'fix:修改路由以及用户信息的问题;' (#73) from yangws into main
Reviewed-on: #73
This commit is contained in:
commit
4e6e11ac2c
|
@ -110,7 +110,6 @@
|
||||||
import {listClassmain, listClassuser, addClassgroup, listClassgroup, delClassgroup,getClassgroup,updateClassgroup} from '@/api/classManage/index'
|
import {listClassmain, listClassuser, addClassgroup, listClassgroup, delClassgroup,getClassgroup,updateClassgroup} from '@/api/classManage/index'
|
||||||
import {ref, onMounted, reactive, defineProps, watch} from 'vue'
|
import {ref, onMounted, reactive, defineProps, watch} from 'vue'
|
||||||
import useUserStore from '@/store/modules/user'
|
import useUserStore from '@/store/modules/user'
|
||||||
import {useRoute} from 'vue-router'
|
|
||||||
import {ElMessage} from "element-plus";
|
import {ElMessage} from "element-plus";
|
||||||
|
|
||||||
const userStore = useUserStore().user
|
const userStore = useUserStore().user
|
||||||
|
|
|
@ -9,9 +9,10 @@
|
||||||
<el-descriptions :column="1">
|
<el-descriptions :column="1">
|
||||||
<el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
|
<el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="教师">
|
<el-descriptions-item label="教师">
|
||||||
<template>
|
<template v-if="classInfo.teacher.length > 0">
|
||||||
<el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
|
<el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
|
<template v-else>暂无</template>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="学生人数">{{ classInfo.student.length }}人</el-descriptions-item>
|
<el-descriptions-item label="学生人数">{{ classInfo.student.length }}人</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
|
|
@ -110,7 +110,7 @@
|
||||||
//学科列表
|
//学科列表
|
||||||
const courseList = ref([])
|
const courseList = ref([])
|
||||||
//班级id
|
//班级id
|
||||||
const classId = ref('')
|
const classId = ref(0)
|
||||||
//当前页面
|
//当前页面
|
||||||
const currentIndex = ref(0)
|
const currentIndex = ref(0)
|
||||||
//年级
|
//年级
|
||||||
|
@ -265,7 +265,6 @@
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getClassInfo()
|
getClassInfo()
|
||||||
nextTick(() => {
|
nextTick(() => {
|
||||||
console.log(userStore.deptId,'123')
|
|
||||||
viewportHeight.value = getViewportHeight()
|
viewportHeight.value = getViewportHeight()
|
||||||
})
|
})
|
||||||
window.addEventListener('resize', () => {
|
window.addEventListener('resize', () => {
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>{{ item.name }}</div>
|
<div>{{ item.name }}</div>
|
||||||
|
<div>{{ item.username }}</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
|
|
Loading…
Reference in New Issue