|
|
@@ -448,7 +448,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="tool">
|
|
|
- <div class="whiteBIcon">
|
|
|
+ <div class="whiteBIcon" @click="addTools(1, 0, taskCount)">
|
|
|
<img src="../../assets/icon/secondToolList/whiteBoard.png" alt />
|
|
|
<div style="margin: 5px 0">电子白板</div>
|
|
|
</div>
|
|
|
@@ -656,7 +656,8 @@
|
|
|
</div>
|
|
|
<div class="tool_work_box">
|
|
|
<div class="noWorksS">
|
|
|
- <div v-for="(s, sIndex) in noWorksS" :key="sIndex" class="noWorksName" :class="{ isWork: s.type == '2' }">
|
|
|
+ <div v-for="(s, sIndex) in noWorksS" :key="sIndex" class="noWorksName"
|
|
|
+ :class="{ isWork: s.type == '2' }" @click="openStudentTool(s)">
|
|
|
{{ s.student }}
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -2409,6 +2410,31 @@
|
|
|
</el-dialog>
|
|
|
<interVideo :dialogVisibleVideo.sync="dialogVisibleVideo" :videoJson="videoJson" :userid="userid" :id="id"
|
|
|
:courseType="courseType" :taskCount="taskCount" :toolindex="toolindex" v-if="dialogVisibleVideo"></interVideo>
|
|
|
+ <el-dialog :title="sStudent.student" :visible.sync="dialogVisibleStudentTool" :append-to-body="true" width="700px"
|
|
|
+ :before-close="handleClose" class="dialog_diy">
|
|
|
+ <div>
|
|
|
+ <div class="dia_tool_box">
|
|
|
+ <div class="tool" @click="teacherWorkSubmit(1, 0, taskCount)">
|
|
|
+ <div class="whiteBIcon">
|
|
|
+ <img src="../../assets/icon/secondToolList/whiteBoard.png" alt />
|
|
|
+ <div style="margin: 5px 0">电子白板</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="tool">
|
|
|
+ <div class="whiteBIcon">
|
|
|
+ <img src="../../assets/icon/secondToolList/mindMapping.png" alt />
|
|
|
+ <div style="margin: 5px 0">思维导图</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="tool">
|
|
|
+ <div class="whiteBIcon">
|
|
|
+ <img src="../../assets/icon/fourthToolList/text.png" alt />
|
|
|
+ <div style="margin: 5px 0">文档</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -2480,6 +2506,7 @@ export default {
|
|
|
dialogVisibleDeleteGroup: false,
|
|
|
dialogVisibleSname: false,
|
|
|
dialogVisibleVideo: false,
|
|
|
+ dialogVisibleStudentTool: false,
|
|
|
worksSName: "",
|
|
|
classJuri: [],
|
|
|
uploadStudentJuri: [],
|
|
|
@@ -2643,7 +2670,7 @@ export default {
|
|
|
evalCount: 0,
|
|
|
dialogImageUrl: "",
|
|
|
pictureDialog: false,
|
|
|
- toolType:0,
|
|
|
+ toolType: 0,
|
|
|
toolTypeList: [],
|
|
|
dialogVisible1: false,
|
|
|
dialogVisible2: false,
|
|
|
@@ -6610,8 +6637,7 @@ export default {
|
|
|
this.dialogVisibleVideo = true;
|
|
|
}
|
|
|
},
|
|
|
- teacherWorkSubmit(t, i, index, s) {
|
|
|
- this.sStudent = s;
|
|
|
+ teacherWorkSubmit(t, i, index) {
|
|
|
this.sTool = t;
|
|
|
this.toolindex = i;
|
|
|
if (this.tType !== "1" && this.tType !== "4") {
|
|
|
@@ -6814,6 +6840,10 @@ export default {
|
|
|
);
|
|
|
}
|
|
|
},
|
|
|
+ openStudentTool(s) {
|
|
|
+ this.sStudent = s;
|
|
|
+ this.dialogVisibleStudentTool = true;
|
|
|
+ },
|
|
|
setRightAnswer(s, i, j) {
|
|
|
for (var q = 0; q < this.sentenceList[i].chooseSenList.length; q++) {
|
|
|
if (
|
|
|
@@ -8203,6 +8233,7 @@ export default {
|
|
|
border-radius: 5px;
|
|
|
font-size: 14px;
|
|
|
}
|
|
|
+
|
|
|
.mask {
|
|
|
background-color: rgba(0, 0, 0, 0);
|
|
|
position: fixed;
|
|
|
@@ -8474,10 +8505,10 @@ export default {
|
|
|
|
|
|
.tool_box {
|
|
|
width: 100%;
|
|
|
- margin-top:20px
|
|
|
+ margin-top: 20px
|
|
|
}
|
|
|
|
|
|
-.tool_type_box{
|
|
|
+.tool_type_box {
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
align-items: baseline;
|
|
|
@@ -8485,6 +8516,7 @@ export default {
|
|
|
justify-content: flex-start;
|
|
|
position: relative;
|
|
|
}
|
|
|
+
|
|
|
.addPoint>div>img {
|
|
|
cursor: pointer;
|
|
|
margin: 0 10px;
|
|
|
@@ -11091,7 +11123,7 @@ ol {
|
|
|
align-items: center;
|
|
|
}
|
|
|
|
|
|
-.whiteBIcon>img{
|
|
|
+.whiteBIcon>img {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
}
|
|
|
@@ -11101,4 +11133,13 @@ ol {
|
|
|
border-radius: 15px;
|
|
|
}
|
|
|
|
|
|
+.dia_tool_box {
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ width: 100%;
|
|
|
+}
|
|
|
+
|
|
|
+.dia_tool_box>div {
|
|
|
+ margin-right: 40px;
|
|
|
+}
|
|
|
</style>
|
