11wqe1 1 月之前
父節點
當前提交
b4935ac55d

+ 8 - 8
src/components/easy2/studyStudent.vue

@@ -258,9 +258,9 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <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% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }"></div>
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
             <el-tooltip
@@ -20795,9 +20795,9 @@ export default {
             this.joinGroup(gindex);
             this.joinGroup(gindex);
           }
           }
           this.worksStudent = _worksStudent;
           this.worksStudent = _worksStudent;
-          if (
-            JSON.stringify(this.worksStudentCopy) !=
-            JSON.stringify(this.worksStudent)
+          if (((this.worksStudentCopy == 0) &&
+            (this.worksStudent.length != 0)) ||
+            (this.worksStudentCopy[this.taskCount].length != this.worksStudent[this.taskCount].length)
           ) {
           ) {
             console.log("88888999999");
             console.log("88888999999");
             this.worksStudentCopy = this.worksStudent;
             this.worksStudentCopy = this.worksStudent;
@@ -26448,7 +26448,7 @@ export default {
     this.getHomeWork();
     this.getHomeWork();
     this.selectUser();
     this.selectUser();
     this.getAIJ();
     this.getAIJ();
-    this.contentDialog = true;
+    this.contentDialog = false;
     this.setContent2(true);
     this.setContent2(true);
     if (this.tType == 4) {
     if (this.tType == 4) {
       this.pzDialog = true;
       this.pzDialog = true;
@@ -26545,7 +26545,7 @@ export default {
 }
 }
 
 
 .pb_left {
 .pb_left {
-  width: 20%;
+  width: 15%;
   margin-right: 10px;
   margin-right: 10px;
   background: rgb(255, 255, 255);
   background: rgb(255, 255, 255);
   position: fixed;
   position: fixed;

+ 5 - 5
src/components/easy3/studyStudent.vue

@@ -235,9 +235,9 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <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% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }"></div>
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
             <el-tooltip
@@ -21779,7 +21779,7 @@ export default {
     this.getHomeWork();
     this.getHomeWork();
     this.selectUser();
     this.selectUser();
 		this.getAIJ();
 		this.getAIJ();
-    this.contentDialog = true;
+    this.contentDialog = false;
     this.setContent2(true);
     this.setContent2(true);
     if (this.tType == 4) {
     if (this.tType == 4) {
       this.pzDialog = true;
       this.pzDialog = true;
@@ -21877,7 +21877,7 @@ export default {
 }
 }
 
 
 .pb_left {
 .pb_left {
-  width: 20%;
+  width: 15%;
   margin-right: 10px;
   margin-right: 10px;
   background: rgb(255, 255, 255);
   background: rgb(255, 255, 255);
   position: fixed;
   position: fixed;

+ 5 - 5
src/components/studyStudent.vue

@@ -241,9 +241,9 @@
         </div>
         </div>
       </div>
       </div>
       <!-- :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% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }"></div>
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
             <el-tooltip
@@ -21715,7 +21715,7 @@ export default {
 		this.updateSplitScreenData(2);
 		this.updateSplitScreenData(2);
 		this.splitScreenData.myUid = uuidv4();
 		this.splitScreenData.myUid = uuidv4();
 
 
-    this.contentDialog = true;
+    this.contentDialog = false;
     this.setContent2(true);
     this.setContent2(true);
     if (this.tType == 4) {
     if (this.tType == 4) {
       this.pzDialog = true;
       this.pzDialog = true;
@@ -21822,7 +21822,7 @@ export default {
 }
 }
 
 
 .pb_left {
 .pb_left {
-  width: 20%;
+  width: 15%;
   margin-right: 10px;
   margin-right: 10px;
   background: rgb(255, 255, 255);
   background: rgb(255, 255, 255);
   position: fixed;
   position: fixed;

+ 10 - 8
src/components/studySutdentClass/studyStudent.vue

@@ -235,9 +235,9 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <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% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(20% + 35px)' : '10px' }">
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
+        <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 40px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 10px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }"></div>
+        <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+`${classRoomHelperWidth}`+' - 15% - 47px)' : 'calc(100% - '+`${classRoomHelperWidth}`+' - 18px)', left: mlDialog  ? 'calc(15% + 35px)' : '10px' }">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
           <div class="courseIndex" :style="{width: (orgArray.includes(org) || oidArray.includes(oid))? '100%' : 'calc(100% - 745px)'}">
             <div>任务{{ taskCount + 1 }}</div>
             <div>任务{{ taskCount + 1 }}</div>
             <el-tooltip
             <el-tooltip
@@ -20273,9 +20273,11 @@ export default {
             this.joinGroup(gindex);
             this.joinGroup(gindex);
           }
           }
           this.worksStudent = _worksStudent;
           this.worksStudent = _worksStudent;
-          if (
-            JSON.stringify(this.worksStudentCopy) !=
-            JSON.stringify(this.worksStudent)
+          if ((
+            (this.worksStudentCopy == 0) &&
+            (this.worksStudent.length != 0)) ||
+            (this.worksStudentCopy[this.taskCount].length !=
+            this.worksStudent[this.taskCount].length)
           ) {
           ) {
             console.log("88888999999");
             console.log("88888999999");
             this.worksStudentCopy = this.worksStudent;
             this.worksStudentCopy = this.worksStudent;
@@ -25823,7 +25825,7 @@ export default {
     this.getHomeWork();
     this.getHomeWork();
     this.selectUser();
     this.selectUser();
 		this.getAIJ();
 		this.getAIJ();
-    this.contentDialog = true;
+    this.contentDialog = false;
     this.setContent2(true);
     this.setContent2(true);
     if (this.tType == 4) {
     if (this.tType == 4) {
       this.pzDialog = true;
       this.pzDialog = true;
@@ -25921,7 +25923,7 @@ export default {
 }
 }
 
 
 .pb_left {
 .pb_left {
-  width: 20%;
+  width: 15%;
   margin-right: 10px;
   margin-right: 10px;
   background: rgb(255, 255, 255);
   background: rgb(255, 255, 255);
   position: fixed;
   position: fixed;