|
@@ -1040,7 +1040,7 @@
|
|
|
<div
|
|
|
class="tool_right_box"
|
|
|
v-for="(tItem, tIndex) in worksDetail[sIndex]
|
|
|
- .chooseInfo[0].chooseInfo.testJson"
|
|
|
+ .chooseInfo[0].chooseInfo.testJson"
|
|
|
:key="tIndex"
|
|
|
>
|
|
|
<div>
|
|
@@ -1061,9 +1061,7 @@
|
|
|
><span>{{ checkJson[sIndex].allRight + "%" }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="
|
|
|
- worksDetail[sIndex].eList.length
|
|
|
- ">
|
|
|
+ <div v-if="worksDetail[sIndex].eList.length">
|
|
|
<div class="ech" style="margin-left: 23px">
|
|
|
<img src="../../../../../assets/icon/pj/score.png" alt="" />
|
|
|
</div>
|
|
@@ -1536,7 +1534,7 @@ export default {
|
|
|
var wordInfo = res.data[12]; //文档作业
|
|
|
var workEvaList = res.data[13];
|
|
|
var workJson = {};
|
|
|
- let checkJson = {}
|
|
|
+ let checkJson = {};
|
|
|
|
|
|
for (var k = 0; k < res.data[0].length; k++) {
|
|
|
this.allWorks = res.data[0][k];
|
|
@@ -1597,7 +1595,7 @@ export default {
|
|
|
};
|
|
|
checkJson[stagetask] = {
|
|
|
stagetask: stagetask,
|
|
|
- }
|
|
|
+ };
|
|
|
}
|
|
|
workJson[stagetask].time = res.data[0][k].time;
|
|
|
// for (var i = 0; i < askInfo.length; i++) {
|
|
@@ -1750,14 +1748,18 @@ export default {
|
|
|
isCount += 0;
|
|
|
}
|
|
|
for (var q = 0; q < t.radio[p].length; q++) {
|
|
|
- checkJson[stagetask][p].checkPerson[parseInt(t.radio[p][q])]
|
|
|
+ checkJson[stagetask][p].checkPerson[
|
|
|
+ parseInt(t.radio[p][q])
|
|
|
+ ]
|
|
|
? checkJson[stagetask][p].checkPerson[
|
|
|
parseInt(t.radio[p][q])
|
|
|
].push(res.data[0][k].sName)
|
|
|
: (checkJson[stagetask][p].checkPerson[
|
|
|
parseInt(t.radio[p][q])
|
|
|
] = [res.data[0][k].sName]);
|
|
|
- checkJson[stagetask][p].checkCount[parseInt(t.radio[p][q])]
|
|
|
+ checkJson[stagetask][p].checkCount[
|
|
|
+ parseInt(t.radio[p][q])
|
|
|
+ ]
|
|
|
? checkJson[stagetask][p].checkCount[
|
|
|
parseInt(t.radio[p][q])
|
|
|
]++
|
|
@@ -2011,10 +2013,10 @@ export default {
|
|
|
// );
|
|
|
// });
|
|
|
let result = [];
|
|
|
- let checkJsonArray = []
|
|
|
+ let checkJsonArray = [];
|
|
|
for (var wi = 0; wi < Object.keys(workJson).length; wi++) {
|
|
|
result.push(workJson[Object.keys(workJson)[wi]]);
|
|
|
- checkJsonArray.push(checkJson[Object.keys(checkJson)[wi]])
|
|
|
+ checkJsonArray.push(checkJson[Object.keys(checkJson)[wi]]);
|
|
|
}
|
|
|
var resultNewArray = result.sort(function (x, y) {
|
|
|
// 以stagetask字段为排序依据
|
|
@@ -2044,8 +2046,50 @@ export default {
|
|
|
});
|
|
|
result = resultNewArray;
|
|
|
checkJsonArray = checkJsonNewArray;
|
|
|
- this.checkJson = checkJsonArray
|
|
|
+ this.checkJson = checkJsonArray;
|
|
|
for (var l = 0; l < b.length; l++) {
|
|
|
+ var eListOld =
|
|
|
+ chapters[0][b[l].stage].chapterInfo[0].taskJson[b[l].task].eList;
|
|
|
+ if (eListOld && eListOld.length) {
|
|
|
+ var eListNew = Object.keys(eListOld).map(function (key) {
|
|
|
+ return {
|
|
|
+ detail: eListOld[key].detail,
|
|
|
+ score: eListOld[key].score,
|
|
|
+ value: eListOld[key].value,
|
|
|
+ };
|
|
|
+ });
|
|
|
+ eList = eListNew;
|
|
|
+ if (eList && eList.length) {
|
|
|
+ _ooption = [];
|
|
|
+ result[l].eList = eList;
|
|
|
+ for (var i = 0; i < eList.length; i++) {
|
|
|
+ _ooption.push({ value: 0, name: eList[i].value });
|
|
|
+ result[l].rateList[eList[i].value] = 0;
|
|
|
+ }
|
|
|
+ result[l].rateList.content = "";
|
|
|
+ this.ooption[l] = _ooption;
|
|
|
+ }
|
|
|
+ if (b[l].rate && eList && eList.length) {
|
|
|
+ _rate[l] = JSON.parse(b[l].rate);
|
|
|
+ _rateList[l] = Object.keys(JSON.parse(b[l].rate));
|
|
|
+ for (var i = 0; i < _rateList[l].length; i++) {
|
|
|
+ var _c = Object.keys(result[l].rateList);
|
|
|
+ if (_c.indexOf(_rateList[l][i]) != -1) {
|
|
|
+ result[l].rateList[_rateList[l][i]] =
|
|
|
+ _rate[l][_rateList[l][i]];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (var i = 0; i < this.ooption[l].length; i++) {
|
|
|
+ if (_rateList[l].indexOf(this.ooption[l][i].name) != -1) {
|
|
|
+ this.ooption[l][i].value =
|
|
|
+ _rate[l][this.ooption[l][i].name];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ _rate[l] = [];
|
|
|
+ _rateList[l] = [];
|
|
|
+ }
|
|
|
+ }
|
|
|
if (workEvaList.length > 0) {
|
|
|
for (var p = 0; p < workEvaList.length; p++) {
|
|
|
if (
|
|
@@ -2104,50 +2148,6 @@ export default {
|
|
|
_rateList[l] = [];
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- var eListOld =
|
|
|
- chapters[0][b[l].stage].chapterInfo[0].taskJson[b[l].task]
|
|
|
- .eList;
|
|
|
- if (eListOld && eListOld.length) {
|
|
|
- var eListNew = Object.keys(eListOld).map(function (key) {
|
|
|
- return {
|
|
|
- detail: eListOld[key].detail,
|
|
|
- score: eListOld[key].score,
|
|
|
- value: eListOld[key].value,
|
|
|
- };
|
|
|
- });
|
|
|
- eList = eListNew;
|
|
|
- if (eList && eList.length) {
|
|
|
- _ooption = [];
|
|
|
- result[l].eList = eList;
|
|
|
- for (var i = 0; i < eList.length; i++) {
|
|
|
- _ooption.push({ value: 0, name: eList[i].value });
|
|
|
- result[l].rateList[eList[i].value] = 0;
|
|
|
- }
|
|
|
- result[l].rateList.content = "";
|
|
|
- this.ooption[l] = _ooption;
|
|
|
- }
|
|
|
- if (b[l].rate && eList && eList.length) {
|
|
|
- _rate[l] = JSON.parse(b[l].rate);
|
|
|
- _rateList[l] = Object.keys(JSON.parse(b[l].rate));
|
|
|
- for (var i = 0; i < _rateList[l].length; i++) {
|
|
|
- var _c = Object.keys(result[l].rateList);
|
|
|
- if (_c.indexOf(_rateList[l][i]) != -1) {
|
|
|
- result[l].rateList[_rateList[l][i]] =
|
|
|
- _rate[l][_rateList[l][i]];
|
|
|
- }
|
|
|
- }
|
|
|
- for (var i = 0; i < this.ooption[l].length; i++) {
|
|
|
- if (_rateList[l].indexOf(this.ooption[l][i].name) != -1) {
|
|
|
- this.ooption[l][i].value =
|
|
|
- _rate[l][this.ooption[l][i].name];
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- _rate[l] = [];
|
|
|
- _rateList[l] = [];
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2770,7 +2770,7 @@ export default {
|
|
|
},
|
|
|
watch: {
|
|
|
uid(newValue, oldValue) {
|
|
|
- this.isLoading = true
|
|
|
+ this.isLoading = true;
|
|
|
this.getCourseDetail();
|
|
|
this.getClass();
|
|
|
this.getGroup();
|
|
@@ -2778,7 +2778,7 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.isLoading = true
|
|
|
+ this.isLoading = true;
|
|
|
this.getCourseDetail();
|
|
|
this.getClass();
|
|
|
this.getGroup();
|