- 考试排序:
+ 试题排列:
{
console.log("查询评估xinxi ", res);
+
let info = res.data.data;
+ let n1 = info.essayQuestionVoList
+ ? Number(info.essayQuestionVoList.length)
+ : 0 ;
+ let n2 = info.multipleStemVoList
+ ? Number(info.multipleStemVoList.length)
+ : 0;
+
+ let n3 = info.scoringQuestionVoList
+ ? Number(info.scoringQuestionVoList.length)
+ : 0;
+ let n4 = info.singleStemVoList
+ ? Number(info.singleStemVoList.length)
+ : 0;
+
+ let num = n1 + n2 + n3 +n4;
let obj = {
assessmentId: info.assessmentId,
name: info.assessmentName,
- num: info.essayQuestionVoList
- ? Number(info.essayQuestionVoList.length)
- : 0 + info.multipleStemVoList
- ? Number(info.multipleStemVoList.length)
- : 0 + info.scoringQuestionVoList
- ? Number(info.scoringQuestionVoList.length)
- : 0 + info.singleStemVoList
- ? Number(info.singleStemVoList.length)
- : 0,
+ num: num,
creator: info.createUser ? info.createUser : "-",
time: dayjs(info.createTime).format("YYYY-MM-DD"),
};
diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index cb68071f..8ae37354 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -182,18 +182,25 @@ export default {
let data = tableData;
let array = [];
data.map((value, index) => {
+ let n1 = value.essayQuestionVoList
+ ? Number(value.essayQuestionVoList.length)
+ : 0 ;
+ let n2 = value.multipleStemVoList
+ ? Number(value.multipleStemVoList.length)
+ : 0;
+
+ let n3 = value.scoringQuestionVoList
+ ? Number(value.scoringQuestionVoList.length)
+ : 0;
+ let n4 = value.singleStemVoList
+ ? Number(value.singleStemVoList.length)
+ : 0;
+
+ let num = n1 + n2 + n3 +n4;
let obj = {
key: index,
assessmentId: value.assessmentId,
- num:value.essayQuestionVoList
- ? Number(value.essayQuestionVoList.length)
- : 0 + value.multipleStemVoList
- ? Number(value.multipleStemVoList.length)
- : 0 + value.scoringQuestionVoList
- ? Number(value.scoringQuestionVoList.length)
- : 0 + value.singleStemVoList
- ? Number(value.singleStemVoList.length)
- : 0,
+ num: num,
name: value.assessmentName ? value.assessmentName : "-",
creator: value.createUser ? value.createUser : "-",
time: dayjs(value.createTime).format("YYYY-MM-DD"),
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index cc7f3971..3475b8ba 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -330,8 +330,8 @@ export default {
gangw: value.userInfoBo.jobName, //岗位
completeStageCnt: value.completeStageCnt, //当前完成阶段数
totalStageCnt: value.totalStageCnt, //总阶段数
- //progress: value.completeStageCnt + "/" + value.totalStageCnt, TODO接口返回value.completeStageCnt值不对
- progress: 0 + "/" + value.totalStageCnt,
+ progress: value.completeStageCnt + "/" + value.totalStageCnt,
+
stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
};
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 37dd191e..550ee7db 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -105,7 +105,7 @@
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 5092963e..b2f66dc3 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -380,6 +380,7 @@