Merge branch 'main' into zhuhao_dev

This commit is contained in:
朱浩 2024-07-26 14:35:11 +08:00
commit 03ce0df516
9 changed files with 41 additions and 27 deletions

View File

@ -13,8 +13,8 @@
"build": "electron-vite build",
"postinstall": "electron-builder install-app-deps",
"build:unpack": "npm run build && electron-builder --dir",
"build:test": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
"build:prod": "npm run build && electron-builder --win --config ./electron-builder.yml",
"build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
"build:test": "npm run build && electron-builder --win --config ./electron-builder.yml",
"build:mac": "npm run build && electron-builder --mac",
"build:linux": "npm run build && electron-builder --linux"
},

View File

@ -190,6 +190,7 @@ function setLayout() {
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 5px;
flex-direction: column;

View File

@ -37,7 +37,13 @@ export const constantRoutes = [
component: () => import('@/views/profile/index.vue'),
name: 'profile',
meta: {title: '个人中心'}
}
},
{
path: '/class',
component: () => import('@/views/classManage/index.vue'),
name: 'class',
meta: {title: '班级中心'},
},
]
},

View File

@ -19,10 +19,8 @@
</template>
<script setup>
import {ref,defineProps,defineEmits} from "vue";
import { useRouter } from 'vue-router'
import {ref,defineProps,defineEmits,onMounted} from "vue";
const activeIndex = ref('0')
const router = useRouter()
const props = defineProps({
classList:{
type:Array,
@ -45,7 +43,9 @@ const handleSelect = (itemDom,pathKey) => {
// })
emits('handleSelect',{index,id})
}
onMounted(() => {
console.log(props.classList,'props.classList')
})
</script>
<style scoped>

View File

@ -113,8 +113,7 @@ import useUserStore from '@/store/modules/user'
import {useRoute} from 'vue-router'
import {ElMessage} from "element-plus";
const userStore = useUserStore()
const route = useRoute()
const userStore = useUserStore().user
const props = defineProps({
classId: {type: Number}
})

View File

@ -2,19 +2,24 @@
<el-card style="width: 100%">
<template #header>
<div style="text-align: left">
<el-button type="danger" @click="deleteClassRoom">删除班级</el-button>
<el-button v-if="classInfo.teacher.length > 0" type="danger" @click="deleteClassRoom">删除班级</el-button>
</div>
</template>
<template v-if="classInfo.teacher.length > 0">
<el-descriptions :column="1">
<el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
<el-descriptions-item label="教师">
<template v-if="classInfo.teacher.length > 0">
<template>
<el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
</template>
<template v-else>暂无</template>
</el-descriptions-item>
<el-descriptions-item label="学生人数">{{ classInfo.student.length }}</el-descriptions-item>
</el-descriptions>
</template>
<template v-else>
<el-empty description="暂无班级信息" style="margin: 0 auto"/>
</template>
</el-card>
</template>
@ -35,7 +40,7 @@
student: []
})
const isDelClass = delClassDemo()
const userStore = useUserStore()
const userStore = useUserStore().user
//
const deleteClassRoom = () => {
ElMessageBox.alert('确认删除该班级?', {

View File

@ -75,7 +75,7 @@
import ClassInfo from './classInfo.vue'
import Aside from './aside.vue'
const userStore = useUserStore()
const userStore = useUserStore().user
const isDel = delClassDemo()
//
const classList = ref([])
@ -144,7 +144,7 @@
classList.value = []
listClassmain({ entpid: userStore.deptId, pageSize: 500, status: 'open' }).then(response => {
response.rows.forEach(item => {
if(item.classteacherids && Number(item.classteacherids) === userStore?.id){
if(item.classteacherids && Number(item.classteacherids) === userStore.userId){
classList.value.push(item)
}
})
@ -265,6 +265,7 @@
onMounted(() => {
getClassInfo()
nextTick(() => {
console.log(userStore.deptId,'123')
viewportHeight.value = getViewportHeight()
})
window.addEventListener('resize', () => {

View File

@ -118,7 +118,7 @@
const studentVisible = ref(false)
const importVisiable = ref(false)
const userStore = useUserStore()
const userStore = useUserStore().user
const props = defineProps({
classId: {type: Number}
})
@ -191,6 +191,8 @@
message: '修改成功',
type: 'success',
})
getClassStudentInfo()
studentVisible.value = false
})
}else{
studentForm.entpid = classInfo.value.entpid;
@ -206,10 +208,11 @@
type: 'success',
})
}
})
}
getClassStudentInfo()
studentVisible.value = false
})
}
} else {
return false;
}

View File

@ -26,7 +26,6 @@ import ResoureSearch from './container/resoure-search.vue'
import ResoureList from './container/resoure-list.vue'
import uploadDialog from '@/components/upload-dialog/index.vue'
import uploaderState from '@/store/modules/uploader'
import { hasPermission } from '@/utils/hasPermission'
//
const sourceStore = useResoureStore()
const isDialogOpen = ref(false)