|
@@ -1082,7 +1082,7 @@
|
|
|
<!-- &&worksStudent[toolIndex].length > 0 -->
|
|
|
<div
|
|
|
class="upload_toolBtn"
|
|
|
-
|
|
|
+
|
|
|
@click="
|
|
|
openChoseWorksDetailDialog(
|
|
|
tooC,
|
|
@@ -4999,7 +4999,7 @@
|
|
|
w.ateacher == userid,
|
|
|
}"
|
|
|
>
|
|
|
- {{ AIloading[toolIndex][wIndex].sco ? AIloading[toolIndex][wIndex].sco :'评分'}}
|
|
|
+ {{ AIloading[toolIndex][wIndex].sco ? AIloading[toolIndex][wIndex].sco :'评分'}}
|
|
|
</div> -->
|
|
|
|
|
|
<!-- @show="handleShow(toolIndex,wIndex)"
|
|
@@ -10092,7 +10092,7 @@
|
|
|
w.ateacher == userid,
|
|
|
}"
|
|
|
>
|
|
|
- {{ AIloading[toolIndex][wIndex].sco ? AIloading[toolIndex][wIndex].sco :'评分'}}
|
|
|
+ {{ AIloading[toolIndex][wIndex].sco ? AIloading[toolIndex][wIndex].sco :'评分'}}
|
|
|
</div> -->
|
|
|
|
|
|
<!-- @show="handleShow(toolIndex,wIndex)"
|
|
@@ -11521,7 +11521,7 @@
|
|
|
margin-top: 20px;
|
|
|
box-shadow: 3px 1px 15px 3px #e0e0e0;
|
|
|
"
|
|
|
- :style="{width:chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].isEvaFold2?'100%':'116px'}"
|
|
|
+ :style="{width:chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].isEvaFold2?'100%':'116px'}"
|
|
|
>
|
|
|
<div class="e_add_top">
|
|
|
<div class="e_add_title" style="width: 100%">
|
|
@@ -13602,7 +13602,7 @@
|
|
|
<div style="height: 100%;position: relative;">
|
|
|
<el-button
|
|
|
v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
|
|
|
- size="medium"
|
|
|
+ size="medium"
|
|
|
type="primary"
|
|
|
@click="
|
|
|
() => {
|
|
@@ -15562,24 +15562,24 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <EnglishVoice :EnglishVoiceDialog.sync='EnglishVoiceDialog'
|
|
|
- :englishVoiceJson='englishVoiceJson'
|
|
|
- :userid="userid"
|
|
|
- :id="id"
|
|
|
- :courseType="courseType"
|
|
|
- :taskCount="taskCount"
|
|
|
- :toolindex="toolindex"
|
|
|
- @selectSWorks="selectSWorks"
|
|
|
+ <EnglishVoice :EnglishVoiceDialog.sync='EnglishVoiceDialog'
|
|
|
+ :englishVoiceJson='englishVoiceJson'
|
|
|
+ :userid="userid"
|
|
|
+ :id="id"
|
|
|
+ :courseType="courseType"
|
|
|
+ :taskCount="taskCount"
|
|
|
+ :toolindex="toolindex"
|
|
|
+ @selectSWorks="selectSWorks"
|
|
|
@selectStudent="selectStudent"
|
|
|
:englishVoiceJsonWork="englishVoiceJsonWork"></EnglishVoice>
|
|
|
- <checkEnglishVoice :englishVoiceJson='englishVoiceJson'
|
|
|
- :userid="userid"
|
|
|
+ <checkEnglishVoice :englishVoiceJson='englishVoiceJson'
|
|
|
+ :userid="userid"
|
|
|
:dialogVisibleENScore.sync='dialogVisibleENScore'
|
|
|
- :commentDetail="commentDetail"
|
|
|
- :courseDetail="courseDetail"
|
|
|
+ :commentDetail="commentDetail"
|
|
|
+ :courseDetail="courseDetail"
|
|
|
:wScore="wScore"
|
|
|
:scoreDetail="scoreDetail"
|
|
|
- @selectSWorks="selectSWorks"
|
|
|
+ @selectSWorks="selectSWorks"
|
|
|
@selectStudent="selectStudent"></checkEnglishVoice>
|
|
|
|
|
|
|
|
@@ -15685,14 +15685,14 @@
|
|
|
<div style="margin-bottom: 10px;">接下来你将跟随老师一起开始今天的学习! </div>
|
|
|
<div>要认真听讲哦~</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
|
|
|
<div style="text-align: center;">
|
|
|
<el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
|
|
|
</div>
|
|
|
|
|
|
</el-dialog>
|
|
|
- <appStoreC ref="appStoreC"
|
|
|
+ <appStoreC ref="appStoreC"
|
|
|
:sStudent="sStudent"
|
|
|
:courseType="courseType"
|
|
|
:taskCount="taskCount"
|
|
@@ -15700,7 +15700,7 @@
|
|
|
@selectSWorks="selectSWorks"
|
|
|
@selectStudent="selectStudent"
|
|
|
></appStoreC>
|
|
|
-
|
|
|
+
|
|
|
<cocoFlowDia ref="cocoFlowDiaRef"></cocoFlowDia>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -15786,7 +15786,7 @@ const getFile = (url) => {
|
|
|
resolve({ data: 1 });
|
|
|
}else {
|
|
|
resolve({ data: data.Body });
|
|
|
- console.log(data);
|
|
|
+ console.log(data);
|
|
|
} // sxuccessful response
|
|
|
|
|
|
});
|
|
@@ -16203,7 +16203,7 @@ export default {
|
|
|
englishVoiceJsonWork:[],
|
|
|
scoreList:{
|
|
|
listdata:[],
|
|
|
- isScoreList:[],
|
|
|
+ isScoreList:[],
|
|
|
},
|
|
|
classRoomHelperWidth: '85px',
|
|
|
orgArray:[],
|
|
@@ -16218,7 +16218,7 @@ export default {
|
|
|
},
|
|
|
confirmOpenDig:false,
|
|
|
confirmOpenDigData:'',
|
|
|
-
|
|
|
+
|
|
|
refreshKey: 0,
|
|
|
AIloading: [],
|
|
|
worksStudentCopy: [],
|
|
@@ -16552,7 +16552,7 @@ export default {
|
|
|
#评分资料#
|
|
|
评价标准:${std}
|
|
|
评价细则:${laws}
|
|
|
- 作业内容:${_fileid ? "上传的文件内容" : JSON.parse(con[i].works).text}
|
|
|
+ 作业内容:${_fileid ? "上传的文件内容" : JSON.parse(con[i].works).text}
|
|
|
任务描述:${taskDetail}
|
|
|
工具描述:${toolDetail}
|
|
|
|
|
@@ -16630,15 +16630,15 @@ export default {
|
|
|
}
|
|
|
|
|
|
# Format example
|
|
|
- ==
|
|
|
+ ==
|
|
|
0 星,作业内容与作业要求无关;
|
|
|
1 星,没有识别问题和需求;
|
|
|
2 星,问题或需求没有被清晰理解或准确识别;
|
|
|
3 星,问题或需求的一部分被识别;
|
|
|
4 星,问题或需求的大部分被识别;
|
|
|
- 5 星,问题或需求都被识别。
|
|
|
+ 5 星,问题或需求都被识别。
|
|
|
==
|
|
|
-
|
|
|
+
|
|
|
`;
|
|
|
|
|
|
let params = {
|
|
@@ -16840,7 +16840,7 @@ export default {
|
|
|
// console.log('payload',payload)
|
|
|
this.AIloading[payload.val][payload.val2].sco = payload.val3;
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
gx(){
|
|
|
this.$forceUpdate();
|
|
|
},
|
|
@@ -16936,7 +16936,7 @@ export default {
|
|
|
console.log(err);
|
|
|
loading.close();
|
|
|
}
|
|
|
- );
|
|
|
+ );
|
|
|
},
|
|
|
addToolChoose() {
|
|
|
if (!this.checktoolArray.length) {
|
|
@@ -17041,7 +17041,7 @@ export default {
|
|
|
type: "success",
|
|
|
});
|
|
|
this.toolDetailIndex = null;
|
|
|
-
|
|
|
+
|
|
|
this.updateToolDetailInner = "";
|
|
|
this.getCourseDetail(2);
|
|
|
this.$forceUpdate();
|
|
@@ -17070,7 +17070,7 @@ export default {
|
|
|
message: "修改成功",
|
|
|
type: "success",
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
this.toolDetailIndex = i;
|
|
|
this.isUpdateToolDetail1 = true;
|
|
|
setTimeout(() => {
|
|
@@ -17116,7 +17116,7 @@ export default {
|
|
|
let scrollBody = document.querySelector('.body_student').parentElement
|
|
|
scrollBody.scrollTop = scrollBody.scrollTop - 100
|
|
|
}, 0);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
this.navId = ""
|
|
|
let flag = this.courseType == i;
|
|
@@ -18528,7 +18528,9 @@ export default {
|
|
|
});
|
|
|
this.selectSWorks();
|
|
|
this.selectStudent();
|
|
|
+ if(this.tType!=0){
|
|
|
this.insertMemorandum(`对<span class="variable">${sName}</span>的作业进行<span class="btn">点赞</span>`)
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("点赞失败");
|
|
@@ -18680,7 +18682,7 @@ export default {
|
|
|
? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[this.taskCount]
|
|
|
.toolChoose[index].englishVoiceJson
|
|
|
: {};
|
|
|
-
|
|
|
+
|
|
|
this.englishVoiceJson = JSON.parse(JSON.stringify(englishVoiceJson));
|
|
|
}
|
|
|
this.insertMemorandum(`查看<span class="variable">${w.sName}</span>的作业`)
|
|
@@ -18721,7 +18723,9 @@ export default {
|
|
|
this.commentText = "";
|
|
|
this.selectSWorks();
|
|
|
this.selectStudent();
|
|
|
+ if(this.tType!=0){
|
|
|
this.insertMemorandum(`对<span class="variable">${detail.sName}</span>的作业进行<span class="btn">评论</span>`)
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("评论失败");
|
|
@@ -18760,7 +18764,9 @@ export default {
|
|
|
this.dialogVisibleScore = false;
|
|
|
this.selectSWorks();
|
|
|
this.selectStudent();
|
|
|
+ if(this.tType!=0){
|
|
|
this.insertMemorandum(`对<span class="variable">${sName}</span>的作业进行<span class="btn">评分</span>`)
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("评分失败");
|
|
@@ -20596,7 +20602,7 @@ export default {
|
|
|
!this.navList[b].task[this.navList[b].task.length - 1].isLook
|
|
|
) {
|
|
|
if (
|
|
|
- this.courseDetail.userid != this.userid &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
(!this.courseDetail.course_teacher ||
|
|
|
(this.courseDetail.course_teacher &&
|
|
|
this.courseDetail.course_teacher.indexOf(this.userid) == -1))
|
|
@@ -20645,7 +20651,7 @@ export default {
|
|
|
if (
|
|
|
!this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
|
|
|
.isLook &&
|
|
|
- this.courseDetail.userid != this.userid &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
(!this.courseDetail.course_teacher ||
|
|
|
(this.courseDetail.course_teacher &&
|
|
|
this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
|
|
@@ -20671,7 +20677,7 @@ export default {
|
|
|
var bbb = parseInt(this.courseType) + 1;
|
|
|
if (
|
|
|
!this.chapInfoList[bbb].chapterInfo[0].taskJson[0].isLook &&
|
|
|
- this.courseDetail.userid != this.userid &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
(!this.courseDetail.course_teacher ||
|
|
|
(this.courseDetail.course_teacher &&
|
|
|
this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
|
|
@@ -20689,7 +20695,7 @@ export default {
|
|
|
if (
|
|
|
!this.chapInfoList[this.courseType].chapterInfo[0].taskJson[bbb]
|
|
|
.isLook &&
|
|
|
- this.courseDetail.userid != this.userid &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
(!this.courseDetail.course_teacher ||
|
|
|
(this.courseDetail.course_teacher &&
|
|
|
this.courseDetail.course_teacher.indexOf(this.userid) == -1)) &&
|
|
@@ -20752,12 +20758,12 @@ 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 &&
|
|
|
+ this.courseDetail.userid != this.userid &&
|
|
|
(!this.courseDetail.course_teacher ||
|
|
|
(this.courseDetail.course_teacher &&
|
|
|
this.courseDetail.course_teacher.indexOf(this.userid) == -1))
|
|
@@ -20798,7 +20804,7 @@ export default {
|
|
|
|
|
|
let flag = this.courseType==s;
|
|
|
|
|
|
-
|
|
|
+
|
|
|
this.courseType = s;
|
|
|
this.navId = i;
|
|
|
this.taskCount = n;
|
|
@@ -21453,7 +21459,7 @@ export default {
|
|
|
_this.selectStudent();
|
|
|
_this.selectSLook();
|
|
|
_this.getPick();
|
|
|
-
|
|
|
+
|
|
|
if (_this.courseDetail.userid == _this.userid && _this.IsFollow) {
|
|
|
_this.setCTask();
|
|
|
}
|
|
@@ -21499,7 +21505,7 @@ export default {
|
|
|
}, 5000);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
_this.$nextTick(function () {
|
|
|
setTimeout(() => {
|
|
|
// var a =
|
|
@@ -21631,7 +21637,9 @@ export default {
|
|
|
this.pzConText = "";
|
|
|
this.addPzDialog = false;
|
|
|
this.selectPz();
|
|
|
+ if(this.tType!=0){
|
|
|
this.insertMemorandum(`使用<span class="btn">评论</span>功能,添加评论`)
|
|
|
+ }
|
|
|
})
|
|
|
.catch((err) => {
|
|
|
this.$message.error("添加失败");
|
|
@@ -21902,7 +21910,7 @@ export default {
|
|
|
this.IsFollow = res.data[0][0].follow == 1 ? false : true;
|
|
|
if (!this.IsLookOpen) {
|
|
|
this.setNavList();
|
|
|
- }
|
|
|
+ }
|
|
|
// else {
|
|
|
this.getCourseState(1);
|
|
|
// }
|
|
@@ -22633,7 +22641,7 @@ export default {
|
|
|
// index
|
|
|
// ].toolChoose[i].videoJson;
|
|
|
this.dialogVisibleVideo = true;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
// else if (t == 15) {
|
|
|
// this.answerQ = "";
|
|
@@ -22965,8 +22973,8 @@ export default {
|
|
|
}
|
|
|
if (!document.fullscreenElement) {
|
|
|
this.enterFullScreen();
|
|
|
- }
|
|
|
- this.$refs.appStoreC.getData(item.url,this.userid)
|
|
|
+ }
|
|
|
+ this.$refs.appStoreC.getData(item.url,this.userid)
|
|
|
|
|
|
|
|
|
// window.topU.postMessage({ tools: "72", data: item }, "*");
|
|
@@ -22989,7 +22997,7 @@ export default {
|
|
|
? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
|
|
|
.toolChoose[i].englishList
|
|
|
: {};
|
|
|
-
|
|
|
+
|
|
|
this.englishToolIndex = i;
|
|
|
this.myAnList = this.myAnswerList1;
|
|
|
this.engDialogVisible = true;
|
|
@@ -23012,7 +23020,7 @@ export default {
|
|
|
? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
|
|
|
.toolChoose[i].englishVoiceJson
|
|
|
: {};
|
|
|
-
|
|
|
+
|
|
|
this.englishVoiceJson = JSON.parse(JSON.stringify(englishVoiceJson));
|
|
|
this.EnglishVoiceDialog = true;
|
|
|
} else if (t == 65) {
|
|
@@ -23411,9 +23419,9 @@ export default {
|
|
|
}else if (t == 72) {
|
|
|
if (!document.fullscreenElement) {
|
|
|
this.enterFullScreen();
|
|
|
- }
|
|
|
+ }
|
|
|
let url = this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index].toolChoose[i].appJson.url
|
|
|
- this.$refs.appStoreC.getData(url,this.sStudent.userid)
|
|
|
+ this.$refs.appStoreC.getData(url,this.sStudent.userid)
|
|
|
}
|
|
|
},
|
|
|
openCocoPi(tool, i, uid, uname) {
|
|
@@ -23588,7 +23596,7 @@ export default {
|
|
|
"https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(_uuurl);
|
|
|
}
|
|
|
this.changeSplitScreenBehavior({code:0,form:{t:t,f:f}})
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
openSname(n, id, i, uid) {
|
|
|
this.snameWid = id;
|
|
@@ -23707,11 +23715,11 @@ export default {
|
|
|
a.href = url;
|
|
|
a.download = f.name;
|
|
|
a.click();
|
|
|
- console.log(data);
|
|
|
+ console.log(data);
|
|
|
} // sxuccessful response
|
|
|
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
return;
|
|
|
let url = f.url;
|
|
|
let _url = "";
|
|
@@ -23790,11 +23798,11 @@ export default {
|
|
|
a.href = url;
|
|
|
a.download = name;
|
|
|
a.click();
|
|
|
- console.log(data);
|
|
|
+ console.log(data);
|
|
|
} // sxuccessful response
|
|
|
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
return;
|
|
|
let _this = this;
|
|
|
let _url = "";
|
|
@@ -24577,7 +24585,7 @@ export default {
|
|
|
this.newEnglishList.engText = z.engText;
|
|
|
}else{
|
|
|
var a = res.data[0];
|
|
|
- var ppp = JSON.parse(JSON.stringify(res.data[0]));
|
|
|
+ var ppp = JSON.parse(JSON.stringify(res.data[0]));
|
|
|
if(this.userMes[0].type == 2){
|
|
|
var snum = 0;
|
|
|
for(var i = 0;i<a.length;i++){
|
|
@@ -24738,7 +24746,7 @@ export default {
|
|
|
_url = await this.checkLink("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/" + encodeURIComponent(_url.split('https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/')[1]))
|
|
|
}
|
|
|
// console.log(_url)
|
|
|
- return _url
|
|
|
+ return _url
|
|
|
},
|
|
|
getScoreList(){
|
|
|
let params = {
|
|
@@ -24868,11 +24876,11 @@ export default {
|
|
|
this.confirmOpenDig = false
|
|
|
if (!document.fullscreenElement) {
|
|
|
this.enterFullScreen();
|
|
|
- }
|
|
|
+ }
|
|
|
if (this.timer2) {
|
|
|
clearInterval(this.timer2);
|
|
|
this.timer2 = null;
|
|
|
- }
|
|
|
+ }
|
|
|
this.timer2 = setInterval(()=> {
|
|
|
this.getSplitScreenData();//获取分屏数据
|
|
|
}, 1000);
|
|
@@ -24942,7 +24950,7 @@ export default {
|
|
|
.then(() => {
|
|
|
if (document.fullscreenElement) {
|
|
|
this.exitFullScreen();
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
}
|
|
@@ -24961,7 +24969,7 @@ export default {
|
|
|
if (behavior) {
|
|
|
if (behavior.code === 99) {
|
|
|
//初始化
|
|
|
- this.fullDialogVisible = false;
|
|
|
+ this.fullDialogVisible = false;
|
|
|
if(this.$refs.choseWorksDetailDialogRef.show){
|
|
|
this.$refs.choseWorksDetailDialogRef.close();
|
|
|
}
|
|
@@ -24973,7 +24981,7 @@ export default {
|
|
|
//开启内容列表弹窗
|
|
|
this.checkFileFull1(behavior.form.t, behavior.form.f);
|
|
|
}else{
|
|
|
- this.fullDialogVisible = false;
|
|
|
+ this.fullDialogVisible = false;
|
|
|
}
|
|
|
if (behavior.code === 1) {
|
|
|
//关于选择题的作业详细的操作
|
|
@@ -25048,7 +25056,7 @@ export default {
|
|
|
}
|
|
|
this.setContent2(false)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
}
|
|
@@ -25197,7 +25205,7 @@ export default {
|
|
|
|
|
|
clearInterval(this.opertimer);
|
|
|
this.opertimer = null;
|
|
|
- this.updateSplitScreenData(1);
|
|
|
+ this.updateSplitScreenData(1);
|
|
|
},
|
|
|
computed: {
|
|
|
getHeight(){
|
|
@@ -28079,7 +28087,7 @@ export default {
|
|
|
.checkbox>.cb-tabList{
|
|
|
display:flex;
|
|
|
align-items:center;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
.cb-tabList>div{
|
|
@@ -29668,7 +29676,7 @@ ol {
|
|
|
display: flex;
|
|
|
flex-direction: row;
|
|
|
flex-wrap: nowrap;
|
|
|
- align-items: flex-start;
|
|
|
+ align-items: flex-start;
|
|
|
padding: 0 20px 20px 20px;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
@@ -29757,7 +29765,7 @@ ol {
|
|
|
}
|
|
|
|
|
|
.isUpdateToolDetailClass{
|
|
|
- padding: 0 !important;
|
|
|
+ padding: 0 !important;
|
|
|
}
|
|
|
|
|
|
.isUpdateToolDetailClass textarea{
|
|
@@ -29862,6 +29870,6 @@ div::-webkit-scrollbar {
|
|
|
-webkit-box-orient: vertical;
|
|
|
overflow: hidden;
|
|
|
|
|
|
- text-overflow: ellipsis;
|
|
|
+ text-overflow: ellipsis;
|
|
|
}
|
|
|
</style>
|