|
|
@@ -31,13 +31,7 @@
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
- style="
|
|
|
- margin: 0;
|
|
|
- background: #aee3d2;
|
|
|
- color: #32a77a;
|
|
|
- width: 50px;
|
|
|
- min-width: 50px;
|
|
|
- "
|
|
|
+ style="margin: 0; background: #aee3d2; color: #32a77a"
|
|
|
>
|
|
|
任务{{ navIndex + 1 }}
|
|
|
</div>
|
|
|
@@ -262,7 +256,7 @@
|
|
|
v-for="(text, textIndex) in textList[taskCount]"
|
|
|
:key="textIndex + '2'"
|
|
|
>
|
|
|
- <div class="vedioNav" style="width: 70px">文档</div>
|
|
|
+ <div class="vedioNav">文档</div>
|
|
|
<div>
|
|
|
<div
|
|
|
class="navText"
|
|
|
@@ -436,7 +430,7 @@
|
|
|
v-for="(text, textIndex) in textList[taskCount]"
|
|
|
:key="textIndex + '2'"
|
|
|
>
|
|
|
- <div class="vedioNav" style="width: 70px">文档</div>
|
|
|
+ <div class="vedioNav">文档</div>
|
|
|
<div>
|
|
|
<div
|
|
|
class="noNavText"
|
|
|
@@ -887,9 +881,9 @@
|
|
|
:content="JSON.parse(w.works)[0].answer"
|
|
|
placement="top"
|
|
|
>
|
|
|
- <div class="answerContent">
|
|
|
- {{ JSON.parse(w.works)[0].answer }}
|
|
|
- </div>
|
|
|
+ <div class="answerContent">
|
|
|
+ {{ JSON.parse(w.works)[0].answer }}
|
|
|
+ </div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1671,6 +1665,7 @@ export default {
|
|
|
worksStudent: [],
|
|
|
noWorksS: [],
|
|
|
isWorksS: [],
|
|
|
+ noWorksStudent: [],
|
|
|
toolindex: 0,
|
|
|
workTypeA: false,
|
|
|
workTypeB: false,
|
|
|
@@ -1797,21 +1792,19 @@ export default {
|
|
|
.get(this.$store.state.api + "selectWorksStudent", params)
|
|
|
.then((res) => {
|
|
|
var a = res.data[0];
|
|
|
-
|
|
|
+ var studentK = [];
|
|
|
for (var i = 0; i < this.isWorksS.length; i++) {
|
|
|
this.noWorksS[i] = [];
|
|
|
if (this.isWorksS[i].length > 0) {
|
|
|
- var a2 = JSON.parse(JSON.stringify(a));
|
|
|
+ for (var z = 0; z < this.isWorksS[i].length; z++) {
|
|
|
+ studentK.push(this.isWorksS[i][z].uid);
|
|
|
+ }
|
|
|
+ console.log(studentK);
|
|
|
for (var j = 0; j < a.length; j++) {
|
|
|
- for (var z = 0; z < this.isWorksS[i].length; z++) {
|
|
|
- if (this.isWorksS[i][z].sName == a[j].name) {
|
|
|
- a2.splice(j, 1);
|
|
|
- }
|
|
|
+ if (studentK.indexOf(a[j]) != -1) {
|
|
|
+ this.noWorksS[i].push({ student: a[z].name });
|
|
|
}
|
|
|
}
|
|
|
- for (var f = 0; f < a2.length; f++) {
|
|
|
- this.noWorksS[i].push({ student: a2[f].name });
|
|
|
- }
|
|
|
} else {
|
|
|
for (var k = 0; k < a.length; k++) {
|
|
|
this.noWorksS[i].push({ student: a[k].name });
|
|
|
@@ -1847,7 +1840,7 @@ export default {
|
|
|
works: b[j].content,
|
|
|
sName: b[j].name,
|
|
|
});
|
|
|
- this.isWorksS[i].push({ sName: b[j].name });
|
|
|
+ this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3128,7 +3121,7 @@ export default {
|
|
|
word-break: break-all;
|
|
|
width: 70%;
|
|
|
text-align: left;
|
|
|
- margin-right:10px;
|
|
|
+ margin-right: 10px;
|
|
|
max-width: calc(100% - 85px);
|
|
|
}
|
|
|
.blue_box_one > div:nth-child(2):hover {
|
|
|
@@ -3324,7 +3317,7 @@ export default {
|
|
|
border-bottom: 1px solid #d7d7d7;
|
|
|
padding-bottom: 5px;
|
|
|
background: #d2e3ff;
|
|
|
- width: 60px;
|
|
|
+ width: 70px;
|
|
|
border-radius: 5px;
|
|
|
color: #4d97d6;
|
|
|
text-align: center;
|
|
|
@@ -3794,7 +3787,7 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
}
|
|
|
.works {
|
|
|
- padding: 15px 10px 15px 0;
|
|
|
+ padding: 15px 10px 0 0;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
flex-wrap: nowrap;
|
|
|
@@ -3881,10 +3874,8 @@ export default {
|
|
|
padding: 25px 0 10px;
|
|
|
}
|
|
|
.answerContent {
|
|
|
- font-size: 18px;
|
|
|
width: 215px;
|
|
|
height: 60px;
|
|
|
- /* overflow-y: auto; */
|
|
|
word-break: break-all;
|
|
|
text-align: center;
|
|
|
white-space: nowrap;
|
zengyicheng