|
|
@@ -10,8 +10,7 @@
|
|
|
box-sizing: border-box;
|
|
|
"
|
|
|
>
|
|
|
- <div class="btnAllNT">
|
|
|
- <!-- <img src="../../assets/icon/learn/screen.png" @click="allScrell" /> -->
|
|
|
+ <!-- <div class="btnAllNT">
|
|
|
<img
|
|
|
v-if="
|
|
|
courseDetail.userid == userid ||
|
|
|
@@ -51,7 +50,7 @@
|
|
|
)
|
|
|
"
|
|
|
/>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div
|
|
|
class="pButton"
|
|
|
style="left: 0; top: 140px"
|
|
|
@@ -225,9 +224,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="body_student" :class="{ navLeftCss: !mlDialog }">
|
|
|
- <div class="new_topFixed"></div>
|
|
|
- <div class="new_top" :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
|
|
|
@@ -245,7 +244,7 @@
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
- <div class="btnAll">
|
|
|
+ <div class="btnAll" v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(org)">
|
|
|
<div class="btnLeft">
|
|
|
<el-tooltip effect="light" content="刷新" placement="top">
|
|
|
<div class="reBtnIcon" @click="refreshCourse">
|
|
|
@@ -8041,6 +8040,23 @@
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" -->
|
|
|
+ <classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" ref="classRoomHelperRef" :courseDetail="courseDetail" :tType="2" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
|
|
|
+ '/courseDetail?userid=' +
|
|
|
+ userid +
|
|
|
+ '&oid=' +
|
|
|
+ oid +
|
|
|
+ '&org=' +
|
|
|
+ org +
|
|
|
+ '&cid=' +
|
|
|
+ classId +
|
|
|
+ '&courseId=' +
|
|
|
+ id +
|
|
|
+ '&tType=' +
|
|
|
+ tType +
|
|
|
+ '&screenType=' +
|
|
|
+ screenType
|
|
|
+ )"></classRoomHelper>
|
|
|
<div
|
|
|
class="pButton"
|
|
|
@click="(pzDialog = true), selectPz()"
|
|
|
@@ -8050,7 +8066,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">
|
|
|
@@ -11881,6 +11897,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) => {
|
|
|
@@ -11954,7 +11971,8 @@ export default {
|
|
|
EnglishVoice,
|
|
|
checkEnglishVoice,
|
|
|
correctText,
|
|
|
- scoreItem
|
|
|
+ scoreItem,
|
|
|
+ classRoomHelper
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -12319,6 +12337,7 @@ export default {
|
|
|
listdata:[],
|
|
|
isScoreList:[],
|
|
|
},
|
|
|
+ classRoomHelperWidth: '85px'
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -19807,6 +19826,9 @@ export default {
|
|
|
}
|
|
|
// console.log(_url)
|
|
|
return _url
|
|
|
+ },
|
|
|
+ setClassRoomHelperWidth(width){
|
|
|
+ this.classRoomHelperWidth = width
|
|
|
}
|
|
|
},
|
|
|
directives: {
|
|
|
@@ -19866,6 +19888,19 @@ export default {
|
|
|
: "";
|
|
|
};
|
|
|
},
|
|
|
+ commentRight(){
|
|
|
+ if(!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(this.org)){
|
|
|
+ return "35px";
|
|
|
+ }
|
|
|
+ return `calc(${this.classRoomHelperWidth} + 5px)`
|
|
|
+ // 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 = [];
|
|
|
@@ -19976,7 +20011,8 @@ export default {
|
|
|
.catch((err) => {
|
|
|
console.error(err);
|
|
|
});
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
mounted() {
|
|
|
document.body.addEventListener("click", (e) => {
|
SanHQin
