|
|
@@ -174,7 +174,8 @@
|
|
|
<div class="lockTaskIcon">
|
|
|
<img
|
|
|
src="../assets/lock.png"
|
|
|
- v-if="IsLookOpen && !nav.isLook"
|
|
|
+ v-if="IsLookOpen && !nav.isLook && courseDetail.userid != userid &&
|
|
|
+ courseDetail.course_teacher.indexOf(userid) ==-1"
|
|
|
alt=""
|
|
|
/>
|
|
|
</div>
|
|
|
@@ -942,7 +943,7 @@
|
|
|
@click="addTools(tooC, toolIndex, taskCount)"
|
|
|
/>
|
|
|
<div style="margin: 5px 0">电子白板</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,1)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -954,7 +955,7 @@
|
|
|
@click="addTools(tooC, toolIndex, taskCount)"
|
|
|
/>
|
|
|
<div style="margin: 5px 0">思维导图</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,3)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,3)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -975,7 +976,7 @@
|
|
|
/>
|
|
|
<div style="margin: 5px 0">思维网格</div>
|
|
|
<!-- && worksStudent[toolIndex].length>0 -->
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,7)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1025,7 +1026,7 @@
|
|
|
/>
|
|
|
<div style="margin: 5px 0">选择题</div>
|
|
|
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,45)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,45)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1053,7 +1054,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">问答</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,15)"
|
|
|
style="position: absolute;right: 135px;top: -45px;height: 40px;display: flex;align-items: center;justify-content: center;background: #409EFF;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1191,7 +1192,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">个人评价</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,40)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1203,7 +1204,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">选择匹配</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,41)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1223,7 +1224,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">排序</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,47)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1235,7 +1236,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">表格</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,48)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1247,7 +1248,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">文档</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1' " @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,52)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -1259,7 +1260,7 @@
|
|
|
alt
|
|
|
/>
|
|
|
<div style="margin: 5px 0">学生分组</div>
|
|
|
- <div class="upload_toolBtn" v-if="tType==='1'" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
|
|
|
+ <div class="upload_toolBtn" @click="openChoseWorksDetailDialog(tooC,toolIndex,taskCount,49)"
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
投影
|
|
|
</div>
|
|
|
@@ -11914,10 +11915,18 @@
|
|
|
:searchTN="worksSName2"
|
|
|
@setPlname="setPlname"
|
|
|
></UpdateMore>
|
|
|
- <wordCloud
|
|
|
+ <!-- <wordCloud
|
|
|
:dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
|
|
|
:data="wordCloudData"
|
|
|
- ></wordCloud>
|
|
|
+ ></wordCloud> -->
|
|
|
+ <el-dialog
|
|
|
+ title="词云"
|
|
|
+ :visible.sync="dialogVisibleWordCloud"
|
|
|
+ width="30%"
|
|
|
+ class="dialog_diy"
|
|
|
+ :before-close="handleClose">
|
|
|
+ <choseWordCloud :cloudData="wordCloudData" :key="wordCloudKey" :dialogVisibleWordCloud="dialogVisibleWordCloud"></choseWordCloud>
|
|
|
+ </el-dialog>
|
|
|
<el-dialog
|
|
|
title="挑人"
|
|
|
:visible.sync="dialogVisiblePickPeople"
|
|
|
@@ -11960,11 +11969,13 @@
|
|
|
<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh" @changeSplitScreenBehavior="changeSplitScreenBehavior" :courseType="courseType" :taskCount="taskCount"/>
|
|
|
<choseWorksDetailDialog
|
|
|
ref="choseWorksDetailDialogRef"
|
|
|
- :worksStudentData="this.worksStudent"
|
|
|
+ :worksStudentData="worksStudent"
|
|
|
:noWorksSData="noWorksS"
|
|
|
:chapInfoListData="chapInfoList"
|
|
|
:courseType="courseType"
|
|
|
:taskCount="taskCount"
|
|
|
+ :tType="tType"
|
|
|
+ :sIsOpen="sIsOpen"
|
|
|
@deleteWorks="deleteWorks"
|
|
|
@openTools="openTools"
|
|
|
@openWord="openWord"
|
|
|
@@ -12033,6 +12044,8 @@ import statisticalAnalysis from "./components/statisticalAnalysis.vue";
|
|
|
import choseWorksDetailDialog from './components/choseWorksDetailDialog.vue';
|
|
|
import { v4 as uuidv4 } from "uuid";
|
|
|
var OpenCC = require("opencc-js");
|
|
|
+import choseWordCloud from './components/choseWordCloud.vue'
|
|
|
+
|
|
|
let converter = OpenCC.Converter({
|
|
|
from: "hk",
|
|
|
to: "cn"
|
|
|
@@ -12088,6 +12101,7 @@ const getFile = (url) => {
|
|
|
};
|
|
|
export default {
|
|
|
components: {
|
|
|
+ choseWordCloud,
|
|
|
EditorBar,
|
|
|
Time,
|
|
|
pdf,
|
|
|
@@ -12117,6 +12131,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ wordCloudKey: 0,
|
|
|
bg: null,
|
|
|
drawShow: false,
|
|
|
dialogVisible: false,
|
|
|
@@ -12833,10 +12848,16 @@ export default {
|
|
|
this.navId = ""
|
|
|
let target = document.querySelector(`#gj${k}`);
|
|
|
if (target) {
|
|
|
- target.scrollIntoView(true);
|
|
|
- setTimeout(() => {
|
|
|
- a.scrollTop = a.scrollTop - 150;
|
|
|
+ // target.scrollIntoView(true);
|
|
|
+ // setTimeout(() => {
|
|
|
+ // a.scrollTop = a.scrollTop - 150;
|
|
|
+ // }, 0);
|
|
|
+ target.scrollIntoView();
|
|
|
+ setTimeout(()=>{
|
|
|
+ let scrollBody = document.querySelector('.body_student').parentElement
|
|
|
+ scrollBody.scrollTop = scrollBody.scrollTop - 100
|
|
|
}, 0);
|
|
|
+
|
|
|
}
|
|
|
let flag = this.courseType == i;
|
|
|
let flag2 = this.taskCount == j
|
|
|
@@ -16360,7 +16381,9 @@ export default {
|
|
|
this.$message.error("已经开启跟随模式，请认真跟堂听讲");
|
|
|
return;
|
|
|
}
|
|
|
- if (this.IsLookOpen) {
|
|
|
+ if (this.IsLookOpen &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
+ this.courseDetail.course_teacher.indexOf(this.userid) ==-1) {
|
|
|
if (
|
|
|
!this.chapInfoList[s].chapterInfo[0].taskJson[n].isLook &&
|
|
|
this.courseDetail.userid != this.userid &&
|
|
|
@@ -16683,10 +16706,17 @@ export default {
|
|
|
this.playerO[i] = d;
|
|
|
}
|
|
|
this.courseDetail = res.data[0][0];
|
|
|
- this.tcid = this.arrayToArray(
|
|
|
- this.courseDetail.juri ? this.courseDetail.juri.split(",") : [],
|
|
|
- this.tcid2 ? this.tcid2.split(",") : []
|
|
|
- ).join(",");
|
|
|
+ if(this.tType == 2){
|
|
|
+ this.tcid = this.arrayToArray(
|
|
|
+ this.courseDetail.juri ? this.courseDetail.juri.split(",") : [],
|
|
|
+ this.classId ? this.classId.split(",") : []
|
|
|
+ ).join(",");
|
|
|
+ }else{
|
|
|
+ this.tcid = this.arrayToArray(
|
|
|
+ this.courseDetail.juri ? this.courseDetail.juri.split(",") : [],
|
|
|
+ this.tcid2 ? this.tcid2.split(",") : []
|
|
|
+ ).join(",");
|
|
|
+ }
|
|
|
this.evalua = res.data[0][0].evaId;
|
|
|
this.chapInfo = JSON.parse(this.courseDetail.chapters)[
|
|
|
this.courseType
|
|
|
@@ -19825,6 +19855,8 @@ export default {
|
|
|
this.$forceUpdate();
|
|
|
},
|
|
|
openWordCloud(toolindex) {
|
|
|
+ this.wordCloudData = '';
|
|
|
+
|
|
|
let array = [];
|
|
|
for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
|
|
|
let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
|
|
|
@@ -19839,8 +19871,15 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.wordCloudData = array;
|
|
|
+ let _result = ''
|
|
|
+ array.forEach(e=>{
|
|
|
+ _result +=e.name+','
|
|
|
+ })
|
|
|
+ this.wordCloudData = _result;
|
|
|
+
|
|
|
this.dialogVisibleWordCloud = true;
|
|
|
+ this.wordCloudKey += 1;
|
|
|
+
|
|
|
},
|
|
|
uploadWorks(i) {
|
|
|
this.$confirm("确定导出作业吗？", "提示", {
|
|
|
@@ -20362,7 +20401,7 @@ export default {
|
|
|
},
|
|
|
getSplitScreenData() {
|
|
|
// return;
|
|
|
- if (this.tType != 1) return;
|
|
|
+ // if (this.tType != 1) return;
|
|
|
let params = {
|
|
|
cid: this.id
|
|
|
};
|
