Skip to content

P
pica-professional-exam
提交 93c10998 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

解析有问题

上级 e01660d4
显示空白字符变更
内嵌 并排
正在显示 包含 89 行增加 和 45 行删除
src/components/question/question-content.vue
浏览文件 @ 93c10998
......@@ -33,7 +33,7 @@
class="option border"
>{{getOrderVac(index)}}</span>
<span
v-if="(item.isSelected && !currentQuestion.commitFlag) || (!item.isSelected && currentQuestion.commitFlag && item.isCorrect)"
v-else-if="(item.isSelected && !currentQuestion.commitFlag) || (!item.isSelected && currentQuestion.commitFlag && item.isCorrect)"
class="option bg"
>{{getOrderVac(index)}}</span>
<template v-else>
......@@ -164,23 +164,22 @@ export default {
token: this.userInfo.userToken
};
// 计算是否答对了题目（只有多选题，才做相应处理）
if (this.currentQuestion.typeId == 2) {
console.log('isMulti', isMulti);
// if (this.currentQuestion.typeId == 2) {
let isRight = this.currentQuestion.myAnswer == this.currentQuestion.answer;
if (isRight) {
this.currentQuestion.commitFlag = 1;
} else {
this.currentQuestion.commitFlag = 2;
}
this.currentQuestion.isAnalyzed = true;
}
// }
this.POST(`onlineexam/practise/commit`, params).then(({ data }) => {
console.log('in commitAnswer res', data);
if(data.resultType == 1) {
this.currentQuestion.commitFlag = 1;
} else {
this.currentQuestion.commitFlag = 2;
}
// if(data.resultType == 1) {
// this.currentQuestion.commitFlag = 1;
// } else {
// this.currentQuestion.commitFlag = 2;
// }
}).catch( error => {
this.currentQuestion.commitFlag = 0;
this.currentQuestion.isAnalyzed = false;
......
src/components/question/question-footer.vue
浏览文件 @ 93c10998
......@@ -40,7 +40,9 @@ export default {
"questionList",
"currentQuestion",
"totalCount",
"userInfo"
"userInfo",
"titleConfig",
"commonConfig",
])
},
methods: {
......@@ -86,7 +88,7 @@ export default {
toggleAnalysis() {
this.currentQuestion.isAnalyzed = true;
if(!this.currentQuestion.commitFlag) {
this.$parent.$refs['questionContentRef'] && this.$parent.refs['questionContentRef'].commitAnswer(this.currentQuestion.typeId == 2);
this.commitAnswer();
}
// this.$store.commit('SET_CURRENT_QUESTION', this.currentQuestion);
},
......@@ -98,30 +100,69 @@ export default {
},
// 收藏/取消收藏
favor(currentQuestion) {
let favorFlag = currentQuestion.favorFlag;
favor() {
let favorFlag = this.currentQuestion.favorFlag;
let param = {
dataType: 2,
directoryId: currentQuestion.directoryId,
examTitleId: currentQuestion.titleId,
directoryId: this.currentQuestion.directoryId,
examTitleId: this.currentQuestion.titleId,
operateType: favorFlag == 1 ? 2 : 1, // 操作类型：1：收藏 2：取消收藏
paperId: currentQuestion.paperId,
paperIndex: currentQuestion.paperIndex,
token: this.userInfo.userToken || this.token || 'EFC0A4A5EC4B49FBBBBCD1AD0E46515F',
paperId: this.currentQuestion.paperId,
paperIndex: this.currentQuestion.paperIndex,
token: this.userInfo.userToken || this.token,
setEntry: true
// userId: 0
};
this.currentQuestion.favorFlag = this.currentQuestion.favorFlag == 0 ? 1 : 0;
this.POST("onlineexam/collectExamTitle", param).then(res => {
if (res.code == "000000") {
if(res.data) {
let cIndex = this.questionList.findIndex( item => {
return item.titleNo = currentQuestion.titleNo;
});
this.questionList[cIndex].favorFlag = favorFlag == 0 ? 1 : 0;
this.currentQuestion.favorFlag = favorFlag == 0 ? 1 : 0;
// let cIndex = this.questionList.findIndex( item => {
// return item.titleNo = this.currentQuestion.titleNo;
// });
// this.questionList[cIndex].favorFlag = favorFlag == 0 ? 1 : 0;
// this.currentQuestion.favorFlag = favorFlag == 0 ? 1 : 0;
}
}
});
},
// 提交答案
commitAnswer() {
this.checkTokenForNative( () => {
let params = {
commitKind: this.commonConfig.commitKind, // 答题来源 1：错题集 2：收藏 3：题库
directoryId: this.currentQuestion.directoryId, // 题库ID
myAnswer: this.currentQuestion.myAnswer, // 我的答案，单选时单个答案，如A；多选答案，按照顺序使用
paperId: this.currentQuestion.paperId, // 试卷ID
paperIndex: this.currentQuestion.paperIndex, // 试卷索引（随机试卷的第n套）
resultId: this.titleConfig.resultId, // 刷题库轮次ID，刷收藏和错题集时为0
// rightFlag: 1, // 答题对错：1对 2错
titleId: this.currentQuestion.titleId, // 题目ID
titleNo: this.currentQuestion.titleNo, // 题目ID
setEntry: true,
token: this.userInfo.userToken,
};
// 计算是否答对了题目（只有多选题，才做相应处理）
// if (this.currentQuestion.typeId == 2) {
let isRight = this.currentQuestion.myAnswer == this.currentQuestion.answer;
if (isRight) {
this.currentQuestion.commitFlag = 1;
} else {
this.currentQuestion.commitFlag = 2;
}
this.currentQuestion.isAnalyzed = true;
// }
this.POST(`onlineexam/practise/commit`, params).then(({ data }) => {
console.log('in commitAnswer res', data);
// if(data.resultType == 1) {
// this.currentQuestion.commitFlag = 1;
// } else {
// this.currentQuestion.commitFlag = 0;
// }
}).catch( error => {
this.currentQuestion.commitFlag = 0;
this.currentQuestion.isAnalyzed = false;
})
});
}
}
......
src/components/question/question-header.vue
浏览文件 @ 93c10998
......@@ -2,8 +2,10 @@
<section class="question-header-wrapper">
<img @click="goBack" class="left" src="../../images/left-array-black.png" alt="">
<span class="center">{{title}}</span>
<div class="right">
<div class="right" >
<span v-show="total">
<span class="order">{{order}}</span><span class="total">/{{total}}</span>
</span>
</div>
</section>
</template>
......@@ -16,11 +18,11 @@ export default {
},
order: {
type: Number | String,
default: 1,
default: 0,
},
total: {
type: Number | String,
default: 20,
default: 0,
}
},
methods: {
......
src/store/modules/coop.js
浏览文件 @ 93c10998
const coop = {
state: {
userInfo: {appVersion: '343'},
userInfo: {appVersion: "343", userToken: "EFC0A4A5EC4B49FBBBBCD1AD0E46515F"},
statusBarHeight: {},
projectTabIndex: 1,
jumpURLForI: "", //中华医学会一类跳转地址
......
src/utils/fetch.js
浏览文件 @ 93c10998
......@@ -14,9 +14,9 @@ service.interceptors.request.use(config => {
if (config.data && config.data.setEntry) {
config.headers['sysCode'] = config.data.sysCode || 10
if (config.data.token) {
config.headers['token'] = config.data.token || 'EFC0A4A5EC4B49FBBBBCD1AD0E46515F'
config.headers['token'] = config.data.token;
if (process.env.BUILD_ENV == "development") { // 本地开发环境
config.headers['token'] = config.data.token || 'EFC0A4A5EC4B49FBBBBCD1AD0E46515F';
config.headers['token'] = config.data.token;
}
}
delete config.data.setEntry;
......
src/utils/mixins.js
浏览文件 @ 93c10998
import fetch from '@/utils/fetch'
import { getBaseUrl, getApiUrl } from '@/utils/index'
import store from '../store';
module.exports = {
data: function () {
return {
token: null
token: 'weewfwefw'
}
},
created: function () {
......@@ -110,7 +111,7 @@ module.exports = {
// 通用GET请求
GET(api, para, callback, str) {
// debugger
let token = para.token || this.token || this.$store.state.user.token || 'EFC0A4A5EC4B49FBBBBCD1AD0E46515F';
let token = para.token || this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken;
para.token = token;
delete para.token;
delete para.setEntry;
......@@ -148,7 +149,7 @@ module.exports = {
// 通用POST请求
POST(api, para, callback) {
let token = para.token || this.token || this.$store.state.user.token || 'EFC0A4A5EC4B49FBBBBCD1AD0E46515F';
let token = para.token || this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken;
para.token = token;
delete para.token;
delete para.setEntry;
......@@ -162,7 +163,7 @@ module.exports = {
// 通用POST请求
NEW_POST(api, para, callback) {
// para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C'
// para.token = para.token || this.token || this.$store.state.coop.userInfo.userToken;
return fetch({
url: getBaseUrl(api),
method: 'post',
......@@ -172,7 +173,7 @@ module.exports = {
// 通用GET请求
API_GET(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
para.token = para.token || this.token || this.$store.state.coop.userInfo.userToken; //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
let url = api + this.getUrlPara(para)
return fetch({
url: getApiUrl(url),
......@@ -183,7 +184,7 @@ module.exports = {
// 通用POST请求
API_POST(api, para, callback) {
para.token = para.token || this.token || '00175A13D70D4234822D90AC3C74202C' //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
para.token = para.token || this.token || this.$store.state.coop.userInfo.userToken; //'AF3DFCF2DD4B4115AC47ACA25D5420E9''F90DF48D3EFA49DFAE1267A67DBEFB18'//token
return fetch({
url: getApiUrl(api),
method: 'post',
......@@ -222,7 +223,8 @@ module.exports = {
// 校验token，有效则调用回调函数，否则调起原生登陆页面
commonCheckToken(cb) {
let param = {
token: this.token,
// token: this.token,
token: this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken,
setEntry: true
};
this.GET("campaign/admin/task/checkToken", param).then(res => {
......@@ -237,7 +239,7 @@ module.exports = {
// 校验token，有效则调用回调函数，否则使用调起原生登陆页面
checkTokenForNative(cb) {
let param = {
token: this.token,
token: this.token || this.$store.state.coop.userInfo.userToken,
setEntry: true
};
this.GET("campaign/admin/task/checkToken", param).then(res => {
......
src/views/question-detail.vue
浏览文件 @ 93c10998
......@@ -69,6 +69,7 @@ export default {
data() {
return {
token: "EFC0A4A5EC4B49FBBBBCD1AD0E46515F",
// token: "",
directoryId: "",
cardType: 3,
goodsType: 3,
......@@ -161,9 +162,8 @@ export default {
methods: {
...mapActions(["setUserInfo", "handlerQuestionList"]),
init() {
// if (this.commitKind >= 2 && this.commitKind <= 4) {
// this.token = "EFC0A4A5EC4B49FBBBBCD1AD0E46515F";
this.currentTitle = titleArray[this.commitKind] || "习题集";
// }
this.$store.commit("SET_COMMON_CONIFG", {
// 0: 免费; 1: 收费; 没有绑卡且是收费题库（bindStatus == 0 && freeFlag == 1）可以走免费体验流程
freeFlag: this.freeFlag,
......@@ -311,7 +311,7 @@ export default {
if(isFirst) {
this.$store.commit("SET_QUESTION_LIST", []);
}
this.queryParams.token = "EFC0A4A5EC4B49FBBBBCD1AD0E46515F";
this.queryParams.token = this.userInfo.userToken || this.token;
this.queryParams.setEntry = true;
this.GET(`portal/titleTest/practise/titles`, this.queryParams).then(
({ data }) => {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或