提交 deda5039 authored 作者: matian's avatar matian

bug fixes

上级 85d0aeba
...@@ -48,7 +48,7 @@ const chapterList: any = ref([]) ...@@ -48,7 +48,7 @@ const chapterList: any = ref([])
watch( watch(
() => form.organ_id, () => form.organ_id,
value => { value => {
if (value !== undefined || value !== '') { if (value !== '') {
handleGetSemesterList() handleGetSemesterList()
} }
} }
...@@ -56,32 +56,24 @@ watch( ...@@ -56,32 +56,24 @@ watch(
watch( watch(
() => form.semester_id, () => form.semester_id,
value => { value => {
console.log(value, '999') if (value !== '') {
if ((form.organ_id !== undefined && value !== undefined) || (form.organ_id !== '' && value !== '')) {
handleGetClassList() handleGetClassList()
} }
} }
) )
watch( watch(
() => form.class_id, () => form.course_id,
value => { value => {
console.log(value, '1111') if (value !== '') {
if (value !== undefined && form.organ_id !== undefined && form.semester_id !== undefined) { handleGetChapterList()
handleGetCourseList()
} }
} }
) )
watch( watch(
() => form.course_id, () => form.class_id,
value => { value => {
console.log(value, '1111') if (value !== '') {
if ( handleGetCourseList()
value !== undefined &&
form.organ_id !== undefined &&
form.semester_id !== undefined &&
form.course_id !== undefined
) {
handleGetChapterList()
} }
} }
) )
...@@ -151,18 +143,28 @@ const handleChangeOrgan = () => { ...@@ -151,18 +143,28 @@ const handleChangeOrgan = () => {
form.class_id = '' form.class_id = ''
form.course_id = '' form.course_id = ''
form.chapter_id = '' form.chapter_id = ''
semesterList.value = []
classList.value = []
courseList.value = []
chapterList.value = []
} }
const handleChangeSemester = () => { const handleChangeSemester = () => {
form.class_id = '' form.class_id = ''
form.course_id = '' form.course_id = ''
form.chapter_id = '' form.chapter_id = ''
classList.value = []
courseList.value = []
chapterList.value = []
} }
const handleChangeClass = () => { const handleChangeClass = () => {
form.course_id = '' form.course_id = ''
form.chapter_id = '' form.chapter_id = ''
courseList.value = []
chapterList.value = []
} }
const handleChangeCourse = () => { const handleChangeCourse = () => {
form.chapter_id = '' form.chapter_id = ''
chapterList.value = []
} }
</script> </script>
<template> <template>
...@@ -194,6 +196,7 @@ const handleChangeCourse = () => { ...@@ -194,6 +196,7 @@ const handleChangeCourse = () => {
placeholder="所属学期" placeholder="所属学期"
style="width: 100%" style="width: 100%"
@change="handleChangeSemester" @change="handleChangeSemester"
no-data-text="请先选择所属机构"
> >
<el-option v-for="item in semesterList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in semesterList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
...@@ -205,6 +208,7 @@ const handleChangeCourse = () => { ...@@ -205,6 +208,7 @@ const handleChangeCourse = () => {
placeholder="所属班级" placeholder="所属班级"
style="width: 100%" style="width: 100%"
@change="handleChangeClass" @change="handleChangeClass"
no-data-text="请先选择所属学期"
> >
<el-option v-for="item in classList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in classList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
...@@ -216,12 +220,19 @@ const handleChangeCourse = () => { ...@@ -216,12 +220,19 @@ const handleChangeCourse = () => {
placeholder="所属课程" placeholder="所属课程"
style="width: 100%" style="width: 100%"
@change="handleChangeCourse" @change="handleChangeCourse"
no-data-text="请先选择所属班级、学期"
> >
<el-option v-for="item in courseList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in courseList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属章节" prop="chapter_id"> <el-form-item label="所属章节" prop="chapter_id">
<el-select clearable v-model="form.chapter_id" placeholder="所属章节" style="width: 100%"> <el-select
clearable
v-model="form.chapter_id"
placeholder="所属章节"
style="width: 100%"
no-data-text="请先选择所属课程"
>
<el-option v-for="item in chapterList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in chapterList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
......
...@@ -42,7 +42,7 @@ const handleReplySubmit = () => { ...@@ -42,7 +42,7 @@ const handleReplySubmit = () => {
discussion_id: props.discussionId, discussion_id: props.discussionId,
reply_type: '2', reply_type: '2',
content: reply_content.value, content: reply_content.value,
reply_id: props.firstFloor?.id reply_id: postItem.value !== '' ? postItem.value.id : props.firstFloor?.id
} }
replyPosts(params).then(() => { replyPosts(params).then(() => {
reply_content.value = '' reply_content.value = ''
...@@ -208,7 +208,7 @@ const handleDelFloor = (val: any) => { ...@@ -208,7 +208,7 @@ const handleDelFloor = (val: any) => {
:autosize="{ minRows: 4, maxRows: 6 }" :autosize="{ minRows: 4, maxRows: 6 }"
type="textarea" type="textarea"
style="width: 100%" style="width: 100%"
:placeholder="postItem.to_name ? `回复@${postItem.to_name}:` : ''" :placeholder="postItem.to_name ? `回复@${postItem.from_name}:` : ''"
/> />
<el-button class="input_btn" type="primary" @click="handleReplySubmit">发表回复</el-button> <el-button class="input_btn" type="primary" @click="handleReplySubmit">发表回复</el-button>
</div> </div>
......
...@@ -84,7 +84,7 @@ const listOptions = $computed(() => { ...@@ -84,7 +84,7 @@ const listOptions = $computed(() => {
{ label: '所属机构/院校', prop: 'organ_name', align: 'center' }, { label: '所属机构/院校', prop: 'organ_name', align: 'center' },
{ label: '回复数量', prop: 'reply_count', align: 'center' }, { label: '回复数量', prop: 'reply_count', align: 'center' },
{ label: '更新时间', prop: 'updated_time', align: 'center' }, { label: '更新时间', prop: 'updated_time', align: 'center' },
{ label: '操作', slots: 'table-operate', align: 'center', fixed: 'right', width: 300 } { label: '操作', slots: 'table-operate', align: 'center', fixed: 'right', width: 200 }
] ]
} }
}) })
...@@ -97,8 +97,13 @@ const handleChangeOrgan = () => { ...@@ -97,8 +97,13 @@ const handleChangeOrgan = () => {
course_id.value = '' course_id.value = ''
chapter_id.value = '' chapter_id.value = ''
class_id.value = '' class_id.value = ''
semesterList.value = []
classList.value = []
courseList.value = []
chapterList.value = []
handleRefresh() handleRefresh()
} }
handleGetSemesterList()
handleRefresh() handleRefresh()
} }
const handleChangeSemester = () => { const handleChangeSemester = () => {
...@@ -106,6 +111,9 @@ const handleChangeSemester = () => { ...@@ -106,6 +111,9 @@ const handleChangeSemester = () => {
course_id.value = '' course_id.value = ''
chapter_id.value = '' chapter_id.value = ''
class_id.value = '' class_id.value = ''
classList.value = []
courseList.value = []
chapterList.value = []
handleRefresh() handleRefresh()
} }
handleRefresh() handleRefresh()
...@@ -114,6 +122,8 @@ const handleChangeClass = () => { ...@@ -114,6 +122,8 @@ const handleChangeClass = () => {
if (class_id.value === '') { if (class_id.value === '') {
course_id.value = '' course_id.value = ''
chapter_id.value = '' chapter_id.value = ''
courseList.value = []
chapterList.value = []
handleRefresh() handleRefresh()
} }
handleRefresh() handleRefresh()
...@@ -121,8 +131,11 @@ const handleChangeClass = () => { ...@@ -121,8 +131,11 @@ const handleChangeClass = () => {
const handleChangeCourse = () => { const handleChangeCourse = () => {
if (course_id.value === '') { if (course_id.value === '') {
chapter_id.value = '' chapter_id.value = ''
chapterList.value = []
handleRefresh() handleRefresh()
} }
handleRefresh() handleRefresh()
} }
// 刷新页面 // 刷新页面
...@@ -153,6 +166,14 @@ watch( ...@@ -153,6 +166,14 @@ watch(
} }
} }
) )
watch(
() => class_id.value,
value => {
if (value !== '') {
handleGetCourseList()
}
}
)
// 获取学期列表 // 获取学期列表
const handleGetSemesterList = () => { const handleGetSemesterList = () => {
const params: any = { type: 'semester', organ_id: organ_id.value } const params: any = { type: 'semester', organ_id: organ_id.value }
...@@ -165,7 +186,6 @@ const handleGetClassList = () => { ...@@ -165,7 +186,6 @@ const handleGetClassList = () => {
const params: any = { type: 'class', organ_id: organ_id.value, semester_id: semester_id.value } const params: any = { type: 'class', organ_id: organ_id.value, semester_id: semester_id.value }
getConditionList(params).then((res: any) => { getConditionList(params).then((res: any) => {
classList.value = res.data classList.value = res.data
handleGetCourseList()
}) })
} }
// 获取课程列表 // 获取课程列表
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论