|
|
@@ -3426,7 +3426,13 @@
|
|
|
<div
|
|
|
class="answerBg"
|
|
|
style="border-radius: 15px 15px 0 0"
|
|
|
- @click="commentOther(w, toolIndex, wIndex)"
|
|
|
+ @click="commentOther(
|
|
|
+ w,
|
|
|
+ toolIndex,
|
|
|
+ wIndex,
|
|
|
+ null,
|
|
|
+ g.id
|
|
|
+ )"
|
|
|
>
|
|
|
<el-tooltip
|
|
|
class="item"
|
|
|
@@ -3792,7 +3798,13 @@
|
|
|
>
|
|
|
<div
|
|
|
class="commentImg"
|
|
|
- @click="commentOther(w, toolIndex, wIndex)"
|
|
|
+ @click="commentOther(
|
|
|
+ w,
|
|
|
+ toolIndex,
|
|
|
+ wIndex,
|
|
|
+ null,
|
|
|
+ g.id
|
|
|
+ )"
|
|
|
>
|
|
|
<img
|
|
|
src="../assets/icon/comment/comment.png"
|
|
|
@@ -4059,7 +4071,13 @@
|
|
|
>
|
|
|
<div
|
|
|
class="commentImg"
|
|
|
- @click="commentOther(w, toolIndex, wIndex)"
|
|
|
+ @click="commentOther(
|
|
|
+ w,
|
|
|
+ toolIndex,
|
|
|
+ wIndex,
|
|
|
+ null,
|
|
|
+ g.id
|
|
|
+ )"
|
|
|
>
|
|
|
<img
|
|
|
src="../assets/icon/comment/comment.png"
|
|
|
@@ -4326,7 +4344,13 @@
|
|
|
>
|
|
|
<div
|
|
|
class="commentImg"
|
|
|
- @click="commentOther(w, toolIndex, wIndex)"
|
|
|
+ @click="commentOther(
|
|
|
+ w,
|
|
|
+ toolIndex,
|
|
|
+ wIndex,
|
|
|
+ null,
|
|
|
+ g.id
|
|
|
+ )"
|
|
|
>
|
|
|
<img
|
|
|
src="../assets/icon/comment/comment.png"
|
|
|
@@ -4592,7 +4616,13 @@
|
|
|
>
|
|
|
<div
|
|
|
class="commentImg"
|
|
|
- @click="commentOther(w, toolIndex, wIndex)"
|
|
|
+ @click="commentOther(
|
|
|
+ w,
|
|
|
+ toolIndex,
|
|
|
+ wIndex,
|
|
|
+ null,
|
|
|
+ g.id
|
|
|
+ )"
|
|
|
>
|
|
|
<img
|
|
|
src="../assets/icon/comment/comment.png"
|
|
|
@@ -10996,8 +11026,9 @@ export default {
|
|
|
var d = res.data[1];
|
|
|
var e = res.data[2];
|
|
|
var f = res.data[3];
|
|
|
+ let _worksStudent = []
|
|
|
for (var i = 0; i < a.length; i++) {
|
|
|
- this.worksStudent[i] = [];
|
|
|
+ _worksStudent[i] = [];
|
|
|
if (
|
|
|
!this.isCloseList[i] ||
|
|
|
this.isCloseList[i].isClose == undefined
|
|
|
@@ -11021,7 +11052,7 @@ export default {
|
|
|
for (var gA = 0; gA < a[i].groupJson.group.length; gA++) {
|
|
|
this.groupStudent[i][gA] = [];
|
|
|
this.groupStudentUid[i][gA] = [];
|
|
|
- this.worksStudent[i][gA] = [];
|
|
|
+ _worksStudent[i][gA] = [];
|
|
|
this.isCloseList[i][gA] = [];
|
|
|
|
|
|
for (var g = 0; g < f.length; g++) {
|
|
|
@@ -11294,10 +11325,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({
|
|
|
uid: b[j].userid,
|
|
|
@@ -11346,17 +11377,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({
|
|
|
uid: b[j].userid,
|
|
|
sName: b[j].name,
|
|
|
});
|
|
|
} else if (b[j].type == 6 && b[j].atool != 50) {
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11376,7 +11407,7 @@ export default {
|
|
|
sName: b[j].name,
|
|
|
});
|
|
|
} else if (b[j].type == 7 && b[j].atool != 50) {
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11430,10 +11461,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({
|
|
|
uid: b[j].userid,
|
|
|
@@ -11474,10 +11505,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({
|
|
|
uid: b[j].userid,
|
|
|
@@ -11518,10 +11549,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({
|
|
|
uid: b[j].userid,
|
|
|
@@ -11562,15 +11593,15 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (isGw == 1) {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[i].push(_works);
|
|
|
+ _worksStudent[i].push(_works);
|
|
|
}
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (b[j].type == 2 && a[i].tool[0] == 4) {
|
|
|
//问卷
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11588,7 +11619,7 @@ export default {
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (b[j].type == 8 && a[i].tool[0] == 45) {
|
|
|
//选择题
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11606,7 +11637,7 @@ export default {
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (b[j].type == 9 && a[i].tool[0] == 47) {
|
|
|
//选择题
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11624,7 +11655,7 @@ export default {
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (b[j].type == 10 && a[i].tool[0] == 48) {
|
|
|
//选择题
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11642,7 +11673,7 @@ export default {
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (b[j].type == 13 && a[i].tool[0] == 52) {
|
|
|
//选择题
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11665,7 +11696,7 @@ export default {
|
|
|
b[j].userid
|
|
|
) != -1
|
|
|
) {
|
|
|
- this.worksStudent[i][_gindex.groupIndex].push({
|
|
|
+ _worksStudent[i][_gindex.groupIndex].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11683,7 +11714,7 @@ export default {
|
|
|
}
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (a[i].tool[0] == 50 && b[j].atool == 50) {
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11700,7 +11731,7 @@ export default {
|
|
|
});
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (a[i].tool[0] == 32 && b[j].atool == 32) {
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11717,7 +11748,7 @@ export default {
|
|
|
});
|
|
|
this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
} else if (a[i].tool[0] == 57 && b[j].atool == 57) {
|
|
|
- this.worksStudent[i].push({
|
|
|
+ _worksStudent[i].push({
|
|
|
userid: b[j].userid,
|
|
|
ateacher: b[j].ateacher,
|
|
|
wid: b[j].id,
|
|
|
@@ -11736,8 +11767,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (this.worksStudent[i] && this.worksStudent[i].length) {
|
|
|
- this.worksStudent[i] = this.worksStudent[i].sort(function (a, b) {
|
|
|
+ if (_worksStudent[i] && _worksStudent[i].length) {
|
|
|
+ _worksStudent[i] = _worksStudent[i].sort(function (a, b) {
|
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
|
var scoreA = parseFloat(jscoreA);
|
|
|
@@ -11780,7 +11811,7 @@ export default {
|
|
|
this.checkJson[i][z].checkPerent = [];
|
|
|
this.checkJson[i][z].right = Math.round(
|
|
|
(this.checkJson[i][z].rightPerson.length /
|
|
|
- parseInt(this.worksStudent[i].length)) *
|
|
|
+ parseInt(_worksStudent[i].length)) *
|
|
|
100
|
|
|
);
|
|
|
let aaaa = this.checkJson[i][z];
|
|
|
@@ -11793,7 +11824,7 @@ export default {
|
|
|
this.checkJson[i][z].checkPerent.push(
|
|
|
Math.round(
|
|
|
(this.checkJson[i][z].checkCount[k] /
|
|
|
- parseInt(this.worksStudent[i].length)) *
|
|
|
+ parseInt(_worksStudent[i].length)) *
|
|
|
100
|
|
|
)
|
|
|
);
|
|
|
@@ -11815,6 +11846,7 @@ export default {
|
|
|
if (this.dialogVisibleGroup && (gindex || gindex === 0)) {
|
|
|
this.joinGroup(gindex);
|
|
|
}
|
|
|
+ this.worksStudent = _worksStudent
|
|
|
this.selectWorksStudent();
|
|
|
})
|
|
|
.catch((err) => {
|
