zp_axl_rose/JM-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部分会议提到的bug

Browse Source
This commit is contained in:
axlrose2333
2023-03-14 18:11:48 +08:00
parent afcb62b4eb
commit 92657ea736
18 changed files with 1186 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/view/examinationManage/components/groupPool.vue
View File

@@ -22,6 +22,7 @@ import custom from '@/utils/custom'
// 监听
watch(props,(val1,val2) => {
has_exam_types.value = _.cloneDeep(val1.exam_types) || []
queryParams.value.examId = val1.exam_id
})
// 变量
const has_exam_types = ref(_.cloneDeep(props.exam_types) || [])
@@ -49,6 +50,10 @@ async function getExamGroupList() {
if(res.code === 0) {
type_list.value = res.data.records
total.value = res.data.total
console.log('子组件获取行为')
if(type_list.value.length==0) {
type_list.value = _.cloneDeep(has_exam_types.value)
}
}
}
function chooseChapterChildExercises() {
@@ -130,11 +135,11 @@ function enterDb() { // 确认新增/编辑
}
else{ // 新增
let f = checkFunc(gform.value)
if(!f) { // 有相同人数且没有过期,无法再次创建
ElMessage.error('该级别组数已存在!')
return
}
// let f = checkFunc(gform.value)
// if(!f) { // 有相同人数且没有过期,无法再次创建
// ElMessage.error('该级别组数已存在!')
// return
// }
}
if(!edit_flag.value) { // 新增
gform.value.term = assigntTermFunc()
@@ -327,21 +332,35 @@ function close_draw() {
<!-- </div>-->
</el-form-item>
<el-form-item label="截止时间" >
<el-date-picker class="oi-item" style="margin-left:5px"
<!-- <el-date-picker class="oi-item" style="margin-left:5px"-->
<!-- v-model="gform.expiry_date"-->
<!-- type="date"-->
<!-- placeholder="截至日期"-->
<!-- format="YYYY-MM-DD"-->
<!-- value-format="x"-->
<!-- />-->
<el-date-picker
v-model="gform.expiry_date"
type="date"
type="datetime"
placeholder="截至日期"
format="YYYY-MM-DD"
format="YYYY-MM-DD HH:mm:ss"
value-format="x"
/>
</el-form-item>
<el-form-item label="公开时间" >
<el-date-picker class="oi-item" style="margin-left:5px"
<!-- <el-date-picker class="oi-item" style="margin-left:5px"-->
<!-- v-model="gform.public_date"-->
<!-- type="date"-->
<!-- placeholder="截至日期"-->
<!-- format="YYYY-MM-DD"-->
<!-- value-format="x"-->
<!-- />-->
<el-date-picker
v-model="gform.public_date"
type="date"
placeholder="截至日期"
format="YYYY-MM-DD"
type="datetime"
placeholder="公开时间"
format="YYYY-MM-DD HH:mm:ss"
value-format="x"
/>
</el-form-item>

55
src/view/examinationManage/index.vue
View File

@@ -53,7 +53,7 @@ const content = ref(null)
// const options = ref([]) // 答案选项数组
const exam_types = ref([])
const exam_ids = ref([])
const price_props = ['first','second','third']
const price_props = ['first','second','third','price']
const exam_type_ids = ref([])
// 生命周期
onMounted(() => {
@@ -139,6 +139,7 @@ function editCourseFunc(row) {
form.value = _.cloneDeep(row.exam)
form.value.course_ids = JSON.parse(row.exam.course_ids)
form.value.question_ids = JSON.parse(row.exam.question_ids)
form.value.price = Number(form.value.price)/100
exam_types.value = row.exam_types.map((item) => {
for(let prop in item) {
if(price_props.includes(prop)) {
@@ -147,6 +148,7 @@ function editCourseFunc(row) {
}
return item
})
// console.log(form.value)
current_subject.value = form.value.subject
openDialog('edit')
}
@@ -196,6 +198,8 @@ async function enterDialog() { // 提交
}
return item
})
// console.log(form.value)
form.value.price = Number(form.value.price )*100
form.value.duration = parseInt(form.value.duration)
const params = {
...form.value
@@ -267,6 +271,7 @@ function addCourseFunc(data) {
form.value.course_ids = data
}
function addGroupFunc(data) {
console.log("父组件行为")
exam_types.value = _.clone(data)
}
</script>
@@ -406,54 +411,18 @@ function addGroupFunc(data) {
<el-form-item label="测试时长" >
<el-input type="number" v-model="form.duration" placeholder="请输入测试时长（分钟）" />
</el-form-item>
<!-- <el-form-item label="测试组别" >-->
<!-- <div class="options-box" style="width: 100%">-->
<!-- <div class="option-item" v-if="exam_types.length>0" v-for="(item,i) in exam_types">-->
<!-- <el-form :model="item" >-->
<!-- <div class="oi-row">-->
<!-- <div class="oi-item">{{i+1}}</div>-->
<!-- <el-input class="oi-item" type="number" style="margin-left:5px;width: 30%" v-model="item.persons" placeholder="请输入组别人数" />-->
<!-- <el-date-picker class="oi-item" style="margin-left:5px"-->
<!-- v-model="item.expiry_date"-->
<!-- type="date"-->
<!-- placeholder="截至日期"-->
<!-- format="YYYY-MM-DD"-->
<!-- value-format="x"-->
<!-- />-->
<!-- <el-date-picker class="oi-item" style="margin-left:5px"-->
<!-- v-model="item.public_date"-->
<!-- type="date"-->
<!-- placeholder="成绩公布日期"-->
<!-- format="YYYY-MM-DD"-->
<!-- value-format="x"-->
<!-- />-->
<!-- <el-icon class="oi-item" style="margin-left: 5px;cursor: pointer" @click="delet_func(i)"><Delete /></el-icon>-->
<!-- </div>-->
<!-- <div class="reward-box">-->
<!-- <el-form-item class="rb-item" style="margin-right:10px;display: flex" label="第一名">-->
<!-- <el-input style="width:auto;margin-right: 5px" type="number" v-model="item.first" placeholder="请输入第一名奖励" /><div>元</div>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="rb-item" style="margin-right:10px;" label="第二名">-->
<!-- <el-input style="width:auto;margin-right: 5px" type="number" v-model="item.second" placeholder="请输入第二名奖励" />元-->
<!-- </el-form-item>-->
<!-- <el-form-item class="rb-item" style="margin-right:10px;" label="第三名">-->
<!-- <el-input style="width:auto;margin-right: 5px" type="number" v-model="item.third" placeholder="请输入第三名奖励" />元-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- <el-button @click="addOptionFunc">添加组别</el-button>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="测试价格" >
<el-input type="number" v-model="form.price" placeholder="请输入测试价格（元）" />
</el-form-item>
<el-form-item label="测试组别" >
<groupPool @addFunc="addGroupFunc" :exam_types="exam_types" :exam_id="form.exam_id" />
</el-form-item>
<el-form-item label="添加习题" >
<exercisesPool @addFunc="addExercisesFunc" :seleted_arr="form.question_ids" />
</el-form-item>
<el-form-item label="适用课程" >
<coursePool @addFunc="addCourseFunc" :seleted_arr="form.course_ids" />
</el-form-item>
<!-- <el-form-item label="适用课程" >-->
<!-- <coursePool @addFunc="addCourseFunc" :seleted_arr="form.course_ids" />-->
<!-- </el-form-item>-->
<el-form-item label="受否上架" >
<el-switch
v-model="form.status"