|
|
@@ -1708,43 +1708,49 @@
|
|
|
:key="wIndex"
|
|
|
>
|
|
|
<div class="workImg">
|
|
|
- <img
|
|
|
- src="../assets/icon/works/noImg.png"
|
|
|
- @click="openPj(w.works)"
|
|
|
- alt
|
|
|
- />
|
|
|
- </div>
|
|
|
- <div class="comment" style="min-width: 200px">
|
|
|
- <div class="worksName">
|
|
|
- <div>{{ w.sName }}</div>
|
|
|
+ <img
|
|
|
+ src="../assets/icon/works/noImg.png"
|
|
|
+ @click="openPj(w.works)"
|
|
|
+ alt
|
|
|
+ />
|
|
|
</div>
|
|
|
- <div class="commentList">
|
|
|
+ <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="commentImg"
|
|
|
- @click="
|
|
|
- isLikes(w.wid, userid, 1, null, w.isLikes)
|
|
|
- "
|
|
|
+ class="commentList"
|
|
|
+ style="margin-right: 15px"
|
|
|
>
|
|
|
- <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)">
|
|
|
- <img
|
|
|
- src="../assets/icon/comment/comment.png"
|
|
|
- alt=""
|
|
|
- />
|
|
|
+ <div
|
|
|
+ class="commentImg"
|
|
|
+ @click="commentOther(w)"
|
|
|
+ >
|
|
|
+ <img
|
|
|
+ src="../assets/icon/comment/comment.png"
|
|
|
+ alt=""
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+ <div>{{ w.commentCount }}</div>
|
|
|
</div>
|
|
|
- <div>{{ w.commentCount }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
</div>
|
|
|
<div style="padding-top: 15px; font-size: 18px">
|
|
|
未提交
|
|
|
@@ -2396,9 +2402,9 @@
|
|
|
title="查看视频"
|
|
|
:visible.sync="videoVisible"
|
|
|
:append-to-body="true"
|
|
|
- width="1000px"
|
|
|
+ width="1200px"
|
|
|
:before-close="handleClose"
|
|
|
- class="dialog_diy"
|
|
|
+ class="dialog_diy1"
|
|
|
>
|
|
|
<div class="workd_media" style="height: 100%" v-if="videoDetail.sources">
|
|
|
<video-player
|
|
|
@@ -2406,7 +2412,7 @@
|
|
|
:playsinline="true"
|
|
|
:options="videoDetail"
|
|
|
@play="onPlayerPlay($event)"
|
|
|
- style="width: 90%; height: 100%; margin: 0 0 0 30px"
|
|
|
+ style="width: 100%; height: 100%;"
|
|
|
></video-player>
|
|
|
</div>
|
|
|
<div slot="footer">
|
|
|
@@ -2490,7 +2496,7 @@
|
|
|
<div class="pfBox" v-for="(e, eIndex) in rateJson" :key="eIndex">
|
|
|
<div class="nameAndrate">
|
|
|
<div>{{ e.value }}</div>
|
|
|
- <el-rate v-model="eScore.eStar[eIndex]"></el-rate>
|
|
|
+ <el-rate v-model="eScore.eStar[eIndex]" disabled></el-rate>
|
|
|
</div>
|
|
|
<div>{{ e.detail }}</div>
|
|
|
</div>
|
|
|
@@ -2655,7 +2661,8 @@
|
|
|
<div class="pfBox" v-for="(e, eIndex) in rateJson" :key="eIndex">
|
|
|
<div class="nameAndrate">
|
|
|
<div>{{ e.value }}</div>
|
|
|
- <el-rate v-model="eScore.eStar[eIndex]" disabled></el-rate>
|
|
|
+ <el-rate v-model="eScore.eStar[eIndex]" v-if="isStar = true" disabled></el-rate>
|
|
|
+ <el-rate v-model="eScore.eStar[eIndex]" v-else></el-rate>
|
|
|
</div>
|
|
|
<div>{{ e.detail }}</div>
|
|
|
</div>
|
|
|
@@ -2701,6 +2708,7 @@ export default {
|
|
|
return {
|
|
|
dialogVisible: false,
|
|
|
commentDialogVisible: false,
|
|
|
+ isStar: false,
|
|
|
videoVisible: false,
|
|
|
studentEvalDialogVisible: false,
|
|
|
videoDetail: {},
|
|
|
@@ -2866,7 +2874,7 @@ export default {
|
|
|
noteName: "",
|
|
|
evaJuri: [],
|
|
|
evalua: "",
|
|
|
- bzText:"",
|
|
|
+ bzText: "",
|
|
|
eTitle: "",
|
|
|
eName: "",
|
|
|
eJson: {},
|
|
|
@@ -3318,7 +3326,7 @@ export default {
|
|
|
|
|
|
if (b[j].stage == q && b[j].task == w) {
|
|
|
// 1、电子白板，3、思维导图，6协同文档，7思维网格 16、作业提交
|
|
|
- let _toolsAarry1 = [1, 3, 6, 7, 16,40];
|
|
|
+ let _toolsAarry1 = [1, 3, 6, 7, 16, 40];
|
|
|
let _toolsAarry2 = [4];
|
|
|
let _toolsAarry3 = [15];
|
|
|
for (var k = 0; k < p.length; k++) {
|
|
|
@@ -3361,6 +3369,7 @@ export default {
|
|
|
) != -1
|
|
|
) {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -3381,6 +3390,7 @@ export default {
|
|
|
) != -1
|
|
|
) {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -3393,6 +3403,7 @@ export default {
|
|
|
});
|
|
|
} else if (b[j].type == 6) {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -3405,6 +3416,7 @@ export default {
|
|
|
});
|
|
|
} else {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -3422,6 +3434,7 @@ export default {
|
|
|
_toolsAarry2.indexOf(e[i].tool[0]) != -1
|
|
|
) {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -3439,6 +3452,7 @@ export default {
|
|
|
_toolsAarry3.indexOf(e[i].tool[0]) != -1
|
|
|
) {
|
|
|
this.worksStudent[q][w][i].push({
|
|
|
+ userid:b[j].userid,
|
|
|
wid: b[j].id,
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
@@ -4722,14 +4736,26 @@ export default {
|
|
|
a = this.evalCount;
|
|
|
this.toolsCount(a, t);
|
|
|
}
|
|
|
- this.rateJson =
|
|
|
- this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
- index
|
|
|
- ].toolChoose[i].rateJson;
|
|
|
+ for (var k = 0; k < this.worksStudent[this.courseType][index][i].length; k++) {
|
|
|
+ if (this.userid == this.worksStudent[this.courseType][index][i][k].userid) {
|
|
|
+ this.eScore = JSON.parse(this.worksStudent[this.courseType][index][i][k].works);
|
|
|
+ this.rateJson =
|
|
|
+ this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
+ index
|
|
|
+ ].toolChoose[i].rateJson;
|
|
|
+ } else {
|
|
|
+ this.rateJson =
|
|
|
+ this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
+ index
|
|
|
+ ].toolChoose[i].rateJson;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.isStar = false;
|
|
|
this.studentEvalDialogVisible = true;
|
|
|
}
|
|
|
},
|
|
|
openPj(w) {
|
|
|
+ this.isStar = true;
|
|
|
this.eScore = JSON.parse(w);
|
|
|
this.rateJson =
|
|
|
this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
|
|
|
@@ -5692,24 +5718,33 @@ export default {
|
|
|
.binfo_input:focus-visible {
|
|
|
border: 1px solid rgba(61, 103, 188);
|
|
|
}
|
|
|
-.dialog_diy >>> .el-dialog__header {
|
|
|
+.dialog_diy >>> .el-dialog__header,
|
|
|
+.dialog_diy1 >>> .el-dialog__header {
|
|
|
background: #002e81 !important;
|
|
|
padding: 15px 20px;
|
|
|
}
|
|
|
-.dialog_diy >>> .el-dialog__title {
|
|
|
+.dialog_diy >>> .el-dialog__title,
|
|
|
+.dialog_diy1 >>> .el-dialog__title {
|
|
|
color: #fff;
|
|
|
}
|
|
|
-.dialog_diy >>> .el-dialog__headerbtn {
|
|
|
+.dialog_diy >>> .el-dialog__headerbtn,
|
|
|
+.dialog_diy1 >>> .el-dialog__headerbtn{
|
|
|
top: 19px;
|
|
|
}
|
|
|
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close {
|
|
|
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close,
|
|
|
+.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close {
|
|
|
color: #fff;
|
|
|
}
|
|
|
-.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover {
|
|
|
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover,
|
|
|
+.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close:hover {
|
|
|
color: #fff;
|
|
|
}
|
|
|
+.dialog_diy1 >>> .el-dialog__body{
|
|
|
+ padding:0;
|
|
|
+}
|
|
|
.dialog_diy >>> .el-dialog__body,
|
|
|
-.dialog_diy >>> .el-dialog__footer {
|
|
|
+.dialog_diy >>> .el-dialog__footer,
|
|
|
+.dialog_diy1 >>> .el-dialog__footer {
|
|
|
background: #fafafa;
|
|
|
}
|
|
|
.a_addBox {
|
zengyicheng