Merge branch 'main' into lyc-dev

This commit is contained in:
lyc 2024-11-01 16:51:51 +08:00
commit 9d3e11f336
1 changed files with 8 additions and 2 deletions

View File

@ -27,7 +27,7 @@
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<template v-for="(item, index) in subjectList"> <template v-for="(item, index) in subjectList">
<el-dropdown-item :command="item.itemtitle">{{ <el-dropdown-item v-if="item.edustage == userStore.edustage" :command="item.itemtitle">{{
item.itemtitle }}</el-dropdown-item> item.itemtitle }}</el-dropdown-item>
</template> </template>
</el-dropdown-menu> </el-dropdown-menu>
@ -51,18 +51,24 @@ const getSubject = () => {
listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
const arr = userStore.subject.split(',') const arr = userStore.subject.split(',')
subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items) subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
console.log(subjectList,'subjectList');
}) })
} }
// //
const handleUserEduStage = (item) => { const handleUserEduStage = (item) => {
userStore.edustage = item userStore.edustage = item
if(item === '幼儿园'){
//
userStore.edusubject = '语文'
} }
}
//
const handleUserEduSubject = (item) => { const handleUserEduSubject = (item) => {
userStore.edusubject = item userStore.edusubject = item
} }
onMounted(() => { onMounted(() => {
getSubject() getSubject()
console.log(userStore,'123')
}) })
</script> </script>
<style scoped> <style scoped>