|
@@ -419,7 +419,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div style="min-height: 163px">
|
|
|
|
|
|
|
+ <div>
|
|
|
<div class="toolSort" v-if="toolType == 0">
|
|
<div class="toolSort" v-if="toolType == 0">
|
|
|
<div class="tool">
|
|
<div class="tool">
|
|
|
<div class="whiteBIcon">
|
|
<div class="whiteBIcon">
|
|
@@ -644,6 +644,64 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+
|
|
|
|
|
+ <div class="tool_works_box" v-if="worksTeacher.length">
|
|
|
|
|
+ <div class="zuoyeYulan">
|
|
|
|
|
+ <div class="worksTop">
|
|
|
|
|
+ <div>作业预览</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="worksDetailBox">
|
|
|
|
|
+ <div class="works" style="
|
|
|
|
|
+ width: 200px;
|
|
|
|
|
+ height: 140px;
|
|
|
|
|
+ margin: 10px 10px 10px 0;
|
|
|
|
|
+ border-radius: 15px;
|
|
|
|
|
+ box-shadow: 0 0 6px 1px #dfdada;
|
|
|
|
|
+ " v-for="(w, wIndex) in worksTeacher" :key="wIndex"
|
|
|
|
|
+ :class="w.type == 1 ? 'isTypeOne' : ''">
|
|
|
|
|
+ <div class="workImg" v-if="w.type == 0">
|
|
|
|
|
+ <img :src="w.works" @click="previewImg(w.works)" alt />
|
|
|
|
|
+ <div class="answerScore" v-if="w.score" @click.stop="openScore(w)" :class="{
|
|
|
|
|
+ rightW:
|
|
|
|
|
+ w.userid == userid || tType == 1 || tType == 4,
|
|
|
|
|
+ }">
|
|
|
|
|
+ {{ JSON.parse(w.score).wScore }}分
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="answerScore" @click.stop="openScore(w)" v-else-if="courseDetail.userid == userid"
|
|
|
|
|
+ :class="{
|
|
|
|
|
+ rightW:
|
|
|
|
|
+ w.userid == userid || tType == 1 || tType == 4,
|
|
|
|
|
+ }">
|
|
|
|
|
+ 评分
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <img class="deleteImg" src="../../assets/deleteworks.png" v-if="w.userid == userid || tType == 1 || tType == 4
|
|
|
|
|
+ " @click.stop="deleteWorks(w.wid)" alt />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="comment" style="min-width: 200px">
|
|
|
|
|
+ <div class="worksName">
|
|
|
|
|
+ <div>{{ w.sName }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="commentList">
|
|
|
|
|
+ <div class="commentList">
|
|
|
|
|
+ <div class="commentImg" @click="isLikes(w.wid, userid, 1, null, w.isLikes)
|
|
|
|
|
+ ">
|
|
|
|
|
+ <img :src="w.isLikes == true ? likes : noLikes" alt="" />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div>{{ w.likesCount }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="commentList" style="margin-right: 15px">
|
|
|
|
|
+ <div class="commentImg" @click="commentOther(w, 0, wIndex)">
|
|
|
|
|
+ <img src="../../assets/icon/comment/comment.png" alt="" />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div>{{ w.commentCount }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="vedioBox">
|
|
<div class="vedioBox">
|
|
@@ -661,6 +719,63 @@
|
|
|
{{ s.student }}
|
|
{{ s.student }}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div class="tool_works_box" v-if="worksStudent2.length">
|
|
|
|
|
+ <div class="zuoyeYulan">
|
|
|
|
|
+ <div class="worksTop">
|
|
|
|
|
+ <div>作业预览</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="worksDetailBox">
|
|
|
|
|
+ <div class="works" style="
|
|
|
|
|
+ width: 200px;
|
|
|
|
|
+ height: 140px;
|
|
|
|
|
+ margin: 10px 10px 10px 0;
|
|
|
|
|
+ border-radius: 15px;
|
|
|
|
|
+ box-shadow: 0 0 6px 1px #dfdada;
|
|
|
|
|
+ " v-for="(w, wIndex) in worksStudent2" :key="wIndex"
|
|
|
|
|
+ :class="w.type == 1 ? 'isTypeOne' : ''">
|
|
|
|
|
+ <div class="workImg" v-if="w.type == 0">
|
|
|
|
|
+ <img :src="w.works" @click="previewImg(w.works)" alt />
|
|
|
|
|
+ <div class="answerScore" v-if="w.score" @click.stop="openScore(w)" :class="{
|
|
|
|
|
+ rightW:
|
|
|
|
|
+ w.userid == userid || tType == 1 || tType == 4,
|
|
|
|
|
+ }">
|
|
|
|
|
+ {{ JSON.parse(w.score).wScore }}分
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="answerScore" @click.stop="openScore(w)" v-else-if="courseDetail.userid == userid"
|
|
|
|
|
+ :class="{
|
|
|
|
|
+ rightW:
|
|
|
|
|
+ w.userid == userid || tType == 1 || tType == 4,
|
|
|
|
|
+ }">
|
|
|
|
|
+ 评分
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <img class="deleteImg" src="../../assets/deleteworks.png" v-if="w.userid == userid || tType == 1 || tType == 4
|
|
|
|
|
+ " @click.stop="deleteWorks(w.wid)" alt />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="comment" style="min-width: 200px">
|
|
|
|
|
+ <div class="worksName">
|
|
|
|
|
+ <div>{{ w.sName }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="commentList">
|
|
|
|
|
+ <div class="commentList">
|
|
|
|
|
+ <div class="commentImg" @click="isLikes(w.wid, userid, 1, null, w.isLikes)
|
|
|
|
|
+ ">
|
|
|
|
|
+ <img :src="w.isLikes == true ? likes : noLikes" alt="" />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div>{{ w.likesCount }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div class="commentList" style="margin-right: 15px">
|
|
|
|
|
+ <div class="commentImg" @click="commentOther(w, 0, wIndex)">
|
|
|
|
|
+ <img src="../../assets/icon/comment/comment.png" alt="" />
|
|
|
|
|
+ </div>
|
|
|
|
|
+ <div>{{ w.commentCount }}</div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
|
|
+ </div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -3487,16 +3602,16 @@ export default {
|
|
|
) {
|
|
) {
|
|
|
for (
|
|
for (
|
|
|
var i = 0;
|
|
var i = 0;
|
|
|
- i < this.worksStudent[this.commentIndexJson.toolIndex].length;
|
|
|
|
|
|
|
+ i < this.worksStudent.length;
|
|
|
i++
|
|
i++
|
|
|
) {
|
|
) {
|
|
|
- let _el = this.worksStudent[this.commentIndexJson.toolIndex][i];
|
|
|
|
|
|
|
+ let _el = this.worksStudent[i];
|
|
|
groupA: for (var k = 0; k < _el.length; k++) {
|
|
groupA: for (var k = 0; k < _el.length; k++) {
|
|
|
let el = _el[k];
|
|
let el = _el[k];
|
|
|
if (el.wid == this.commentDetail.wid) {
|
|
if (el.wid == this.commentDetail.wid) {
|
|
|
a = 2;
|
|
a = 2;
|
|
|
this.commentOther(
|
|
this.commentOther(
|
|
|
- this.worksStudent[this.commentIndexJson.toolIndex][i][k],
|
|
|
|
|
|
|
+ this.worksStudent[i][k],
|
|
|
this.commentIndexJson.toolIndex,
|
|
this.commentIndexJson.toolIndex,
|
|
|
k,
|
|
k,
|
|
|
this.commentIndexJson.gindex
|
|
this.commentIndexJson.gindex
|
|
@@ -3542,14 +3657,14 @@ export default {
|
|
|
if (a == 1) {
|
|
if (a == 1) {
|
|
|
for (
|
|
for (
|
|
|
var i = 0;
|
|
var i = 0;
|
|
|
- i < this.worksStudent[this.commentIndexJson.toolIndex].length;
|
|
|
|
|
|
|
+ i < this.worksStudent.length;
|
|
|
i++
|
|
i++
|
|
|
) {
|
|
) {
|
|
|
- let el = this.worksStudent[this.commentIndexJson.toolIndex][i];
|
|
|
|
|
|
|
+ let el = this.worksStudent[i];
|
|
|
if (el.wid == this.commentDetail.wid) {
|
|
if (el.wid == this.commentDetail.wid) {
|
|
|
a = 2;
|
|
a = 2;
|
|
|
this.commentOther(
|
|
this.commentOther(
|
|
|
- this.worksStudent[this.commentIndexJson.toolIndex][i],
|
|
|
|
|
|
|
+ this.worksStudent[i],
|
|
|
this.commentIndexJson.toolIndex,
|
|
this.commentIndexJson.toolIndex,
|
|
|
i
|
|
i
|
|
|
);
|
|
);
|
|
@@ -3927,9 +4042,9 @@ export default {
|
|
|
var e = res.data[2];
|
|
var e = res.data[2];
|
|
|
var f = res.data[3];
|
|
var f = res.data[3];
|
|
|
|
|
|
|
|
- this.worksStudent = [];
|
|
|
|
|
- this.worksTeacher = [];
|
|
|
|
|
- this.worksStudent2 = [];
|
|
|
|
|
|
|
+ let worksStudent = [];
|
|
|
|
|
+ let worksTeacher = [];
|
|
|
|
|
+ let worksStudent2 = [];
|
|
|
if (
|
|
if (
|
|
|
!this.isCloseList ||
|
|
!this.isCloseList ||
|
|
|
this.isCloseList.isClose == undefined
|
|
this.isCloseList.isClose == undefined
|
|
@@ -3974,9 +4089,34 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if (b[j].type == 1 && b[j].atool == 1) {
|
|
|
|
|
+ let _works = {
|
|
|
|
|
+ userid: b[j].userid,
|
|
|
|
|
+ ateacher: b[j].ateacher,
|
|
|
|
|
+ wid: b[j].id,
|
|
|
|
|
+ works: b[j].content,
|
|
|
|
|
+ sName: b[j].name,
|
|
|
|
|
+ type: 0,
|
|
|
|
|
+ time: b[j].time,
|
|
|
|
|
+ score: b[j].score,
|
|
|
|
|
+ img: b[j].img,
|
|
|
|
|
+ likesCount: likesCount,
|
|
|
|
|
+ commentCount: commentCount,
|
|
|
|
|
+ isLikes: isLikes,
|
|
|
|
|
+ commentJson: commentJson,
|
|
|
|
|
+ }
|
|
|
|
|
+ if (b[j].ttype == 1) {
|
|
|
|
|
+ worksTeacher.push(_works);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ worksStudent2.push(_works);
|
|
|
|
|
+ }
|
|
|
|
|
+ worksStudent.push(_works);
|
|
|
|
|
+ this.isWorksS.push({ uid: b[j].userid, sName: b[j].name });
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- if (this.worksStudent && this.worksStudent.length) {
|
|
|
|
|
- this.worksStudent = this.worksStudent.sort(function (a, b) {
|
|
|
|
|
|
|
+ if (worksStudent && worksStudent.length) {
|
|
|
|
|
+ worksStudent = worksStudent.sort(function (a, b) {
|
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
|
var scoreA = parseFloat(jscoreA);
|
|
var scoreA = parseFloat(jscoreA);
|
|
@@ -3987,8 +4127,8 @@ export default {
|
|
|
return scoreB - scoreA;
|
|
return scoreB - scoreA;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- if (this.worksStudent2 && this.worksStudent2.length) {
|
|
|
|
|
- this.worksStudent2 = this.worksStudent2.sort(function (a, b) {
|
|
|
|
|
|
|
+ if (worksStudent2 && worksStudent2.length) {
|
|
|
|
|
+ worksStudent2 = worksStudent2.sort(function (a, b) {
|
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
|
var scoreA = parseFloat(jscoreA);
|
|
var scoreA = parseFloat(jscoreA);
|
|
@@ -3999,8 +4139,8 @@ export default {
|
|
|
return scoreB - scoreA;
|
|
return scoreB - scoreA;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- if (this.worksTeacher && this.worksTeacher.length) {
|
|
|
|
|
- this.worksTeacher = this.worksTeacher.sort(function (a, b) {
|
|
|
|
|
|
|
+ if (worksTeacher && worksTeacher.length) {
|
|
|
|
|
+ worksTeacher = worksTeacher.sort(function (a, b) {
|
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
let jscoreA = a.score ? JSON.parse(a.score).wScore : 0;
|
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
let jscoreB = b.score ? JSON.parse(b.score).wScore : 0;
|
|
|
var scoreA = parseFloat(jscoreA);
|
|
var scoreA = parseFloat(jscoreA);
|
|
@@ -4011,7 +4151,10 @@ export default {
|
|
|
return scoreB - scoreA;
|
|
return scoreB - scoreA;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ this.worksStudent = worksStudent
|
|
|
|
|
+ this.worksTeacher = worksTeacher
|
|
|
|
|
+ this.worksStudent2 = worksStudent2
|
|
|
|
|
+ this.$forceUpdate()
|
|
|
this.selectWorksStudent();
|
|
this.selectWorksStudent();
|
|
|
})
|
|
})
|
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
@@ -6237,7 +6380,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
window.parent.postMessage(
|
|
window.parent.postMessage(
|
|
|
{
|
|
{
|
|
|
- tools: "1",
|
|
|
|
|
|
|
+ tools: "1E",
|
|
|
cid: this.id,
|
|
cid: this.id,
|
|
|
stage: this.courseType,
|
|
stage: this.courseType,
|
|
|
task: this.taskCount,
|
|
task: this.taskCount,
|
|
@@ -6827,7 +6970,7 @@ export default {
|
|
|
} else if (t == 3 || t == 1 || t == 7) {
|
|
} else if (t == 3 || t == 1 || t == 7) {
|
|
|
window.parent.postMessage(
|
|
window.parent.postMessage(
|
|
|
{
|
|
{
|
|
|
- tools: t + 'teacher',
|
|
|
|
|
|
|
+ tools: t + 'teacherE',
|
|
|
cid: this.id,
|
|
cid: this.id,
|
|
|
stage: this.courseType,
|
|
stage: this.courseType,
|
|
|
task: this.taskCount,
|
|
task: this.taskCount,
|
