|
|
@@ -10,7 +10,7 @@
|
|
|
box-sizing: border-box;
|
|
|
"
|
|
|
>
|
|
|
- <div class="btnAllNT">
|
|
|
+ <div class="btnAllNT" v-if="false">
|
|
|
<!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
|
|
|
<img
|
|
|
v-if="
|
|
|
@@ -236,9 +236,10 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="body_student" :class="{ navLeftCss: !mlDialog }">
|
|
|
- <div class="new_topFixed"></div>
|
|
|
- <div class="new_top" :class="{ navLeftCss: !mlDialog }">
|
|
|
+ <!-- :class="{ navLeftCss: !mlDialog }" -->
|
|
|
+ <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
+ <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
|
|
|
+ <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
|
|
|
<div class="courseIndex">
|
|
|
<div>任务{{ taskCount + 1 }}</div>
|
|
|
<el-tooltip
|
|
|
@@ -8036,6 +8037,22 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
+ <classRoomHelper ref="classRoomHelperRef" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @backPage="goTo(
|
|
|
+ '/courseDetail?userid=' +
|
|
|
+ userid +
|
|
|
+ '&oid=' +
|
|
|
+ oid +
|
|
|
+ '&org=' +
|
|
|
+ org +
|
|
|
+ '&cid=' +
|
|
|
+ classId +
|
|
|
+ '&courseId=' +
|
|
|
+ id +
|
|
|
+ '&tType=' +
|
|
|
+ tType +
|
|
|
+ '&screenType=' +
|
|
|
+ screenType
|
|
|
+ )"></classRoomHelper>
|
|
|
</div>
|
|
|
<div
|
|
|
class="pButton"
|
|
|
@@ -8046,7 +8063,7 @@
|
|
|
<!-- 批 -->
|
|
|
<img src="../assets/mlBtn.png" style="width: 25px" alt="" />
|
|
|
</div>
|
|
|
- <div v-if="pzDialog == true" class="newDialogCss">
|
|
|
+ <div v-if="pzDialog == true" class="newDialogCss" :style="`right:${commentRight}`">
|
|
|
<div class="pzTop2">
|
|
|
<!-- <div>评论</div>
|
|
|
<div @click="pzDialog = false">
|
|
|
@@ -11853,6 +11870,7 @@ import EnglishVoice from './EnglishVoice2/index.vue'
|
|
|
import checkEnglishVoice from './checkEnglishVoice/index.vue'
|
|
|
import correctText from './components/correctText.vue'
|
|
|
import scoreItem from './scoreList/scoreItem.vue'
|
|
|
+import classRoomHelper from './classRoomHelper/index.vue'
|
|
|
|
|
|
const getFile = (url) => {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
@@ -11926,7 +11944,8 @@ export default {
|
|
|
EnglishVoice,
|
|
|
checkEnglishVoice,
|
|
|
correctText,
|
|
|
- scoreItem
|
|
|
+ scoreItem,
|
|
|
+ classRoomHelper
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -12290,6 +12309,7 @@ export default {
|
|
|
listdata:[],
|
|
|
isScoreList:[],
|
|
|
},
|
|
|
+ classRoomHelperWidth: '85px'
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -12725,6 +12745,7 @@ export default {
|
|
|
} else if (document.querySelector(".workd_media")) {
|
|
|
document.querySelector(".workd_media").style.height = "auto";
|
|
|
}
|
|
|
+ this.$forceUpdate();
|
|
|
},
|
|
|
openToolAll() {
|
|
|
this.toolDialogVisible = true;
|
|
|
@@ -16074,7 +16095,7 @@ export default {
|
|
|
}, 0)
|
|
|
})
|
|
|
}
|
|
|
- this.showType = 7;
|
|
|
+ this.showType = 0;
|
|
|
this.isNoHomeWork = false;
|
|
|
(this.studyJuri = [
|
|
|
{
|
|
|
@@ -19792,7 +19813,10 @@ export default {
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
});
|
|
|
- }
|
|
|
+ },
|
|
|
+ setClassRoomHelperWidth(width){
|
|
|
+ this.classRoomHelperWidth = width
|
|
|
+ }
|
|
|
},
|
|
|
directives: {
|
|
|
// 使用局部注册指令的方式
|
|
|
@@ -19848,6 +19872,15 @@ export default {
|
|
|
: "";
|
|
|
};
|
|
|
},
|
|
|
+ commentRight(){
|
|
|
+ if(this.$refs["classRoomHelperRef"].type==0){
|
|
|
+ return "100px";
|
|
|
+ }else if(this.$refs["classRoomHelperRef"].type==1){
|
|
|
+ return "502px"
|
|
|
+ }else{
|
|
|
+ return "0px"
|
|
|
+ }
|
|
|
+ },
|
|
|
checkUpload() {
|
|
|
return function () {
|
|
|
var studentK = [];
|
