|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="pb_content" style="overflow: unset">
|
|
|
-<!-- 任务模式 -->
|
|
|
+ <!-- 任务模式 -->
|
|
|
<div
|
|
|
class="pb_content_body"
|
|
|
style="
|
|
|
@@ -218,9 +218,13 @@
|
|
|
.toolChoose[0].tool.length == 0 &&
|
|
|
chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
.taskDetail == '' &&
|
|
|
- !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && !(courseDetail.userid == userid ||
|
|
|
- (courseDetail.course_teacher &&
|
|
|
- courseDetail.course_teacher.indexOf(userid) != -1))
|
|
|
+ !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .eList &&
|
|
|
+ !(
|
|
|
+ courseDetail.userid == userid ||
|
|
|
+ (courseDetail.course_teacher &&
|
|
|
+ courseDetail.course_teacher.indexOf(userid) != -1)
|
|
|
+ )
|
|
|
"
|
|
|
>
|
|
|
<img src="../../assets/icon/isNoMessage.png" alt />
|
|
|
@@ -232,6 +236,43 @@
|
|
|
vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
|
|
|
"
|
|
|
>
|
|
|
+ <div
|
|
|
+ class="taskBox"
|
|
|
+ v-if="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail != ''
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ flex-direction: column;
|
|
|
+ position: relative;
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <div
|
|
|
+ style="
|
|
|
+ padding: 20px 0px 15px 0;
|
|
|
+ line-height: 29px;
|
|
|
+ font-size: 18px;
|
|
|
+ "
|
|
|
+ class="cont"
|
|
|
+ v-if="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail != ''
|
|
|
+ "
|
|
|
+ v-html="
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail
|
|
|
+ ? chapInfoList[courseType].chapterInfo[0].taskJson[
|
|
|
+ taskCount
|
|
|
+ ].taskDetail
|
|
|
+ : '暂无描述'
|
|
|
+ "
|
|
|
+ ></div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div
|
|
|
class="student_head"
|
|
|
v-if="
|
|
|
@@ -585,63 +626,18 @@
|
|
|
? '0 0 20px 20px'
|
|
|
: '20px',
|
|
|
}"
|
|
|
- v-if="
|
|
|
- ((chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .toolChoose[0].tool &&
|
|
|
+ v-if="
|
|
|
+ (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .toolChoose[0].tool &&
|
|
|
chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .toolChoose[0].tool.length > 0) || (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .taskDetail != '')) || (courseDetail.userid == userid ||
|
|
|
- (courseDetail.course_teacher &&
|
|
|
- courseDetail.course_teacher.indexOf(userid) != -1))
|
|
|
- "
|
|
|
+ .toolChoose[0].tool.length > 0) ||
|
|
|
+ chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
+ .taskDetail != '' ||
|
|
|
+ courseDetail.userid == userid ||
|
|
|
+ (courseDetail.course_teacher &&
|
|
|
+ courseDetail.course_teacher.indexOf(userid) != -1)
|
|
|
+ "
|
|
|
>
|
|
|
- <div
|
|
|
- class="taskBox"
|
|
|
- v-if="
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .taskDetail != ''
|
|
|
- "
|
|
|
- :style="
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .toolChoose[0].tool &&
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .toolChoose[0].tool.length &&
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .toolChoose[0].tool.length > 0
|
|
|
- ? 'border-bottom: 1px solid #cad1dc'
|
|
|
- : ''
|
|
|
- "
|
|
|
- >
|
|
|
- <div
|
|
|
- style="
|
|
|
- display: flex;
|
|
|
- flex-wrap: nowrap;
|
|
|
- flex-direction: column;
|
|
|
- position: relative;
|
|
|
- "
|
|
|
- >
|
|
|
- <div
|
|
|
- style="
|
|
|
- padding: 20px 0px 15px 0;
|
|
|
- line-height: 29px;
|
|
|
- font-size: 18px;
|
|
|
- "
|
|
|
- class="cont"
|
|
|
- v-if="
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .taskDetail != ''
|
|
|
- "
|
|
|
- v-html="
|
|
|
- chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
|
|
|
- .taskDetail
|
|
|
- ? chapInfoList[courseType].chapterInfo[0].taskJson[
|
|
|
- taskCount
|
|
|
- ].taskDetail
|
|
|
- : '暂无描述'
|
|
|
- "
|
|
|
- ></div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<div
|
|
|
class="vedioBox"
|
|
|
v-if="
|
|
|
@@ -654,26 +650,45 @@
|
|
|
class="queTop"
|
|
|
style="
|
|
|
padding: 15px 0 15px 37px;
|
|
|
- font-weight: bold;
|
|
|
- font-size: 20px;
|
|
|
- color: #0e1e33;
|
|
|
+ justify-content: space-between;
|
|
|
"
|
|
|
>
|
|
|
- 工具栏
|
|
|
- <el-button
|
|
|
- style="margin: 0 30px 0 auto"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- @click="addToolChoose"
|
|
|
- >确定</el-button
|
|
|
- >
|
|
|
+ <div class="queTopTitle">工具栏</div>
|
|
|
+ <div class="queTopRight">
|
|
|
+ <div
|
|
|
+ class="queTopClose"
|
|
|
+ v-if="isClose == 0"
|
|
|
+ @click="isClose = 1"
|
|
|
+ >
|
|
|
+ 展开
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ class="queTopClose"
|
|
|
+ v-if="isClose == 1"
|
|
|
+ @click="isClose = 0"
|
|
|
+ >
|
|
|
+ 收缩
|
|
|
+ </div>
|
|
|
+ <el-button
|
|
|
+ style="margin: 0 30px 0 auto"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="addToolChoose"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="tool_work_box">
|
|
|
+ <div
|
|
|
+ class="tool_work_box"
|
|
|
+ :style="isClose == 0 ? 'display:none' : 'display:block'"
|
|
|
+ >
|
|
|
<div class="tool_box">
|
|
|
<div class="tool_type_box">
|
|
|
<div class="chooseWho">
|
|
|
- <div :class="toolType == 0 ? 'isChooseActive' : ''
|
|
|
- " @click="(toolType = 0), $forceUpdate()">
|
|
|
+ <div
|
|
|
+ :class="toolType == 0 ? 'isChooseActive' : ''"
|
|
|
+ @click="(toolType = 0), $forceUpdate()"
|
|
|
+ >
|
|
|
互动类
|
|
|
</div>
|
|
|
<div
|
|
|
@@ -1417,8 +1432,8 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="bzBox">
|
|
|
- <div class="yCss"></div>
|
|
|
- <div>步骤{{ toolIndex + 1 }}</div>
|
|
|
+ <!-- <div class="yCss"></div>
|
|
|
+ <div>步骤{{ toolIndex + 1 }}</div> -->
|
|
|
<div
|
|
|
style="margin: 0 72px 0 auto"
|
|
|
v-if="courseDetail.userid == userid || tool.tool[0] == 15"
|
|
|
@@ -11553,7 +11568,10 @@
|
|
|
:searchTN="worksSName2"
|
|
|
@setPlname="setPlname"
|
|
|
></UpdateMore>
|
|
|
- <wordCloud :dialogVisibleWordCloud.sync="dialogVisibleWordCloud" :data="wordCloudData"></wordCloud>
|
|
|
+ <wordCloud
|
|
|
+ :dialogVisibleWordCloud.sync="dialogVisibleWordCloud"
|
|
|
+ :data="wordCloudData"
|
|
|
+ ></wordCloud>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -11664,6 +11682,7 @@ export default {
|
|
|
contentDialog: false,
|
|
|
mlDialog: false,
|
|
|
type: 1,
|
|
|
+ isClose: 0,
|
|
|
sentenceList: [{ sentenceTitle: "", addSentence: [], rightAnswer: [] }],
|
|
|
sentenceList1: [],
|
|
|
tableJson: [],
|
|
|
@@ -11902,7 +11921,7 @@ export default {
|
|
|
worksSName2: "",
|
|
|
worksSid: "",
|
|
|
dialogVisibleWordCloud: false,
|
|
|
- wordCloudData:[],
|
|
|
+ wordCloudData: [],
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -11926,14 +11945,14 @@ export default {
|
|
|
previewImg(url) {
|
|
|
this.$hevueImgPreview(url);
|
|
|
},
|
|
|
- checkImg(list){
|
|
|
- if(!list.length){
|
|
|
- return
|
|
|
+ checkImg(list) {
|
|
|
+ if (!list.length) {
|
|
|
+ return;
|
|
|
}
|
|
|
this.$hevueImgPreview({
|
|
|
- multiple: true, // 开启多图预览模式
|
|
|
- imgList: list, // 需要预览的多图数组
|
|
|
- })
|
|
|
+ multiple: true, // 开启多图预览模式
|
|
|
+ imgList: list, // 需要预览的多图数组
|
|
|
+ });
|
|
|
},
|
|
|
change(val) {
|
|
|
console.log(val);
|
|
|
@@ -17759,23 +17778,23 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- openWordCloud(toolindex){
|
|
|
- let array = []
|
|
|
- for(var i = 0;i<this.worksStudent[toolindex].length;i++){
|
|
|
- let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer
|
|
|
- array.push({name:works})
|
|
|
+ openWordCloud(toolindex) {
|
|
|
+ let array = [];
|
|
|
+ for (var i = 0; i < this.worksStudent[toolindex].length; i++) {
|
|
|
+ let works = JSON.parse(this.worksStudent[toolindex][i].works)[0].answer;
|
|
|
+ array.push({ name: works });
|
|
|
}
|
|
|
- if(this.isGroup){
|
|
|
- for(var i = 0;i<this.courseGroup.group.length;i++){
|
|
|
- let works = this.courseGroup.group[i].works[toolindex]
|
|
|
- for(var j = 0;j<works.length;j++){
|
|
|
- let answer = JSON.parse(works[j].works)[0].answer
|
|
|
- array.push({name:answer})
|
|
|
+ if (this.isGroup) {
|
|
|
+ for (var i = 0; i < this.courseGroup.group.length; i++) {
|
|
|
+ let works = this.courseGroup.group[i].works[toolindex];
|
|
|
+ for (var j = 0; j < works.length; j++) {
|
|
|
+ let answer = JSON.parse(works[j].works)[0].answer;
|
|
|
+ array.push({ name: answer });
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- this.wordCloudData = array
|
|
|
- this.dialogVisibleWordCloud = true
|
|
|
+ this.wordCloudData = array;
|
|
|
+ this.dialogVisibleWordCloud = true;
|
|
|
},
|
|
|
},
|
|
|
directives: {
|
|
|
@@ -17846,16 +17865,20 @@ export default {
|
|
|
return check;
|
|
|
};
|
|
|
},
|
|
|
- getImgList(){
|
|
|
- return function(val){
|
|
|
- let srcList = []; // 定义一个数组用来接收后面的img地址
|
|
|
-
|
|
|
- val.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, function (match, capture) { // 查找匹配的元素 match为整个img标签 capture为src中的内容
|
|
|
+ getImgList() {
|
|
|
+ return function (val) {
|
|
|
+ let srcList = []; // 定义一个数组用来接收后面的img地址
|
|
|
+
|
|
|
+ val.replace(
|
|
|
+ /<img [^>]*src=['"]([^'"]+)[^>]*>/g,
|
|
|
+ function (match, capture) {
|
|
|
+ // 查找匹配的元素 match为整个img标签 capture为src中的内容
|
|
|
srcList.push(capture);
|
|
|
- });
|
|
|
- return srcList
|
|
|
- }
|
|
|
- }
|
|
|
+ }
|
|
|
+ );
|
|
|
+ return srcList;
|
|
|
+ };
|
|
|
+ },
|
|
|
},
|
|
|
mounted() {
|
|
|
if (this.screenType == 2) {
|
|
|
@@ -17951,7 +17974,7 @@ export default {
|
|
|
|
|
|
.student_head {
|
|
|
width: 100%;
|
|
|
- margin: 40px auto 0;
|
|
|
+ margin: 0 auto;
|
|
|
padding-bottom: 20px;
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
@@ -18149,7 +18172,7 @@ export default {
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
flex-direction: column;
|
|
|
- padding: 15px 0 5px;
|
|
|
+ padding: 0 0 5px;
|
|
|
}
|
|
|
|
|
|
.filebox .tooldetail {
|
|
|
@@ -18465,9 +18488,9 @@ export default {
|
|
|
.returnBtn {
|
|
|
width: 86px;
|
|
|
height: 36px;
|
|
|
- background: #e7ebf1;
|
|
|
+ background: #409eff;
|
|
|
border-radius: 4px;
|
|
|
- color: #717c8d;
|
|
|
+ color: #fff;
|
|
|
text-align: center;
|
|
|
line-height: 36px;
|
|
|
margin-right: 20px;
|
|
|
@@ -18726,7 +18749,17 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
|
|
|
-.queTop::before {
|
|
|
+.queTopTitle {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: row;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ align-items: center;
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: 20px;
|
|
|
+ color: rgb(14, 30, 51);
|
|
|
+}
|
|
|
+
|
|
|
+.queTopTitle::before {
|
|
|
content: "";
|
|
|
width: 2px;
|
|
|
height: 22px;
|
|
|
@@ -18736,6 +18769,17 @@ export default {
|
|
|
margin: 2px 6px 0 0;
|
|
|
}
|
|
|
|
|
|
+.queTopRight {
|
|
|
+ display: flex;
|
|
|
+ flex-direction: row;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ align-items: center;
|
|
|
+}
|
|
|
+.queTopClose {
|
|
|
+ margin-right: 20px;
|
|
|
+ cursor: pointer;
|
|
|
+}
|
|
|
+
|
|
|
.question {
|
|
|
width: 40px;
|
|
|
margin-right: 10px;
|
|
|
@@ -19408,8 +19452,8 @@ export default {
|
|
|
|
|
|
.noWorksName,
|
|
|
.isWorksName {
|
|
|
- background: #7cbcf1;
|
|
|
- color: #fff;
|
|
|
+ background: #e1e9fb;
|
|
|
+ color: #3383fa;
|
|
|
width: 90px;
|
|
|
height: 25px;
|
|
|
text-align: center;
|
|
|
@@ -19423,7 +19467,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.noWorksName.isWork {
|
|
|
- background: #165d96 !important;
|
|
|
+ background: #e1e9fb !important;
|
|
|
}
|
|
|
|
|
|
.isWorksName {
|
|
|
@@ -19436,7 +19480,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
.noWorksName:hover {
|
|
|
- background: #46a1eb !important;
|
|
|
+ background: #3383fa !important;
|
|
|
+ color: #fff !important;
|
|
|
}
|
|
|
|
|
|
.title {
|
|
|
@@ -20480,8 +20525,8 @@ export default {
|
|
|
background: #fff;
|
|
|
}
|
|
|
|
|
|
-.pzContent >>> img{
|
|
|
- max-width:100%;
|
|
|
+.pzContent >>> img {
|
|
|
+ max-width: 100%;
|
|
|
}
|
|
|
|
|
|
.pzListBox {
|
|
|
@@ -21428,7 +21473,6 @@ ol {
|
|
|
|
|
|
.tool_box {
|
|
|
width: 100%;
|
|
|
- margin-top: 20px;
|
|
|
}
|
|
|
|
|
|
.tool_type_box {
|
zengyicheng
