提交 70b2a0cb authored 作者: 王鹏飞's avatar 王鹏飞

fix: #3228,#3229,#3230

上级 cb3225f6
...@@ -35,6 +35,9 @@ function handleScoreChange(value: number) { ...@@ -35,6 +35,9 @@ function handleScoreChange(value: number) {
form.has_score = Math.min(value, form.has_score) form.has_score = Math.min(value, form.has_score)
form.no_score = Math.min(value, form.no_score) form.no_score = Math.min(value, form.no_score)
} }
function handleHasScoreChange(value: number) {
form.no_score = Math.min(value, form.no_score)
}
</script> </script>
<template> <template>
...@@ -67,10 +70,10 @@ function handleScoreChange(value: number) { ...@@ -67,10 +70,10 @@ function handleScoreChange(value: number) {
<el-input-number :min="0" :max="form.score" v-model="form.min_score" v-if="form.rule_mode === 1" /> <el-input-number :min="0" :max="form.score" v-model="form.min_score" v-if="form.rule_mode === 1" />
<template v-else> <template v-else>
<el-form-item label="有附件" label-width="auto" style="margin-right: 10px; margin-bottom: 10px"> <el-form-item label="有附件" label-width="auto" style="margin-right: 10px; margin-bottom: 10px">
<el-input-number :min="0" :max="form.score" v-model="form.has_score" /> <el-input-number :min="0" :max="form.score" v-model="form.has_score" @change="handleHasScoreChange" />
</el-form-item> </el-form-item>
<el-form-item label="无附件" label-width="auto" style="margin-bottom: 10px"> <el-form-item label="无附件" label-width="auto" style="margin-bottom: 10px">
<el-input-number :min="0" :max="form.score" v-model="form.no_score" /> <el-input-number :min="0" :max="form.has_score" v-model="form.no_score" />
</el-form-item> </el-form-item>
</template> </template>
</el-form-item> </el-form-item>
......
...@@ -11,6 +11,7 @@ interface Props { ...@@ -11,6 +11,7 @@ interface Props {
id: string id: string
} }
const props = defineProps<Props>() const props = defineProps<Props>()
const router = useRouter()
let detail = $ref<ExperimentItem>() let detail = $ref<ExperimentItem>()
const teacherText = $computed(() => { const teacherText = $computed(() => {
...@@ -53,9 +54,6 @@ onMounted(() => { ...@@ -53,9 +54,6 @@ onMounted(() => {
fetchInfo() fetchInfo()
}) })
const score = $computed(() => {
return detail?.score ? parseFloat(detail.score) : 0
})
// 合计 // 合计
const total = $computed(() => { const total = $computed(() => {
return form.detail_list.reduce((result: number, item: any) => { return form.detail_list.reduce((result: number, item: any) => {
...@@ -65,10 +63,6 @@ const total = $computed(() => { ...@@ -65,10 +63,6 @@ const total = $computed(() => {
// 保存 // 保存
function handleSubmit() { function handleSubmit() {
if (total !== score) {
ElMessage.error('请确保组件总分等于实验总分!')
return
}
formRef?.validate().then(() => { formRef?.validate().then(() => {
const params = { ...form, detail_list: JSON.stringify(form.detail_list) } const params = { ...form, detail_list: JSON.stringify(form.detail_list) }
if (form.report_upload_way === 1) { if (form.report_upload_way === 1) {
...@@ -77,7 +71,7 @@ function handleSubmit() { ...@@ -77,7 +71,7 @@ function handleSubmit() {
}).then(() => { }).then(() => {
updateExperimentReportRule(params).then(() => { updateExperimentReportRule(params).then(() => {
ElMessage({ message: '保存成功', type: 'success' }) ElMessage({ message: '保存成功', type: 'success' })
window.close() router.replace('/admin/lab/experiment')
}) })
}) })
} else { } else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论