Commit 0794ce24 authored by zhengke's avatar zhengke

修改

parent f576a5a8
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
let data = reactive({ let data = reactive({
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1, sortIndex: props.sort+1,
Score: 0, //总分
current: 1 ,//默认从第几个开始-用于从快捷菜单点入 current: 1 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}{{ data.GroupName }}
<text style="color:#999999;">(共{{data.DetailsList.length}}道,{{Score}}分)</text> <text style="color:#999999;">(共{{data.DetailsList.length}}道,{{data.GScore}}分)</text>
</view> </view>
<view> <view>
<text class="Single_Before">{{ExamIndex}}</text>/<text <text class="Single_Before">{{ExamIndex}}</text>/<text
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1, sortIndex: props.sort+1,
autoplay: false, autoplay: false,
Score: 0, //总分
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}{{ data.GroupName }}
<text style="color:#999999;">(共{{data.DetailsList.length}}道,{{Score}}分)</text> <text style="color:#999999;">(共{{data.DetailsList.length}}道,{{data.GScore}}分)</text>
</view> </view>
<view> <view>
<text class="Single_Before">{{ExamIndex}}</text>/<text <text class="Single_Before">{{ExamIndex}}</text>/<text
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1, sortIndex: props.sort+1,
autoplay: false, autoplay: false,
Score: 0, //总分
current: 1, //默认从第几个开始-用于从快捷菜单点入 current: 1, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
...@@ -89,13 +88,6 @@ ...@@ -89,13 +88,6 @@
myAnswer.splice(find, 1); myAnswer.splice(find, 1);
} }
}, },
//获取总分
getScore() {
data.Score = 0;
data.data.DetailsList.forEach(x => {
data.Score += x.Score
})
},
onchange(e) { onchange(e) {
data.ExamIndex = e.detail.current; data.ExamIndex = e.detail.current;
if (data.ExamIndex === data.data.DetailsList.length + 1) { if (data.ExamIndex === data.data.DetailsList.length + 1) {
...@@ -107,7 +99,6 @@ ...@@ -107,7 +99,6 @@
}, },
}; };
onMounted(() => { onMounted(() => {
that.getScore();
// if(props.isLast){ // if(props.isLast){
// data.current = props.paperData.DetailsList.length; // data.current = props.paperData.DetailsList.length;
// } // }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}{{ data.GroupName }}
<text style="color:#999999;">(共{{data.DetailsList.length}}道,{{Score}}分)</text> <text style="color:#999999;">(共{{data.DetailsList.length}}道,{{data.GScore}}分)</text>
</view> </view>
<view> <view>
<text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text> <text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text>
...@@ -70,7 +70,6 @@ export default { ...@@ -70,7 +70,6 @@ export default {
autoplay: false, autoplay: false,
sortIndex: props.sort+1, sortIndex: props.sort+1,
data: props.paperData, data: props.paperData,
Score: 0, //总分
current: 35 ,//默认从第几个开始-用于从快捷菜单点入 current: 35 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
...@@ -90,13 +89,6 @@ export default { ...@@ -90,13 +89,6 @@ export default {
data.data.DetailsList[index1].myAnswer = data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
//获取总分
getScore(){
data.Score=0;
data.data.DetailsList.forEach(x=>{
data.Score+=x.Score
})
},
onchange(e){ onchange(e){
data.ExamIndex = e.detail.current; data.ExamIndex = e.detail.current;
if(data.ExamIndex===data.data.DetailsList.length+1){ if(data.ExamIndex===data.data.DetailsList.length+1){
...@@ -110,7 +102,6 @@ export default { ...@@ -110,7 +102,6 @@ export default {
}; };
onMounted(()=>{ onMounted(()=>{
console.log(props.paperData,'props.paperData'); console.log(props.paperData,'props.paperData');
that.getScore();
}) })
let that = methods; let that = methods;
return { return {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}{{ data.GroupName }}
<text style="color:#999999;">(共{{data.DetailsList.length}}道,{{Score}}分)</text> <text style="color:#999999;">(共{{data.DetailsList.length}}道,{{data.GScore}}分)</text>
</view> </view>
<view> <view>
<text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text> <text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text>
...@@ -70,7 +70,6 @@ export default { ...@@ -70,7 +70,6 @@ export default {
data: props.paperData, data: props.paperData,
sortIndex: props.sort+1, sortIndex: props.sort+1,
Score: 0, //总分
current: 0 ,//默认从第几个开始-用于从快捷菜单点入 current: 0 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
...@@ -90,13 +89,6 @@ export default { ...@@ -90,13 +89,6 @@ export default {
data.data.DetailsList[index1].myAnswer = data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
//获取总分
getScore(){
data.Score=0;
data.data.DetailsList.forEach(x=>{
data.Score+=x.Score
})
},
onchange(e){ onchange(e){
data.ExamIndex = e.detail.current+1; data.ExamIndex = e.detail.current+1;
if(data.ExamIndex===data.data.DetailsList.length+1){ if(data.ExamIndex===data.data.DetailsList.length+1){
...@@ -105,7 +97,6 @@ export default { ...@@ -105,7 +97,6 @@ export default {
} }
}; };
onMounted(()=>{ onMounted(()=>{
that.getScore();
// if(props.isLast){ // if(props.isLast){
// data.current = props.paperData.DetailsList.length; // data.current = props.paperData.DetailsList.length;
// } // }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view> <view>
{{ changeNumToHan(sortIndex) }}{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}{{ data.GroupName }}
<text style="color: #999999" <text style="color: #999999"
>(共{{ data.DetailsList.length }}道,{{ Score }}分)</text >(共{{ data.DetailsList.length }}道,{{ data.GScore }}分)</text
> >
</view> </view>
<view> <view>
...@@ -27,10 +27,8 @@ ...@@ -27,10 +27,8 @@
> >
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
<view>{{ index1 + 1 }}</view>
<view class="num readTitle" v-html="item1.Title"></view> <view class="num readTitle" v-html="item1.Title"></view>
</view> </view>
<view <view
v-for="(item2, index2) in item1.QuestionContentObj" v-for="(item2, index2) in item1.QuestionContentObj"
:key="item2.id" :key="item2.id"
...@@ -86,7 +84,6 @@ export default { ...@@ -86,7 +84,6 @@ export default {
}); });
data.data.DetailsList.forEach((item) => { data.data.DetailsList.forEach((item) => {
item.Title = item.Title.replace(/\<img/gi, '<img style="max-width:100%"'); item.Title = item.Title.replace(/\<img/gi, '<img style="max-width:100%"');
console.log(90, item.Title);
}); });
let methods = { let methods = {
...@@ -104,13 +101,6 @@ export default { ...@@ -104,13 +101,6 @@ export default {
data.data.DetailsList[index1].myAnswer = data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
//获取总分
getScore() {
data.Score = 0;
data.data.DetailsList.forEach((x) => {
data.Score += parseFloat(x.Score);
});
},
onchange(e) { onchange(e) {
data.ExamIndex = e.detail.current; data.ExamIndex = e.detail.current;
if (data.ExamIndex === data.data.DetailsList.length + 1) { if (data.ExamIndex === data.data.DetailsList.length + 1) {
...@@ -124,7 +114,6 @@ export default { ...@@ -124,7 +114,6 @@ export default {
}; };
onMounted(() => { onMounted(() => {
console.log(props.paperData, "props.paperData"); console.log(props.paperData, "props.paperData");
that.getScore();
}); });
let that = methods; let that = methods;
return { return {
...@@ -160,6 +149,7 @@ export default { ...@@ -160,6 +149,7 @@ export default {
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); height: calc(100vh - 270rpx);
box-sizing: border-box; box-sizing: border-box;
overflow: auto;
} }
.num { .num {
......
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