|
@@ -66,6 +66,9 @@
|
|
<FormItem :label="$t('learnActivity.createEv.endTime')" prop="endTime">
|
|
<FormItem :label="$t('learnActivity.createEv.endTime')" prop="endTime">
|
|
<DatePicker :options="dateOpt1" type="datetime" format="yyyy/MM/dd HH:mm" v-model="endTime" split-panels :placeholder="$t('learnActivity.createEv.eTimeHolder')" style="width:100%" @on-change="getDate($event,1)"></DatePicker>
|
|
<DatePicker :options="dateOpt1" type="datetime" format="yyyy/MM/dd HH:mm" v-model="endTime" split-panels :placeholder="$t('learnActivity.createEv.eTimeHolder')" style="width:100%" @on-change="getDate($event,1)"></DatePicker>
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
+ <FormItem>
|
|
|
|
+ <Checkbox v-model="evaluationInfo.isCompletion">{{ $t('learnActivity.createEv.completeScore') }}</Checkbox>
|
|
|
|
+ </FormItem>
|
|
</Form>
|
|
</Form>
|
|
</vuescroll>
|
|
</vuescroll>
|
|
</div>
|
|
</div>
|
|
@@ -169,7 +172,8 @@ export default {
|
|
startTime: undefined,
|
|
startTime: undefined,
|
|
endTime: undefined,
|
|
endTime: undefined,
|
|
paperInfo: [],
|
|
paperInfo: [],
|
|
- papers: []
|
|
|
|
|
|
+ papers: [],
|
|
|
|
+ isCompletion: 0
|
|
},
|
|
},
|
|
mode: '',
|
|
mode: '',
|
|
selectBefore: [],
|
|
selectBefore: [],
|
|
@@ -467,7 +471,8 @@ export default {
|
|
endTime: this.evaluationInfo.endTime,
|
|
endTime: this.evaluationInfo.endTime,
|
|
scope: this.evaluationInfo.scope,
|
|
scope: this.evaluationInfo.scope,
|
|
createDate: Math.round(new Date()),
|
|
createDate: Math.round(new Date()),
|
|
- owner: 'teacher' //后面新增字段
|
|
|
|
|
|
+ owner: 'teacher', //后面新增字段
|
|
|
|
+ isCompletion: this.evaluationInfo.isCompletion ? 1 : 0
|
|
}
|
|
}
|
|
|
|
|
|
this.$api.learnActivity.SaveExamInfo(requestData).then(
|
|
this.$api.learnActivity.SaveExamInfo(requestData).then(
|
|
@@ -601,7 +606,10 @@ export default {
|
|
let rule = this.evaluationInfo.paperInfo
|
|
let rule = this.evaluationInfo.paperInfo
|
|
if (data) {
|
|
if (data) {
|
|
let paperDto = []
|
|
let paperDto = []
|
|
- let typeArr = ['single', 'multiple', 'judge', 'complete']
|
|
|
|
|
|
+ let typeArr = ['single', 'multiple', 'judge']
|
|
|
|
+ if(this.evaluationInfo.isCompletion) {
|
|
|
|
+ typeArr.push('complete')
|
|
|
|
+ }
|
|
for (let i = 0; i < data.length; i++) {
|
|
for (let i = 0; i < data.length; i++) {
|
|
if (data[i].blob.indexOf('/exam/') == 0) {
|
|
if (data[i].blob.indexOf('/exam/') == 0) {
|
|
paperDto.push(data[i])
|
|
paperDto.push(data[i])
|