Commit e9d7a6ae authored by 罗超's avatar 罗超

1

parent 5b336e1d
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
<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"
@hideAnswer="hideAnswerSheet" @hideAnswer="hideAnswerSheet"
@chooseTopic="jumpTopic" @chooseTopic="jumpTopic"
ref="answer" ref="answer"
...@@ -364,7 +364,7 @@ export default { ...@@ -364,7 +364,7 @@ export default {
changeIndex: 0, //大题序号 changeIndex: 0, //大题序号
isLast: false, //用于判断是否从后往前翻 isLast: false, //用于判断是否从后往前翻
isShowAnswer: false, //是否显示答题卡 isShowAnswer: false, //是否显示答题卡
Exam_Student_Id:0 Exam_Student_Id: 0,
}); });
let methods = { let methods = {
changeNumToHan, changeNumToHan,
...@@ -414,7 +414,7 @@ export default { ...@@ -414,7 +414,7 @@ export default {
data.peaperDetail.Paper.GroupList[val.index].startIndex = data.peaperDetail.Paper.GroupList[val.index].startIndex =
val.index1 + 1; val.index1 + 1;
data.isShowAnswer = false; data.isShowAnswer = false;
data.isLast=false; data.isLast = false;
}, },
//考试结束 //考试结束
examFinish() { examFinish() {
...@@ -433,16 +433,16 @@ export default { ...@@ -433,16 +433,16 @@ export default {
}; };
}, },
onLoad(options) { onLoad(options) {
console.log(options,'options'); console.log(options, "options");
if(options.PaperId){ if (options.PaperId) {
this.msg.PaperId = options.PaperId; this.msg.PaperId = options.PaperId;
} }
if(options.Id){ if (options.Id) {
this.msg.PublishId = options.Id; this.msg.PublishId = options.Id;
} }
if(options.Exam_Student_Id){ if (options.Exam_Student_Id) {
this.Exam_Student_Id = options.Exam_Student_Id; this.Exam_Student_Id = options.Exam_Student_Id;
} }
this.getPaperDetail(); this.getPaperDetail();
}, },
}; };
......
...@@ -45,7 +45,15 @@ ...@@ -45,7 +45,15 @@
/> />
<view class="teacherName">{{ item.teacherName }}</view> <view class="teacherName">{{ item.teacherName }}</view>
</view> </view>
<view class="exam-status"> <view
class="exam-status"
:class="{
'status-blue': item.ExamStatusStr == '未开始',
'status-green': item.ExamStatusStr == '已开始',
'status-black': item.ExamStatusStr == '完成',
'status-red': item.ExamStatusStr == '缺考',
}"
>
{{ item.ExamStatusStr }} {{ item.ExamStatusStr }}
</view> </view>
</view> </view>
...@@ -75,7 +83,6 @@ export default { ...@@ -75,7 +83,6 @@ export default {
Loadmore, Loadmore,
}, },
setup() { setup() {
let Gid = uni.getStorageSync("userInfo").Id;
let data = reactive({ let data = reactive({
pageState: "more", pageState: "more",
examList: [ examList: [
...@@ -93,7 +100,7 @@ export default { ...@@ -93,7 +100,7 @@ export default {
pageSize: 10, pageSize: 10,
rowsPerPage: 10, rowsPerPage: 10,
ExamStatus: 0, ExamStatus: 0,
GuestId: Gid, GuestId: 0,
}, },
pageCount: 0, pageCount: 0,
}); });
...@@ -139,10 +146,12 @@ export default { ...@@ -139,10 +146,12 @@ export default {
...methods, ...methods,
}; };
}, },
onLoad() { onLoad(optipns) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "试卷列表", title: "试卷列表",
}); });
this.msg.GuestId = optipns.Id;
console.log(146, optipns);
this.getList(); this.getList();
}, },
}; };
...@@ -168,7 +177,8 @@ export default { ...@@ -168,7 +177,8 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
background-color: #333333; /* background-color: #333333; */
box-shadow: 0rpx 10rpx 30rpx 0rpx rgba(36, 36, 36, 0.2);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: cover; background-size: cover;
...@@ -231,4 +241,16 @@ export default { ...@@ -231,4 +241,16 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx 40rpx; padding: 0 30rpx 40rpx;
} }
.status-blue {
color: #00acf9;
}
.status-green {
color: #00df9f;
}
.status-black {
color: #111111;
}
.status-red {
color: #ff3816;
}
</style> </style>
...@@ -87,7 +87,12 @@ ...@@ -87,7 +87,12 @@
</view> </view>
<van-cell-group :border="false"> <van-cell-group :border="false">
<van-cell title="我的考试" title-class="title" :border="false"> <van-cell title="我的考试" title-class="title" :border="false">
<view class="value" @click="jumpPage('/pages/exam/examPaperList')"> <view
class="value"
@click="
jumpPage(`/pages/exam/examPaperList?Id=${indexData.GuestId}`)
"
>
查看更多 查看更多
</view> </view>
</van-cell> </van-cell>
...@@ -123,10 +128,10 @@ ...@@ -123,10 +128,10 @@
<view <view
class="test-status" class="test-status"
:class="{ :class="{
'status-black': item.ExamStatus == 1, 'status-blue': item.ExamStatusStr == '未开始',
'status-red': item.ExamStatus == 2, 'status-green': item.ExamStatusStr == '已开始',
'status-green': item.ExamStatus == 3, 'status-black': item.ExamStatusStr == '完成',
'status-blue': item.ExamStatus == 4, 'status-red': item.ExamStatusStr == '缺考',
}" }"
> >
{{ item.ExamStatusStr }} {{ item.ExamStatusStr }}
......
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