Commit 005a3fa5 authored by zhengke's avatar zhengke

修改

parent 3a011d37
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</view> </view>
</view> </view>
<view class="submitBox"> <view class="submitBox">
<view class="submit" @click="savePaper">立即提交</view> <view class="submit" @click="savePaper">立即提交</view>
</view> </view>
<van-toast id="van-toast" /> <van-toast id="van-toast" />
</view> </view>
...@@ -96,14 +96,23 @@ export default { ...@@ -96,14 +96,23 @@ export default {
paperData: Object, paperData: Object,
ExamStuId: Number, ExamStuId: Number,
SubmitTimes: Number, SubmitTimes: Number,
StartTime: String StartTime: String,
isExamOver: Boolean
}, },
setup(props, ctx) { setup(props, ctx) {
let Gid = uni.getStorageSync("userInfo").Id; let Gid = uni.getStorageSync("userInfo").Id;
let data = reactive({ let data = reactive({
msg: { GuestId: Gid, PaperId: 5, PublishId: 1 }, msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
questionList: props.paperData.Paper.GroupList, questionList: props.paperData.Paper.GroupList,
isExamOver: props.isExamOver
}); });
watch(()=> props.isExamOver, (newVal, oldVal) => {
console.log(oldVal,'oldValoldVal');
console.log(newVal,'newVal');
if(newVal){
methods.savePaper();
}
});
let methods = { let methods = {
changeNumToHan, changeNumToHan,
chooseTopic(index, index1, index2) { chooseTopic(index, index1, index2) {
...@@ -132,9 +141,6 @@ export default { ...@@ -132,9 +141,6 @@ export default {
dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss; dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
return dateTime return dateTime
}, },
getCeshi(){
console.log('测试来了');
},
//交卷 //交卷
async savePaper() { async savePaper() {
let obj = JSON.parse(JSON.stringify(props.paperData.Paper)); let obj = JSON.parse(JSON.stringify(props.paperData.Paper));
...@@ -154,6 +160,8 @@ export default { ...@@ -154,6 +160,8 @@ export default {
}); });
return return
} }
console.log('自动交卷了');
return;
let res = await submitPaper(obj); let res = await submitPaper(obj);
if (res) { if (res) {
console.log(119, res); console.log(119, res);
......
...@@ -324,11 +324,12 @@ ...@@ -324,11 +324,12 @@
</view> </view>
</view> </view>
<view class="answer-con" v-if="isShowAnswer"> <view class="answer-con" v-if="isShowAnswer">
<Answer <answer
:paperData="peaperDetail" :paperData="peaperDetail"
:ExamStuId="Exam_Student_Id" :ExamStuId="Exam_Student_Id"
:StartTime="StartTime" :StartTime="StartTime"
:SubmitTimes="SubmitTimes" :SubmitTimes="SubmitTimes"
:isExamOver="isExamOver"
@hideAnswer="hideAnswerSheet" @hideAnswer="hideAnswerSheet"
@chooseTopic="jumpTopic" @chooseTopic="jumpTopic"
ref="answer" ref="answer"
...@@ -371,7 +372,7 @@ import Dataquestion from "../../components/subject/Dataquestion.vue"; ...@@ -371,7 +372,7 @@ import Dataquestion from "../../components/subject/Dataquestion.vue";
import SortingProblem from "../../components/subject/SortingProblem.vue"; import SortingProblem from "../../components/subject/SortingProblem.vue";
import Connect from "../../components/subject/Connect.vue"; //"连线题" import Connect from "../../components/subject/Connect.vue"; //"连线题"
import SharingChoose from "../../components/subject/SharingChoose.vue"; import SharingChoose from "../../components/subject/SharingChoose.vue";
import Answer from "../../components/subject/answer.vue"; //答题卡 import answer from "../../components/subject/answer.vue"; //答题卡
export default { export default {
components: { components: {
SingleChoiceNumber, SingleChoiceNumber,
...@@ -393,7 +394,7 @@ export default { ...@@ -393,7 +394,7 @@ export default {
EntryProblem, EntryProblem,
SharingChoose, SharingChoose,
Connect, Connect,
Answer, answer,
}, },
setup(props, context) { setup(props, context) {
let { refs } = getCurrentInstance(); let { refs } = getCurrentInstance();
...@@ -413,7 +414,8 @@ export default { ...@@ -413,7 +414,8 @@ export default {
isAutoTime: false, isAutoTime: false,
ExamStatus:-2, ExamStatus:-2,
StartTime:'', //页面加载后的时间 StartTime:'', //页面加载后的时间
SubmitTimes: 0 //后台设置几分钟后可提交 SubmitTimes: 0 ,//后台设置几分钟后可提交
isExamOver:false
}); });
let methods = { let methods = {
changeNumToHan, changeNumToHan,
...@@ -441,7 +443,7 @@ export default { ...@@ -441,7 +443,7 @@ export default {
this.isOperate=true; this.isOperate=true;
data.autoTimeStart = true; data.autoTimeStart = true;
// data.time = res.Data.Publish.ExamTimes * 60 * 1000; // data.time = res.Data.Publish.ExamTimes * 60 * 1000;
data.time = 60000 data.time = 5000
} }
} }
} }
...@@ -476,10 +478,14 @@ export default { ...@@ -476,10 +478,14 @@ export default {
data.isShowAnswer = false; data.isShowAnswer = false;
data.isLast = false; data.isLast = false;
}, },
//考试结束 //倒计时完成考试结束
examFinish() { examFinish() {
console.log('进入'); uni.showToast({
this.$refs.answer.getCeshi(); title: '考试时间已到,系统将自动保存',
icon: "none",
});
data.isShowAnswer = true;
data.isExamOver = true;
}, },
}; };
onMounted(() => { onMounted(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment