update

src/components/classRoomHelper/index.vue

@@ -34,7 +34,17 @@
           </el-tooltip>
         </div>
 
-        <div @click="$emit('authority')">
+        <div @click="$emit('review')">
+          <el-tooltip class="item" effect="dark" content="评论" placement="top">
+            <img
+              :src="require('../../assets/icon/course/comment.png')"
+              alt=""
+              style="width: 22px;height: 22px;"
+            />
+          </el-tooltip>
+        </div>
+
+        <div @click="$emit('authority')" v-if="tType==1">
           <el-tooltip class="item" effect="dark" content="权限" placement="top">
             <img
               :src="require('../../assets/icon/course/setting.png')"
@@ -142,7 +152,7 @@ import searchArea from "./component/searchArea.vue";
 import taskArea from "./component/taskArea.vue";
 import dialogArea from "./component/dialogArea.vue";
 export default {
-  emits: ["refresh", "goStep", "backPage", "authority"],
+  emits: ["refresh", "goStep", "backPage", "authority", "review"],
   components: {
     searchArea,
     taskArea,
@@ -152,7 +162,11 @@ export default {
     courseDetail: {
       type: Object,
       default: () => {}
-    }
+    },
+		tType:{
+			type:Number,
+			default:0,
+		}
   },
   data() {
     return {
@@ -205,6 +219,7 @@ export default {
   right: 20px;
   overflow: hidden;
   display: flex;
+  top: 20px;
 }
 
 .ch_nav_box {

src/components/easy2/studyStudent.vue

@@ -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) => {

src/components/easy3/studyStudent.vue

@@ -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,8 @@
               </div>
             </el-tooltip>
           </div>
-          <div class="btnAll">
+					<!-- v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'" -->
+          <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">
@@ -8028,6 +8028,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="3" @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()"
@@ -8037,7 +8054,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">
@@ -11872,6 +11889,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) => {
@@ -11945,7 +11963,8 @@ export default {
     EnglishVoice,
     checkEnglishVoice,
 		correctText,
-		scoreItem
+		scoreItem,
+		classRoomHelper
   },
   data() {
     return {
@@ -12311,6 +12330,7 @@ export default {
 				listdata:[],
 				isScoreList:[],	
 			},
+			classRoomHelperWidth: '85px'
     };
   },
   methods: {
@@ -19823,7 +19843,10 @@ export default {
         .catch((err) => {
           console.error(err);
         });
-		}
+		},
+		setClassRoomHelperWidth(width){
+      this.classRoomHelperWidth = width
+    }
   },
   directives: {
     // 使用局部注册指令的方式
@@ -19882,6 +19905,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 = [];

src/components/studyStudent.vue

@@ -257,7 +257,7 @@
               </div>
             </el-tooltip>
           </div>
-          <div class="btnAll" v-show="org !== '1973f6c7-1561-11ee-91d8-005056b86db5' || org !== '777559d2-7239-11ee-b98c-005056b86db5'">
+          <div class="btnAll"  v-show="!['1973f6c7-1561-11ee-91d8-005056b86db5','777559d2-7239-11ee-b98c-005056b86db5'].includes(org)"><!--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">
@@ -8037,7 +8037,8 @@
           </div>
         </el-dialog>
       </div>
-      <classRoomHelper v-show="org == '1973f6c7-1561-11ee-91d8-005056b86db5' || org == '777559d2-7239-11ee-b98c-005056b86db5'" ref="classRoomHelperRef" :courseDetail="courseDetail" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @backPage="goTo(
+			<!-- 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='1' @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
                     '/courseDetail?userid=' +
                       userid +
                       '&oid=' +
@@ -19873,13 +19874,17 @@ export default {
       };
     },
 		commentRight(){
-			if(this.$refs["classRoomHelperRef"].type==0){
-				return "100px";
-			}else if(this.$refs["classRoomHelperRef"].type==1){
-				return "502px"
-			}else{
-				return "0px"
+			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 () {