Commit 548ff459 authored by 罗超's avatar 罗超

1

parent 0aa61bcb
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
:paperData="item" :paperData="item"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
:sort="index" :sort="index"
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
:isLast="isLast" :isLast="isLast"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'listening' && index === changeIndex" v-if="item.QuestionTypeKey === 'listening' && index === changeIndex"
/> />
<!-- 填空题 --> <!-- 填空题 -->
...@@ -143,8 +143,10 @@ ...@@ -143,8 +143,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'noun-explanation' && index === changeIndex" v-if="
item.QuestionTypeKey === 'noun-explanation' && index === changeIndex
"
/> />
<!-- 论述题 --> <!-- 论述题 -->
<easyQuestion <easyQuestion
...@@ -155,8 +157,10 @@ ...@@ -155,8 +157,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'essay-question' && index === changeIndex" v-if="
item.QuestionTypeKey === 'essay-question' && index === changeIndex
"
/> />
<!-- 计算题 --> <!-- 计算题 -->
<Calculation <Calculation
...@@ -167,7 +171,7 @@ ...@@ -167,7 +171,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'calculation' && index === changeIndex" v-if="item.QuestionTypeKey === 'calculation' && index === changeIndex"
/> />
<!-- 分录题 --> <!-- 分录题 -->
...@@ -179,8 +183,10 @@ ...@@ -179,8 +183,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'entry-problem' && index === changeIndex" v-if="
item.QuestionTypeKey === 'entry-problem' && index === changeIndex
"
/> />
<!-- 口语题 --> <!-- 口语题 -->
<Spoken <Spoken
...@@ -191,7 +197,7 @@ ...@@ -191,7 +197,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'spoken' && index === changeIndex" v-if="item.QuestionTypeKey === 'spoken' && index === changeIndex"
/> />
<!-- 其他 --> <!-- 其他 -->
...@@ -203,7 +209,7 @@ ...@@ -203,7 +209,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'other' && index === changeIndex" v-if="item.QuestionTypeKey === 'other' && index === changeIndex"
/> />
<!-- 完型填空 --> <!-- 完型填空 -->
...@@ -215,7 +221,7 @@ ...@@ -215,7 +221,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'cloze' && index === changeIndex" v-if="item.QuestionTypeKey === 'cloze' && index === changeIndex"
/> />
<!-- 资料题 --> <!-- 资料题 -->
...@@ -227,8 +233,10 @@ ...@@ -227,8 +233,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'data-question' && index === changeIndex" v-if="
item.QuestionTypeKey === 'data-question' && index === changeIndex
"
/> />
<!-- 公用选择题 --> <!-- 公用选择题 -->
<SharingChoose <SharingChoose
...@@ -239,8 +247,10 @@ ...@@ -239,8 +247,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'sharing-choose' && index === changeIndex" v-if="
item.QuestionTypeKey === 'sharing-choose' && index === changeIndex
"
/> />
<!-- 排序题 --> <!-- 排序题 -->
<SortingProblem <SortingProblem
...@@ -251,8 +261,10 @@ ...@@ -251,8 +261,10 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'sorting-problem' && index === changeIndex" v-if="
item.QuestionTypeKey === 'sorting-problem' && index === changeIndex
"
/> />
<!-- 连线题待完善 --> <!-- 连线题待完善 -->
<Connect <Connect
...@@ -263,7 +275,7 @@ ...@@ -263,7 +275,7 @@
:sortTotal="peaperDetail.Paper.GroupList.length" :sortTotal="peaperDetail.Paper.GroupList.length"
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()" @getBeforeTopic="getBeforeTopic()"
@answerChange="getAnswerChange($event, index)" @answerChange="getAnswerChange($event, index)"
v-if="item.QuestionTypeKey === 'matching' && index === changeIndex" v-if="item.QuestionTypeKey === 'matching' && index === changeIndex"
/> />
</view> </view>
...@@ -341,7 +353,7 @@ export default { ...@@ -341,7 +353,7 @@ export default {
let Gid = uni.getStorageSync("userInfo").Id; let Gid = uni.getStorageSync("userInfo").Id;
let { refs } = getCurrentInstance(); let { refs } = getCurrentInstance();
let data = reactive({ let data = reactive({
time: 2 * 60 * 60 * 1000, time: 1 * 60 * 60 * 1000,
statusBarHeight: 0, statusBarHeight: 0,
// msg: { GuestId: Gid, PaperId: 6, Id: 3 }, // msg: { GuestId: Gid, PaperId: 6, Id: 3 },
msg: { GuestId: Gid, PaperId: 5, PublishId: 1 }, msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
...@@ -367,6 +379,7 @@ export default { ...@@ -367,6 +379,7 @@ export default {
let res = await getPaperDetail(data.msg); let res = await getPaperDetail(data.msg);
if (res) { if (res) {
data.peaperDetail = res.Data; data.peaperDetail = res.Data;
data.time = res.Data.Publish.ExamTimes * 60 * 1000;
} }
}, },
//往后翻 //往后翻
...@@ -401,6 +414,7 @@ export default { ...@@ -401,6 +414,7 @@ export default {
}, },
}; };
onMounted(() => { onMounted(() => {
methods.start();
getSystemInfo((res) => { getSystemInfo((res) => {
data.statusBarHeight = res.statusBarHeight; data.statusBarHeight = res.statusBarHeight;
}); });
...@@ -411,6 +425,9 @@ export default { ...@@ -411,6 +425,9 @@ export default {
}; };
}, },
onLoad(options) { onLoad(options) {
this.msg.PaperId = options.PaperId;
this.msg.PublishId = options.Id;
console.log(414, this.msg);
this.getPaperDetail(); this.getPaperDetail();
}, },
}; };
......
...@@ -93,16 +93,20 @@ ...@@ -93,16 +93,20 @@
</van-cell-group> </van-cell-group>
<view class="mytest flex"> <view class="mytest flex">
<view <view
v-for="(item, index) in testList" v-for="(item, index) in indexData.paperList"
:key="index" :key="index"
class="test-item no_shrink" class="test-item no_shrink"
:style="{ 'background-image': `url(${item.bgimg})` }" :style="{ 'background-image': `url(${item.PicList[0]})` }"
@click="jumpPage('/pages/exam/examPaper')" @click="
jumpPage(
`/pages/exam/examPaper?PaperId=${item.PaperId}&&Id=${item.Id}`
)
"
> >
<view class="testName"> <view class="testName">
{{ item.testName }} {{ item.PaperName }}
</view> </view>
<view class="testTime"> 考试时间:{{ item.testTime }} </view> <view class="testTime"> 考试时间:{{ item.ExamStartTime }} </view>
<view class="teacherInfo-bg"></view> <view class="teacherInfo-bg"></view>
<view class="teacherInfo flex flex_between_center"> <view class="teacherInfo flex flex_between_center">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
...@@ -113,10 +117,18 @@ ...@@ -113,10 +117,18 @@
fit="cover" fit="cover"
src="https://img.yzcdn.cn/vant/cat.jpeg" src="https://img.yzcdn.cn/vant/cat.jpeg"
/> />
<view class="teacherName">{{ item.teacherName }}</view> <view class="teacherName">{{ indexData.TeacherName }}</view>
</view> </view>
<view class="test-status"> <view
{{ item.status }} class="test-status"
:class="{
'status-black': item.ExamStatus == 1,
'status-red': item.ExamStatus == 2,
'status-green': item.ExamStatus == 3,
'status-blue': item.ExamStatus == 4,
}"
>
{{ item.ExamStatusStr }}
</view> </view>
</view> </view>
</view> </view>
...@@ -192,7 +204,7 @@ export default { ...@@ -192,7 +204,7 @@ export default {
desc: "李琴", desc: "李琴",
img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon6.png", img: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/icon6.png",
bgcolor: "#FFE7E6", bgcolor: "#FFE7E6",
jumpUrl: "/pages/course/askForLeaveList", jumpUrl: "",
}, },
], ],
testList: [ testList: [
...@@ -437,11 +449,14 @@ export default { ...@@ -437,11 +449,14 @@ 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);
margin-right: 30rpx; margin-right: 30rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: cover; background-size: cover;
background-origin: border-box;
background-clip: border-box;
padding-top: 60rpx; padding-top: 60rpx;
padding-left: 44rpx; padding-left: 44rpx;
position: relative; position: relative;
...@@ -492,6 +507,18 @@ export default { ...@@ -492,6 +507,18 @@ export default {
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
/* color: #00acf9; */
}
.status-blue {
color: #00acf9; color: #00acf9;
} }
.status-green {
color: #00df9f;
}
.status-black {
color: #111111;
}
.status-red {
color: #ff3816;
}
</style> </style>
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