|
|
@@ -797,7 +797,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if=" worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(16) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(16) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -856,7 +862,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(4) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(4) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -937,7 +949,13 @@
|
|
|
></AskStatic>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(15) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(15) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -997,7 +1015,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(1) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(1) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -1049,7 +1073,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(3) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(3) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -1101,7 +1131,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(6) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(6) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -1153,7 +1189,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(7) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(7) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -1205,7 +1247,13 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
|
- v-if="worksStudent[jdIndex] && worksStudent[jdIndex][rwIndex] && tType && tType == 1 && tool.tool.indexOf(26) != -1"
|
|
|
+ v-if="
|
|
|
+ worksStudent[jdIndex] &&
|
|
|
+ worksStudent[jdIndex][rwIndex] &&
|
|
|
+ tType &&
|
|
|
+ tType == 1 &&
|
|
|
+ tool.tool.indexOf(26) != -1
|
|
|
+ "
|
|
|
class="worksBox"
|
|
|
>
|
|
|
<div
|
|
|
@@ -2295,7 +2343,14 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (b[j].stage == q && b[j].task == w) {
|
|
|
- if (b[j].type == 1 || b[j].type == 4) {
|
|
|
+ // 1、电子白板，3、思维导图，6协同文档，7思维网格 16、作业提交
|
|
|
+ let _toolsAarry1 = [1, 3, 6, 7, 16];
|
|
|
+ let _toolsAarry2 = [4];
|
|
|
+ let _toolsAarry3 = [15];
|
|
|
+ if (
|
|
|
+ (b[j].type == 1 || b[j].type == 4) &&
|
|
|
+ _toolsAarry1.indexOf(e[i].tool[0]) != -1
|
|
|
+ ) {
|
|
|
if (
|
|
|
c.indexOf(
|
|
|
b[j].content
|
|
|
@@ -2320,12 +2375,29 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
} else {
|
|
|
- this.worksStudent[q][w][i].push({
|
|
|
- works: b[j].content,
|
|
|
- sName: b[j].name,
|
|
|
- type: 2,
|
|
|
- time: b[j].time,
|
|
|
- });
|
|
|
+ if (
|
|
|
+ b[j].type == 2 &&
|
|
|
+ _toolsAarry2.indexOf(e[i].tool[0]) != -1
|
|
|
+ ) {
|
|
|
+ this.worksStudent[q][w][i].push({
|
|
|
+ works: b[j].content,
|
|
|
+ sName: b[j].name,
|
|
|
+ type: 2,
|
|
|
+ time: b[j].time,
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
+ if (
|
|
|
+ b[j].type == 3 &&
|
|
|
+ _toolsAarry3.indexOf(e[i].tool[0]) != -1
|
|
|
+ ) {
|
|
|
+ this.worksStudent[q][w][i].push({
|
|
|
+ works: b[j].content,
|
|
|
+ sName: b[j].name,
|
|
|
+ type: 2,
|
|
|
+ time: b[j].time,
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
this.isWorksS[q][w][i].push({
|
|
|
@@ -3553,13 +3625,13 @@ export default {
|
|
|
|
|
|
<style scoped>
|
|
|
@media screen and (max-width: 1024px) {
|
|
|
- .navText{
|
|
|
- width:190px !important;
|
|
|
+ .navText {
|
|
|
+ width: 190px !important;
|
|
|
}
|
|
|
- .textBox{
|
|
|
- margin:0 !important;
|
|
|
+ .textBox {
|
|
|
+ margin: 0 !important;
|
|
|
}
|
|
|
- .evaCss{
|
|
|
+ .evaCss {
|
|
|
flex-direction: column !important;
|
|
|
align-items: center !important;
|
|
|
}
|
|
|
@@ -4706,8 +4778,8 @@ export default {
|
|
|
overflow: auto;
|
|
|
line-height: 30px;
|
|
|
}
|
|
|
-.textContent >>> p{
|
|
|
- text-indent:0pt !important;
|
|
|
+.textContent >>> p {
|
|
|
+ text-indent: 0pt !important;
|
|
|
}
|
|
|
.answerBg {
|
|
|
background: url("../assets/icon/answerBg.png") no-repeat;
|
