|
|
@@ -86,7 +86,7 @@
|
|
|
<div
|
|
|
class="stageBoxCss"
|
|
|
@click="get(stageIndex)"
|
|
|
- :class="{
|
|
|
+ :class="{
|
|
|
// stageBoxIsCss: stageIndex == courseType,
|
|
|
}"
|
|
|
>
|
|
|
@@ -228,7 +228,7 @@
|
|
|
<div v-if="t.tool == 26">课程设计</div>
|
|
|
<div v-if="t.tool == 62">交互视频</div>
|
|
|
<div v-if="t.tool == 71">AI智能体</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1005,7 +1005,7 @@
|
|
|
style="position: absolute;right: 33px;top: -30px;">
|
|
|
统计分析
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<div v-if="tooC == 45">
|
|
|
<img
|
|
|
@@ -7923,7 +7923,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%">
|
|
|
@@ -11904,24 +11904,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>
|
|
|
<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh" @changeSplitScreenBehavior="changeSplitScreenBehavior" :courseType="courseType" :taskCount="taskCount"/>
|
|
|
<choseWorksDetailDialog
|
|
|
@@ -12009,7 +12009,7 @@ const getFile = (url) => {
|
|
|
resolve({ data: 1 });
|
|
|
}else {
|
|
|
resolve({ data: data.Body });
|
|
|
- console.log(data);
|
|
|
+ console.log(data);
|
|
|
} // sxuccessful response
|
|
|
|
|
|
});
|
|
|
@@ -12416,7 +12416,7 @@ export default {
|
|
|
englishVoiceJsonWork:[],
|
|
|
scoreList:{
|
|
|
listdata:[],
|
|
|
- isScoreList:[],
|
|
|
+ isScoreList:[],
|
|
|
},
|
|
|
classRoomHelperWidth: '85px',
|
|
|
orgArray:[],
|
|
|
@@ -12601,7 +12601,7 @@ export default {
|
|
|
console.log(err);
|
|
|
loading.close();
|
|
|
}
|
|
|
- );
|
|
|
+ );
|
|
|
},
|
|
|
addToolChoose() {
|
|
|
if (!this.checktoolArray.length) {
|
|
|
@@ -12706,7 +12706,7 @@ export default {
|
|
|
type: "success",
|
|
|
});
|
|
|
this.toolDetailIndex = null;
|
|
|
-
|
|
|
+
|
|
|
this.updateToolDetailInner = "";
|
|
|
this.getCourseDetail(2);
|
|
|
this.$forceUpdate();
|
|
|
@@ -12735,7 +12735,7 @@ export default {
|
|
|
message: "修改成功",
|
|
|
type: "success",
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
this.toolDetailIndex = i;
|
|
|
this.isUpdateToolDetail1 = true;
|
|
|
setTimeout(() => {
|
|
|
@@ -12782,10 +12782,11 @@ export default {
|
|
|
this.courseType = i;
|
|
|
// this.navId = l;
|
|
|
this.taskCount = j;
|
|
|
-
|
|
|
+
|
|
|
this.selectPz();
|
|
|
this.getHomeWork();
|
|
|
this.getCourseDetail(2);
|
|
|
+ this.changeSplitScreenBehavior({form:{courseType:this.courseType,taskCount:this.taskCount,toolType:k}})
|
|
|
if(flag){
|
|
|
if(flag2){
|
|
|
this.insertMemorandum(`选择<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
|
|
|
@@ -14259,7 +14260,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async openScore(w, index) {
|
|
|
-
|
|
|
+
|
|
|
this.wScore = 0;
|
|
|
this.wScore = w.score ? JSON.parse(w.score).wScore : 0;
|
|
|
this.scoreDetail = w.score ? JSON.parse(w.score).detail : "";
|
|
|
@@ -14304,13 +14305,13 @@ 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>的作业`)
|
|
|
},
|
|
|
addComment(wid, uid, t,detail) {
|
|
|
-
|
|
|
+
|
|
|
if (this.commentText == "") {
|
|
|
this.$message.error("请输入评论");
|
|
|
return;
|
|
|
@@ -14393,7 +14394,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
openXz(w, i) {
|
|
|
-
|
|
|
+
|
|
|
this.selectJson = this.chapInfoList[this.courseType].chapterInfo[0]
|
|
|
.taskJson[this.taskCount].toolChoose[i].selectJson
|
|
|
? JSON.parse(
|
|
|
@@ -16141,7 +16142,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))
|
|
|
@@ -16341,13 +16342,13 @@ export default {
|
|
|
}
|
|
|
let flag = this.courseType==s;
|
|
|
|
|
|
-
|
|
|
+
|
|
|
this.courseType = s;
|
|
|
-
|
|
|
+
|
|
|
this.navId = i;
|
|
|
this.taskCount = n;
|
|
|
-
|
|
|
-
|
|
|
+ this.changeSplitScreenBehavior({form:{courseType:this.courseType,taskCount:this.taskCount,navId:this.navId}})
|
|
|
+
|
|
|
if(ctype == 2){
|
|
|
this.navList[s].task[n].isOpen = true
|
|
|
}else{
|
|
|
@@ -17049,7 +17050,7 @@ export default {
|
|
|
this.$message.error("添加失败");
|
|
|
console.error(err);
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
setReplyIndex(id, i) {
|
|
|
this.replyIndex = i;
|
|
|
@@ -17319,7 +17320,7 @@ export default {
|
|
|
this.getCourseState(1);
|
|
|
}
|
|
|
|
|
|
- if ((this.IsFollow && this.tType == 2) || (this.splitScreenData.isOpen && this.splitScreenData.uid != this.splitScreenData.myUid)) {
|
|
|
+ if ((this.IsFollow && this.tType == 2)) {
|
|
|
this.setContent2(false);
|
|
|
let _followC = res.data[0][0].followC.split("-");
|
|
|
if (
|
|
|
@@ -17588,7 +17589,7 @@ export default {
|
|
|
this.tableJson = JSON.parse(f.works);
|
|
|
this.dialogVisibleTable3 = true;
|
|
|
this.insertMemorandum(`查看<span class="variable">${f.sName}的作业</span>`)
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
doUrl(url, i) {
|
|
|
this.isClickNav = "";
|
|
|
@@ -17999,7 +18000,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
openTools(t, i, index, c, sName,id) {
|
|
|
-
|
|
|
+
|
|
|
var z = JSON.parse(c);
|
|
|
this.noteName = sName;
|
|
|
if (t == 4) {
|
|
|
@@ -18378,7 +18379,7 @@ export default {
|
|
|
? this.chapInfoList[this.courseType].chapterInfo[0].taskJson[index]
|
|
|
.toolChoose[i].englishList
|
|
|
: {};
|
|
|
-
|
|
|
+
|
|
|
this.englishToolIndex = i;
|
|
|
this.myAnList = this.myAnswerList1;
|
|
|
this.engDialogVisible = true;
|
|
|
@@ -18401,7 +18402,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) {
|
|
|
@@ -18950,7 +18951,7 @@ export default {
|
|
|
},
|
|
|
async checkFileFull1(t, f) {
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
this.fullDialogVisible = true;
|
|
|
if (t == 6) {
|
|
|
@@ -19093,11 +19094,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 = "";
|
|
|
@@ -19165,11 +19166,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 = "";
|
|
|
@@ -19900,7 +19901,7 @@ export default {
|
|
|
},
|
|
|
setEngText(i){
|
|
|
this.newEngIndex = i;
|
|
|
-
|
|
|
+
|
|
|
this.$forceUpdate();
|
|
|
},
|
|
|
addCorrect(){
|
|
|
@@ -19944,7 +19945,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++){
|
|
|
@@ -20105,7 +20106,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 = {
|
|
|
@@ -20188,7 +20189,7 @@ export default {
|
|
|
this.splitScreenData.uid = this.splitScreenData.myUid;
|
|
|
this.splitScreenData.behavior = null;
|
|
|
let status = await this.updateSplitScreenData(0);
|
|
|
-
|
|
|
+ this.changeSplitScreenBehavior({form:{}})
|
|
|
if (status == 1) {
|
|
|
this.$message.success("已开启分屏");
|
|
|
this.studentFreePreview(true);
|
|
|
@@ -20305,6 +20306,29 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
+ if(behavior.form.taskCount!=="" && behavior.form.courseType !==""){
|
|
|
+ if(this.courseType !=behavior.form.courseType){
|
|
|
+ this.courseType = behavior.form.courseType;
|
|
|
+ }
|
|
|
+ if(this.taskCount !=behavior.form.taskCount){
|
|
|
+ this.taskCount = behavior.form.taskCount;
|
|
|
+ }
|
|
|
+
|
|
|
+ var a = document.scrollingElement;
|
|
|
+ let target = document.querySelector(`#gj${behavior.form.toolType}`);
|
|
|
+ if (target) {
|
|
|
+ target.scrollIntoView(true);
|
|
|
+ setTimeout(() => {
|
|
|
+ a.scrollTop = 0
|
|
|
+ }, 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(behavior.form.navId){
|
|
|
+ this.navId = behavior.form.navId
|
|
|
+ }
|
|
|
+
|
|
|
+ this.setContent2(false)
|
|
|
+ }
|
|
|
} else {
|
|
|
}
|
|
|
}
|
|
|
@@ -20374,7 +20398,22 @@ export default {
|
|
|
this.splitScreenData.isOpen &&
|
|
|
this.splitScreenData.uid == this.splitScreenData.myUid
|
|
|
) {
|
|
|
- this.splitScreenData.behavior = newValue;
|
|
|
+ let _behavior = null;
|
|
|
+ if(!newValue){
|
|
|
+ _behavior = {}
|
|
|
+ }else{
|
|
|
+ _behavior = newValue
|
|
|
+ }
|
|
|
+ if(_behavior.form){
|
|
|
+ _behavior.form.taskCount = this.taskCount;
|
|
|
+ _behavior.form.courseType = this.courseType
|
|
|
+ }else{
|
|
|
+ _behavior.form = {
|
|
|
+ taskCount:this.taskCount,
|
|
|
+ courseType:this.courseType
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.splitScreenData.behavior = _behavior;
|
|
|
this.updateSplitScreenData(0);
|
|
|
}
|
|
|
},
|
|
|
@@ -20382,7 +20421,7 @@ export default {
|
|
|
this.IsLookOpen = flag;
|
|
|
this.updateLookOpen();
|
|
|
this.followingMode(flag)
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
OpenJobPreview(flag) {
|
|
|
this.sIsOpen = flag;
|
|
|
@@ -20435,7 +20474,7 @@ export default {
|
|
|
this.timer = null;
|
|
|
clearInterval(this.opertimer);
|
|
|
this.opertimer = null;
|
|
|
- this.updateSplitScreenData(1);
|
|
|
+ this.updateSplitScreenData(1);
|
|
|
},
|
|
|
computed: {
|
|
|
contentConvent() {
|
|
|
@@ -20533,7 +20572,7 @@ export default {
|
|
|
// }else if(a[k].removed == true){
|
|
|
// w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
// }else{
|
|
|
// if(k == a.length - 1){
|
|
|
// if(a[k].added == true){
|
|
|
@@ -20557,7 +20596,7 @@ export default {
|
|
|
return c;
|
|
|
};
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
mounted() {
|
|
|
document.body.addEventListener("click", (e) => {
|
|
|
@@ -23287,7 +23326,7 @@ export default {
|
|
|
.checkbox>.cb-tabList{
|
|
|
display:flex;
|
|
|
align-items:center;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
.cb-tabList>div{
|
|
|
@@ -24899,7 +24938,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;
|
|
|
}
|
|
|
@@ -24988,7 +25027,7 @@ ol {
|
|
|
}
|
|
|
|
|
|
.isUpdateToolDetailClass{
|
|
|
- padding: 0 !important;
|
|
|
+ padding: 0 !important;
|
|
|
}
|
|
|
|
|
|
.isUpdateToolDetailClass textarea{
|
|
|
@@ -25032,4 +25071,4 @@ ol {
|
|
|
background: #409eff;
|
|
|
color: #fff;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
SanHQin