|
|
@@ -240,10 +240,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- :class="{ navLeftCss: !mlDialog }" -->
|
|
|
- <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
- <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
|
|
|
- <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 20% - 47px)' : 'calc(100% - '+`${!['2'].includes(tType)?classRoomHelperWidth:'10px'}`+' - 18px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
- <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && !['2'].includes(tType) ? '100%' : 'calc(100% - 745px)'}">
|
|
|
+ <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
+ <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 20% - 40px)' : 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
|
|
|
+ <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 20% - 47px)' : 'calc(100% - '+`${(!['2'].includes(tType) || canUseCourseId.includes(id))?classRoomHelperWidth:'10px'}`+' - 18px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
+ <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid)) && (!['2'].includes(tType) || canUseCourseId.includes(id)) ? '100%' : 'calc(100% - 745px)'}">
|
|
|
<div>任务{{ taskCount + 1 }}</div>
|
|
|
<el-tooltip
|
|
|
effect="light"
|
|
|
@@ -260,7 +260,7 @@
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
- <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || ['2'].includes(tType)"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
|
|
|
+ <div class="btnAll" v-show="!orgArray.includes(org) && !oidArray.includes(oid) || (['2'].includes(tType) && !canUseCourseId.includes(id))"><!--v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'"-->
|
|
|
<div class="btnLeft">
|
|
|
<el-tooltip effect="light" content="刷新" placement="top">
|
|
|
<div class="reBtnIcon" @click="refreshCourse">
|
|
|
@@ -8133,7 +8133,7 @@
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
<!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5' || org == '884c5665-a453-46f3-b7b6-01d575290aa9'" -->
|
|
|
- <classRoomHelper v-if="!['2'].includes(tType)" @studentFreePreview="studentFreePreview" @OpenJobPreview="OpenJobPreview" :videoStart="videoStart" :IsFollow="IsFollow" :sIsOpen="sIsOpen" :IsLookOpen="IsLookOpen" :splitScreenData="splitScreenData" @splitScreenBehavior="splitScreenBehavior" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
|
|
|
+ <classRoomHelper v-if="!['2'].includes(tType) || canUseCourseId.includes(id)" @studentFreePreview="studentFreePreview" @OpenJobPreview="OpenJobPreview" :videoStart="videoStart" :IsFollow="IsFollow" :sIsOpen="sIsOpen" :IsLookOpen="IsLookOpen" :splitScreenData="splitScreenData" @splitScreenBehavior="splitScreenBehavior" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
|
|
|
'/courseDetail?userid=' +
|
|
|
userid +
|
|
|
'&oid=' +
|
|
|
@@ -9991,7 +9991,7 @@
|
|
|
<div style="height: 100%;position: relative;">
|
|
|
<el-button
|
|
|
v-if="(splitScreenData.isOpen && (splitScreenData.uid != splitScreenData.myUid))"
|
|
|
- size="medium"
|
|
|
+ size="medium"
|
|
|
type="primary"
|
|
|
@click="
|
|
|
() => {
|
|
|
@@ -11999,12 +11999,12 @@
|
|
|
<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>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -12548,7 +12548,8 @@ export default {
|
|
|
behavior:null,
|
|
|
},
|
|
|
confirmOpenDig:false,
|
|
|
- confirmOpenDigData:''
|
|
|
+ confirmOpenDigData:'',
|
|
|
+ canUseCourseId: ['bfbe1913-2f87-11ef-bf55-005056b86db5','3a64b199-d2eb-11ef-a2d1-005056b86db5', 'bb0b1995-0207-11ef-b534-005056b86db5', 'f77921c8-d2f1-11ef-a2d1-005056b86db5']
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -12860,7 +12861,7 @@ export default {
|
|
|
let scrollBody = document.querySelector('.body_student').parentElement
|
|
|
scrollBody.scrollTop = scrollBody.scrollTop - 100
|
|
|
}, 0);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
let flag = this.courseType == i;
|
|
|
let flag2 = this.taskCount == j
|
|
|
@@ -16384,7 +16385,7 @@ 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 (
|
|
|
@@ -16668,7 +16669,7 @@ export default {
|
|
|
});
|
|
|
this.fileC[i] = c.filter((el) => {
|
|
|
return el.type == 12;
|
|
|
- });
|
|
|
+ });
|
|
|
if (this.tType == 2) {
|
|
|
if (this.fileC[i].length) {
|
|
|
let yym1 = this.fileC[i].filter(e=>{
|
|
|
@@ -19859,7 +19860,7 @@ export default {
|
|
|
},
|
|
|
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;
|
|
|
@@ -19879,7 +19880,7 @@ export default {
|
|
|
_result +=e.name+','
|
|
|
})
|
|
|
this.wordCloudData = _result;
|
|
|
-
|
|
|
+
|
|
|
this.dialogVisibleWordCloud = true;
|
|
|
this.wordCloudKey += 1;
|
|
|
|
|
|
@@ -20392,11 +20393,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);
|
|
|
@@ -20427,7 +20428,7 @@ export default {
|
|
|
await this.updateSplitScreenData(1);
|
|
|
} else if (!this.splitScreenData.isOpen && data.isOpen) {
|
|
|
this.confirmOpenDig = true
|
|
|
- this.confirmOpenDigData = data
|
|
|
+ this.confirmOpenDigData = data
|
|
|
} else if (this.splitScreenData.isOpen && !data.isOpen) {
|
|
|
this.splitScreenData.isOpen = false;
|
|
|
this.splitScreenData.userId = "";
|
|
|
@@ -20466,7 +20467,7 @@ export default {
|
|
|
.then(() => {
|
|
|
if (document.fullscreenElement) {
|
|
|
this.exitFullScreen();
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
}
|
|
|
@@ -20485,7 +20486,7 @@ export default {
|
|
|
if (behavior) {
|
|
|
if (behavior.code === 99) {
|
|
|
//初始化
|
|
|
- this.fullDialogVisible = false;
|
|
|
+ this.fullDialogVisible = false;
|
|
|
if(this.$refs.choseWorksDetailDialogRef.show){
|
|
|
this.$refs.choseWorksDetailDialogRef.close();
|
|
|
}
|
|
|
@@ -20497,7 +20498,7 @@ export default {
|
|
|
//开启内容列表弹窗
|
|
|
this.checkFileFull1(behavior.form.t, behavior.form.f);
|
|
|
}else{
|
|
|
- this.fullDialogVisible = false;
|
|
|
+ this.fullDialogVisible = false;
|
|
|
}
|
|
|
if (behavior.code === 1) {
|
|
|
//关于选择题的作业详细的操作
|
|
|
@@ -20537,7 +20538,7 @@ export default {
|
|
|
|
|
|
// console.log('behavior.form',behavior.form.courseType,behavior.form.taskCount,behavior.form.toolType);
|
|
|
// console.log('666666',this.courseType,this.taskCount,this.toolindex);
|
|
|
-
|
|
|
+
|
|
|
if (behavior.form.courseType != this.courseType ||
|
|
|
behavior.form.taskCount != this.taskCount ||
|
|
|
behavior.form.toolType != this.toolindex
|
|
|
@@ -20575,7 +20576,7 @@ export default {
|
|
|
}
|
|
|
this.setContent2(false)
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
} else {
|
|
|
}
|
