Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta'

lsc 4 weeks ago
parent
e6f2d52113 fdb8f41b9b
commit
cd7d3d0308
12 changed files with 441 additions and 137 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css
  3. 0 0
      dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css.map
  4. 0 0
      dist/static/js/app.440dad95a023c74b2e6b.js
  5. 0 0
      dist/static/js/app.440dad95a023c74b2e6b.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 0 1
      src/components/easy2/commpont/evaTable.vue
  8. 143 50
      src/components/easy2/studyStudent.vue
  9. 80 15
      src/components/easy3/studyStudent.vue
  10. 93 28
      src/components/studyStudent.vue
  11. 0 1
      src/components/studySutdentClass/commpont/evaTable.vue
  12. 124 41
      src/components/studySutdentClass/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     html,
 
     body{
 
     body{
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.00b5e5de0884ec27761b8ba1425aa12c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.5e46eaca16c640c0bbf5.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.04e80e5412965b9c726e0d5de9477644.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.440dad95a023c74b2e6b.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.440dad95a023c74b2e6b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.440dad95a023c74b2e6b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 0 - 1
src/components/easy2/commpont/evaTable.vue
View File 

@@ -4,7 +4,6 @@
 
         <el-table
 
         <el-table
 
           :data="eList"
 
           :data="eList"
 
           :header-cell-style="{ background: '#F0F4FA' }"
 
           :header-cell-style="{ background: '#F0F4FA' }"
 
-          :row-class-name="tableRowClassName"
 
           border
 
           border
 
           stripe
 
           stripe
 
           style="width: 100%"
 
           style="width: 100%"

+ 143 - 50
src/components/easy2/studyStudent.vue
View File 

@@ -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
 
@@ -485,10 +485,10 @@
 
           <div
 
           <div
 
             class="vedioBox"
 
             class="vedioBox"
 
             v-if="
 
             v-if="
 
-              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+              (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                 .taskDetail != '' ||
 
                 .taskDetail != '' ||
 
                 vChapterData[taskCount].length > 0 ||
 
                 vChapterData[taskCount].length > 0 ||
 
-                fileC[taskCount].length > 0
 
+                fileC[taskCount].length > 0) && (tType == 1 || (tType == 2 && IsStulook))
 
             "
 
             "
 
             style="border-radius: 0 0 20px 20px"
 
             style="border-radius: 0 0 20px 20px"
 
           >
 
           >
 
@@ -13492,6 +13492,15 @@
 
               @change="updateFollow"
 
               @change="updateFollow"
 
             ></el-switch>
 
             ></el-switch>
 
           </div>
 
           </div>
 
+          <div class="switch_box" v-if="courseDetail.userid == userid">
 
+            <span>允许学生查看内容资料</span>
 
+            <el-switch
 
+              v-model="IsStulook"
 
+              active-text=""
 
+              class="switchCss"
 
+              @change="updateIsStulook"
 
+            ></el-switch>
 
+          </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div slot="footer">
 
       <div slot="footer">
 
@@ -16370,6 +16379,8 @@ export default {
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
+      // 是否允许学生查看内容资料 2不可以 1可以
 
+      IsStulook:false,
 
       homeWorkLoading:false,
 
       homeWorkLoading:false,
 
       wordCloudKey: 0,
 
       wordCloudKey: 0,
 
       bg: null,
 
       bg: null,
 
@@ -16756,6 +16767,7 @@ export default {
 
       oidArray: [],
 
       oidArray: [],
 
       refreshKey: 0,
 
       refreshKey: 0,
 
       AIloading: [],
 
       AIloading: [],
 
+      // 为了刷新ai评分loading的时候用的
 
       worksStudentCopy: [],
 
       worksStudentCopy: [],
 
       loopLoading: [],
 
       loopLoading: [],
 
       markScoreVisible: false,
 
       markScoreVisible: false,
 
@@ -16785,6 +16797,48 @@ export default {
 
       diffKey:"1"
 
       diffKey:"1"
 
     };
 
     };
 
   },
 
   },
 
+  watch:{
 
+    taskCount(newVal) {
 
+        console.log('newVal',newVal);
 
+        this.AIloading = [];
 
+        this.loopLoading = [];
 
+
 
+        this.worksStudent.forEach((e, index) => {
 
+          this.loopLoading.push({ loading: false });
 
+          this.AIloading.push([]);
 
+          e.forEach(k => {
 
+            this.AIloading[index].push({ loading: false, sco: 0 });
 
+          });
 
+        });    
+        if(this.tType == 1){
 
+          this.refreshAssembly();
 
+        }    
+    },
 
+    worksStudent: {
 
+      handler(newVal, oldVal) {
 
+          const sum1 = newVal.reduce((total, subArr) => total + subArr.length, 0);
 
+          const sum2 = oldVal.reduce((total, subArr) => total + subArr.length, 0);
 
+          // console.log('worksStudent',sum1,sum2);
 
+          
+          if(sum1 != sum2){
 
+              this.AIloading = [];
 
+              this.loopLoading = [];
 
+
 
+              this.worksStudent.forEach((e, index) => {
 
+                this.loopLoading.push({ loading: false });
 
+                this.AIloading.push([]);
 
+                e.forEach(k => {
 
+                  this.AIloading[index].push({ loading: false, sco: 0 });
 
+                });
 
+              });
 
+              if(this.tType == 1){
 
+                this.refreshAssembly();
 
+              }
 
+          }
 
+      },
 
+      deep:true,
 
+    }
 
+  },
 
   methods: {
 
   methods: {
 
     getAIJ() {
 
     getAIJ() {
 
       this.ajax.get(this.$store.state.api + "getAIJ", "").then(res => {
 
       this.ajax.get(this.$store.state.api + "getAIJ", "").then(res => {
 
@@ -16887,7 +16941,6 @@ export default {
 
       }
 
       }
 
 
 
       this.$message.success("重置完成");
 
       this.$message.success("重置完成");
 
-      // this.refreshAssembly();
 
 
 
       this.worksStudent.forEach((e, index) => {
 
       this.worksStudent.forEach((e, index) => {
 
         if (toolIndex == index) {
 
         if (toolIndex == index) {
 
@@ -17370,9 +17423,8 @@ export default {
 
       });
 
       });
 
     },
 
     },
 
     // 组件刷新
 
     // 组件刷新
 
-    refreshAssembly(val) {
 
+    refreshAssembly() {
 
       this.refreshKey++;
 
       this.refreshKey++;
 
-      // console.log(this.refreshKey)
 
     },
 
     },
 
     updateLoading(payload) {
 
     updateLoading(payload) {
 
       this.AIloading[payload.val][payload.val2].loading = payload.val3;
 
       this.AIloading[payload.val][payload.val2].loading = payload.val3;
 
@@ -17710,7 +17762,7 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     jumpGj(i, j, k, l) {
 
     jumpGj(i, j, k, l) {
 
-      this.refreshAssembly();
 
+      // this.refreshAssembly();
 
       for (var z = 0; z < this.navList.length; z++) {
 
       for (var z = 0; z < this.navList.length; z++) {
 
         for (var q = 0; q < this.navList[z].task.length; q++) {
 
         for (var q = 0; q < this.navList[z].task.length; q++) {
 
           for (var w = 0; w < this.navList[z].task[q].tool.length; w++) {
 
           for (var w = 0; w < this.navList[z].task[q].tool.length; w++) {
 
@@ -20795,24 +20847,14 @@ export default {
 
             this.joinGroup(gindex);
 
             this.joinGroup(gindex);
 
           }
 
           }
 
           this.worksStudent = _worksStudent;
 
           this.worksStudent = _worksStudent;
 
-          if (
 
-            JSON.stringify(this.worksStudentCopy) !=
 
-            JSON.stringify(this.worksStudent)
 
-          ) {
 
-            console.log("88888999999");
 
-            this.worksStudentCopy = this.worksStudent;
 
-            this.AIloading = [];
 
-            this.loopLoading = [];
 
-
 
-            this.worksStudent.forEach((e, index) => {
 
-              this.loopLoading.push({ loading: false });
 
-              this.AIloading.push([]);
 
-              e.forEach(k => {
 
-                this.AIloading[index].push({ loading: false, sco: 0 });
 
-              });
 
-            });
 
-            this.refreshAssembly();
 
-          }
 
+
 
+          // if (((this.worksStudentCopy.length == 0) &&
 
+          //   (this.worksStudent.length != 0)) ||
 
+          //   (this.worksStudentCopy[this.taskCount].length != this.worksStudent[this.taskCount].length)
 
+          // ) {
 
+          //   this.worksStudentCopy = this.worksStudent;
 
+           
+          // }
 
           this.selectWorksStudent();
 
           this.selectWorksStudent();
 
           for (let ci = 0; ci < this.isCloseList.length; ci++) {
 
           for (let ci = 0; ci < this.isCloseList.length; ci++) {
 
             this.$nextTick(() => {
 
             this.$nextTick(() => {
 
@@ -21588,7 +21630,6 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     openTask(s, n, i) {
 
     openTask(s, n, i) {
 
-      this.refreshAssembly();
 
       if (this.IsFollow && this.tType == 2) {
 
       if (this.IsFollow && this.tType == 2) {
 
         this.$message.error("已经开启跟随模式，请认真跟堂听讲");
 
         this.$message.error("已经开启跟随模式，请认真跟堂听讲");
 
         return;
 
         return;
 
@@ -22310,6 +22351,21 @@ export default {
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           // }
 
           // }
 
 
 
+          // 判断进入课程是否是创建老师，如果去创建老师，就自动开启下面两个按钮
 
+          if (type == 10) {
 
+            console.log('this.courseDetail.userid',this.courseDetail.userid);
 
+            console.log('this.userid',this.userid);
 
+
 
+            
+            if (this.courseDetail.userid == this.userid) {
 
+            
+              // 开局关闭学生查看内容
 
+              this.StulookMode(false)
 
+              // 开局打开跟随模式
 
+              this.followingMode(true)
 
+            }
 
+          }
 
+
 
           let _this = this;
 
           let _this = this;
 
           if (_this.timer) {
 
           if (_this.timer) {
 
             clearInterval(_this.timer);
 
             clearInterval(_this.timer);
 
@@ -22693,6 +22749,35 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
+    updateIsStulook(){
 
+      let params = [
 
+        {
 
+          sopen: this.IsStulook == false ? 2 : 1,
 
+          cid: this.id
 
+        }
 
+      ];
 
+
 
+      this.ajax
 
+        .post(this.$store.state.api + "updateCourseStulook", params)
 
+        .then(res => {
 
+          
+          if (this.IsStulook == true) {
 
+            this.$message({
 
+              message: "学生查看内容资料权限已开启",
 
+              type: "success"
 
+            });
 
+          } else {
 
+            this.$message({
 
+              message: "关闭学生查看内容资料权限",
 
+              type: "success"
 
+            });
 
+          }
 
+          // this.setCTask();
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     updateFollow() {
 
     updateFollow() {
 
       let params = [
 
       let params = [
 
         {
 
         {
 
@@ -22705,12 +22790,12 @@ export default {
 
         .then(res => {
 
         .then(res => {
 
           if (this.IsFollow == true) {
 
           if (this.IsFollow == true) {
 
             this.$message({
 
             this.$message({
 
-              message: "开启成功",
 
+              message: "跟随模式已开启",
 
               type: "success"
 
               type: "success"
 
             });
 
             });
 
           } else {
 
           } else {
 
             this.$message({
 
             this.$message({
 
-              message: "关闭成功",
 
+              message: "跟随模式已关闭",
 
               type: "success"
 
               type: "success"
 
             });
 
             });
 
           }
 
           }
 
@@ -22774,6 +22859,7 @@ export default {
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
+          this.IsStulook = res.data[0][0].isStulook == 2 ? false : true;
 
           if (!this.IsLookOpen) {
 
           if (!this.IsLookOpen) {
 
             this.setNavList();
 
             this.setNavList();
 
           }else {
 
           }else {
 
@@ -24798,8 +24884,9 @@ export default {
 
           document.getElementsByClassName("navBox")[0].style.height =
 
           document.getElementsByClassName("navBox")[0].style.height =
 
             a - 40 + 0 + "px";
 
             a - 40 + 0 + "px";
 
         } else {
 
         } else {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+              document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
+          }
 
         }
 
         }
 
       }
 
       }
 
       this.Stbodywidth =
 
       this.Stbodywidth =
 
@@ -26146,6 +26233,25 @@ export default {
 
     followingMode(flag) {
 
     followingMode(flag) {
 
       this.IsFollow = flag;
 
       this.IsFollow = flag;
 
       this.updateFollow();
 
       this.updateFollow();
 
+    },
 
+    StulookMode(flag) {
 
+      this.IsStulook = flag;
 
+      this.updateIsStulook();
 
+    },
 
+    getScoreList() {
 
+      let params = {
 
+        cid: this.id
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectTestCourseByCid", params)
 
+        .then(res => {
 
+          let result = res.data;
 
+          this.scoreList.datalist = result[0];
 
+          this.scoreList.isScoreList = result[1];
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
     }
 
     }
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -26403,23 +26509,10 @@ export default {
 
         return c;
 
         return c;
 
       };
 
       };
 
     },
 
     },
 
-    getScoreList() {
 
-      let params = {
 
-        cid: this.id
 
-      };
 
-      this.ajax
 
-        .get(this.$store.state.api + "selectTestCourseByCid", params)
 
-        .then(res => {
 
-          let result = res.data;
 
-          this.scoreList.datalist = result[0];
 
-          this.scoreList.isScoreList = result[1];
 
-        })
 
-        .catch(err => {
 
-          console.error(err);
 
-        });
 
-    }
 
+    
   },
 
   },
 
   mounted() {
 
   mounted() {
 
+
 
     this.updateSplitScreenData(2);
 
     this.updateSplitScreenData(2);
 
     this.splitScreenData.myUid = uuidv4();
 
     this.splitScreenData.myUid = uuidv4();
 
     document.body.addEventListener("click", e => {
 
     document.body.addEventListener("click", e => {
 
@@ -26443,12 +26536,12 @@ export default {
 
 
 
     this.setOperationTime();
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.selectEva();
 
-    this.getCourseDetail();
 
+    this.getCourseDetail(10);
 
     this.selectCount();
 
     this.selectCount();
 
     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 +26638,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;

+ 80 - 15
src/components/easy3/studyStudent.vue
View File 

@@ -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
 
@@ -462,10 +462,10 @@
 
           <div
 
           <div
 
             class="vedioBox"
 
             class="vedioBox"
 
             v-if="
 
             v-if="
 
-              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+              (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                 .taskDetail != '' ||
 
                 .taskDetail != '' ||
 
               vChapterData[0].length > 0 ||
 
               vChapterData[0].length > 0 ||
 
-              fileC[0].length > 0
 
+              fileC[0].length > 0) && (tType == 1 || (tType == 2 && IsStulook))
 
             "
 
             "
 
             style="border-radius: 0 0 20px 20px"
 
             style="border-radius: 0 0 20px 20px"
 
           >
 
           >
 
@@ -10124,6 +10124,15 @@
 
               @change="updateFollow"
 
               @change="updateFollow"
 
             ></el-switch>
 
             ></el-switch>
 
           </div>
 
           </div>
 
+          <div class="switch_box" v-if="courseDetail.userid == userid">
 
+            <span>允许学生查看内容资料</span>
 
+            <el-switch
 
+              v-model="IsStulook"
 
+              active-text=""
 
+              class="switchCss"
 
+              @change="updateIsStulook"
 
+            ></el-switch>
 
+          </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div slot="footer">
 
       <div slot="footer">
 
@@ -12714,6 +12723,8 @@ export default {
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
+      // 是否允许学生查看内容资料 2不可以 1可以
 
+      IsStulook:false,
 
       homeWorkLoading:false,
 
       homeWorkLoading:false,
 
 			toolsList: toolsList,
 
 			toolsList: toolsList,
 
       wordCloudKey: 0,
 
       wordCloudKey: 0,
 
@@ -17737,7 +17748,20 @@ export default {
 
           //   this.courseDetail = res.data[0][0];
 
           //   this.courseDetail = res.data[0][0];
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           // }
 
           // }
 
-
 
+           // 判断进入课程是否是创建老师，如果去创建老师，就自动开启下面两个按钮
 
+          if (type == 10) {
 
+            console.log('this.courseDetail.userid',this.courseDetail.userid);
 
+            console.log('this.userid',this.userid);
 
+
 
+            
+            if (this.courseDetail.userid == this.userid) {
 
+            
+              // 开局关闭学生查看内容
 
+              this.StulookMode(false)
 
+              // 开局打开跟随模式
 
+              this.followingMode(true)
 
+            }
 
+          }
 
           let _this = this;
 
           let _this = this;
 
           if (_this.timer) {
 
           if (_this.timer) {
 
             clearInterval(_this.timer);
 
             clearInterval(_this.timer);
 
@@ -18120,6 +18144,35 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
+    updateIsStulook(){
 
+      let params = [
 
+        {
 
+          sopen: this.IsStulook == false ? 2 : 1,
 
+          cid: this.id
 
+        }
 
+      ];
 
+
 
+      this.ajax
 
+        .post(this.$store.state.api + "updateCourseStulook", params)
 
+        .then(res => {
 
+          
+          if (this.IsStulook == true) {
 
+            this.$message({
 
+              message: "学生查看内容资料权限已开启",
 
+              type: "success"
 
+            });
 
+          } else {
 
+            this.$message({
 
+              message: "关闭学生查看内容资料权限",
 
+              type: "success"
 
+            });
 
+          }
 
+          // this.setCTask();
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     updateFollow() {
 
     updateFollow() {
 
       let params = [
 
       let params = [
 
         {
 
         {
 
@@ -18132,12 +18185,12 @@ export default {
 
         .then((res) => {
 
         .then((res) => {
 
           if (this.IsFollow == true) {
 
           if (this.IsFollow == true) {
 
             this.$message({
 
             this.$message({
 
-              message: "开启成功",
 
+              message: "跟随模式已开启",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           } else {
 
           } else {
 
             this.$message({
 
             this.$message({
 
-              message: "关闭成功",
 
+              message: "跟随模式已关闭",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           }
 
           }
 
@@ -18201,6 +18254,7 @@ export default {
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
+          this.IsStulook = res.data[0][0].isStulook == 2 ? false : true;
 
           if (!this.IsLookOpen) {
 
           if (!this.IsLookOpen) {
 
             this.setNavList();
 
             this.setNavList();
 
           }else {
 
           }else {
 
@@ -20198,8 +20252,9 @@ export default {
 
           document.getElementsByClassName("navBox")[0].style.height =
 
           document.getElementsByClassName("navBox")[0].style.height =
 
             a - 40 + 0+ "px";
 
             a - 40 + 0+ "px";
 
         } else {
 
         } else {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+              document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
+          }
 
         }
 
         }
 
       }
 
       }
 
       this.Stbodywidth =
 
       this.Stbodywidth =
 
@@ -21503,6 +21558,10 @@ export default {
 
     followingMode(flag) {
 
     followingMode(flag) {
 
       this.IsFollow = flag;
 
       this.IsFollow = flag;
 
       this.updateFollow();
 
       this.updateFollow();
 
+    },
 
+    StulookMode(flag) {
 
+      this.IsStulook = flag;
 
+      this.updateIsStulook();
 
     }
 
     }
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -21756,6 +21815,12 @@ export default {
 
 
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
+    if (this.tType == 1) {
 
+       // 开局关闭学生查看内容
 
+      this.StulookMode(false)
 
+      // 开局打开跟随模式
 
+      this.followingMode(true)
 
+    }
 
     document.body.addEventListener("click", (e) => {
 
     document.body.addEventListener("click", (e) => {
 
       if (this.isUpdateToolDetail1) {
 
       if (this.isUpdateToolDetail1) {
 
         this.updateToolDetail(this.toolDetailIndex);
 
         this.updateToolDetail(this.toolDetailIndex);
 
@@ -21774,12 +21839,12 @@ export default {
 
     }
 
     }
 
     this.setOperationTime();
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.selectEva();
 
-    this.getCourseDetail();
 
+    this.getCourseDetail(10);
 
     this.selectCount();
 
     this.selectCount();
 
     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 +21942,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;
 
@@ -25717,7 +25782,7 @@ ol {
 
   width: 100%;
 
   width: 100%;
 
 }
 
 }
 
 
 
-.toolChild > div::before {
 
+/* .toolChild > div::before { */
 
   /* content: "";
 
   /* content: "";
 
   width: 15px;
 
   width: 15px;
 
   height: 1px;
 
   height: 1px;
 
@@ -25726,7 +25791,7 @@ ol {
 
   top: 24px;
 
   top: 24px;
 
   left: -20px;
 
   left: -20px;
 
   display: block; */
 
   display: block; */
 
-}
 
+/* } */
 
 
 
 .isGjCss {
 
 .isGjCss {
 
   /* color: #0061ff; */
 
   /* color: #0061ff; */

+ 93 - 28
src/components/studyStudent.vue
View File 

@@ -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
 
@@ -463,10 +463,10 @@
 
           <div
 
           <div
 
             class="vedioBox"
 
             class="vedioBox"
 
             v-if="
 
             v-if="
 
-              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+              (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                 .taskDetail != '' ||
 
                 .taskDetail != '' ||
 
               vChapterData[taskCount].length > 0 ||
 
               vChapterData[taskCount].length > 0 ||
 
-              fileC[taskCount].length > 0
 
+              fileC[taskCount].length > 0) && (tType == 1 || (tType == 2 && IsStulook))
 
             "
 
             "
 
             style="border-radius: 0 0 20px 20px"
 
             style="border-radius: 0 0 20px 20px"
 
           >
 
           >
 
@@ -10060,6 +10060,15 @@
 
               @change="updateFollow"
 
               @change="updateFollow"
 
             ></el-switch>
 
             ></el-switch>
 
           </div>
 
           </div>
 
+          <div class="switch_box" v-if="courseDetail.userid == userid">
 
+            <span>允许学生查看内容资料</span>
 
+            <el-switch
 
+              v-model="IsStulook"
 
+              active-text=""
 
+              class="switchCss"
 
+              @change="updateIsStulook"
 
+            ></el-switch>
 
+          </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div slot="footer">
 
       <div slot="footer">
 
@@ -12651,6 +12660,8 @@ export default {
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
+      // 是否允许学生查看内容资料 2不可以 1可以
 
+      IsStulook:false,
 
       homeWorkLoading:false,
 
       homeWorkLoading:false,
 
       wordCloudKey: 0,
 
       wordCloudKey: 0,
 
       bg: null,
 
       bg: null,
 
@@ -17679,7 +17690,20 @@ export default {
 
           //   this.courseDetail = res.data[0][0];
 
           //   this.courseDetail = res.data[0][0];
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           //   this.chapInfoList = JSON.parse(this.courseDetail.chapters);
 
           // }
 
           // }
 
-
 
+          // 判断进入课程是否是创建老师，如果去创建老师，就自动开启下面两个按钮
 
+          if (type == 10) {
 
+            console.log('this.courseDetail.userid',this.courseDetail.userid);
 
+            console.log('this.userid',this.userid);
 
+
 
+            
+            if (this.courseDetail.userid == this.userid) {
 
+            
+              // 开局关闭学生查看内容
 
+              this.StulookMode(false)
 
+              // 开局打开跟随模式
 
+              this.followingMode(true)
 
+            }
 
+          }
 
           let _this = this;
 
           let _this = this;
 
           if (_this.timer) {
 
           if (_this.timer) {
 
             clearInterval(_this.timer);
 
             clearInterval(_this.timer);
 
@@ -18063,6 +18087,35 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
+    updateIsStulook(){
 
+      let params = [
 
+        {
 
+          sopen: this.IsStulook == false ? 2 : 1,
 
+          cid: this.id
 
+        }
 
+      ];
 
+
 
+      this.ajax
 
+        .post(this.$store.state.api + "updateCourseStulook", params)
 
+        .then(res => {
 
+          
+          if (this.IsStulook == true) {
 
+            this.$message({
 
+              message: "学生查看内容资料权限已开启",
 
+              type: "success"
 
+            });
 
+          } else {
 
+            this.$message({
 
+              message: "关闭学生查看内容资料权限",
 
+              type: "success"
 
+            });
 
+          }
 
+          // this.setCTask();
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     updateFollow() {
 
     updateFollow() {
 
       let params = [
 
       let params = [
 
         {
 
         {
 
@@ -18075,12 +18128,12 @@ export default {
 
         .then((res) => {
 
         .then((res) => {
 
           if (this.IsFollow == true) {
 
           if (this.IsFollow == true) {
 
             this.$message({
 
             this.$message({
 
-              message: "开启成功",
 
+              message: "跟随模式已开启",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           } else {
 
           } else {
 
             this.$message({
 
             this.$message({
 
-              message: "关闭成功",
 
+              message: "跟随模式已关闭",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           }
 
           }
 
@@ -18144,6 +18197,7 @@ export default {
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
+          this.IsStulook = res.data[0][0].isStulook == 2 ? false : true;
 
           if (!this.IsLookOpen) {
 
           if (!this.IsLookOpen) {
 
             this.setNavList();
 
             this.setNavList();
 
           }else {
 
           }else {
 
@@ -20134,8 +20188,9 @@ export default {
 
           document.getElementsByClassName("navBox")[0].style.height =
 
           document.getElementsByClassName("navBox")[0].style.height =
 
             a - 40 + 0+ "px";
 
             a - 40 + 0+ "px";
 
         } else {
 
         } else {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+              document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
+          }
 
         }
 
         }
 
       }
 
       }
 
       this.Stbodywidth =
 
       this.Stbodywidth =
 
@@ -21456,7 +21511,11 @@ export default {
 
     followingMode(flag) {
 
     followingMode(flag) {
 
       this.IsFollow = flag;
 
       this.IsFollow = flag;
 
       this.updateFollow();
 
       this.updateFollow();
 
-    }
 
+    },
 
+    StulookMode(flag) {
 
+      this.IsStulook = flag;
 
+      this.updateIsStulook();
 
+    },
 
   },
 
   },
 
   directives: {
 
   directives: {
 
     // 使用局部注册指令的方式
 
     // 使用局部注册指令的方式
 
@@ -21698,6 +21757,12 @@ export default {
 
 
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
+    if (this.tType == 1) {
 
+       // 开局关闭学生查看内容
 
+      this.StulookMode(false)
 
+      // 开局打开跟随模式
 
+      this.followingMode(true)
 
+    }
 
     document.body.addEventListener("click", (e) => {
 
     document.body.addEventListener("click", (e) => {
 
       if (this.isUpdateToolDetail1) {
 
       if (this.isUpdateToolDetail1) {
 
         this.updateToolDetail(this.toolDetailIndex);
 
         this.updateToolDetail(this.toolDetailIndex);
 
@@ -21706,7 +21771,7 @@ export default {
 
 
 
     this.setOperationTime();
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.selectEva();
 
-    this.getCourseDetail();
 
+    this.getCourseDetail(10);
 
     this.selectCount();
 
     this.selectCount();
 
     this.getHomeWork();
 
     this.getHomeWork();
 
     this.selectUser();
 
     this.selectUser();
 
@@ -21715,7 +21780,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 +21887,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;
 
@@ -23566,10 +23631,10 @@ export default {
 
   justify-content: center;
 
   justify-content: center;
 
 }
 
 }
 
 
 
-.answerBg > div:nth-child(1) {
 
+/* .answerBg > div:nth-child(1) { */
 
   /* font-size: 22px;
 
   /* font-size: 22px;
 
   padding: 25px 0 10px; */
 
   padding: 25px 0 10px; */
 
-}
 
+/* } */
 
 
 
 .answerContent {
 
 .answerContent {
 
   width: 215px;
 
   width: 215px;
 
@@ -23739,8 +23804,8 @@ export default {
 
   width: 400px;
 
   width: 400px;
 
 }
 
 }
 
 
 
-.e_add_btn {
 
-}
 
+/* .e_add_btn {
 
+} */
 
 
 
 .e_add_content {
 
 .e_add_content {
 
   display: flex;
 
   display: flex;
 
@@ -25132,8 +25197,8 @@ ol {
 
   top: -25px;
 
   top: -25px;
 
 }
 
 }
 
 
 
-.group_workBox {
 
-}
 
+/* .group_workBox {
 
+} */
 
 
 
 .group_workBox + .group_workBox {
 
 .group_workBox + .group_workBox {
 
   margin-top: 20px;
 
   margin-top: 20px;
 
@@ -25256,8 +25321,8 @@ ol {
 
   border-radius: 5px;
 
   border-radius: 5px;
 
 }
 
 }
 
 
 
-.groupBox {
 
-}
 
+/* .groupBox {
 
+} */
 
 
 
 .groupContent + .groupContent {
 
 .groupContent + .groupContent {
 
   margin-top: 30px;
 
   margin-top: 30px;
 
@@ -25598,9 +25663,9 @@ ol {
 
   margin-left: 15px;
 
   margin-left: 15px;
 
   width: calc(100% - 50px);
 
   width: calc(100% - 50px);
 
 }
 
 }
 
-.stageNav{
 
+/* .stageNav{ */
 
   /* font-weight: bold; */
 
   /* font-weight: bold; */
 
-}
 
+/* } */
 
 .stageItemTitle > div:first-child {
 
 .stageItemTitle > div:first-child {
 
   min-width: 55px;
 
   min-width: 55px;
 
 }
 
 }
 
@@ -25647,11 +25712,11 @@ ol {
 
   overflow: hidden;
 
   overflow: hidden;
 
   transition: all 0.5s;
 
   transition: all 0.5s;
 
 }
 
 }
 
-.toolChild {
 
+/* .toolChild { */
 
   /* margin: 0 0 0 17px;
 
   /* margin: 0 0 0 17px;
 
   padding: 0 0 0 20px;
 
   padding: 0 0 0 20px;
 
   border-left: 1px solid #d7d7d7; */
 
   border-left: 1px solid #d7d7d7; */
 
-}
 
+/* } */
 
 
 
 .toolChild > div + div{
 
 .toolChild > div + div{
 
   margin-top:5px;
 
   margin-top:5px;
 
@@ -25674,7 +25739,7 @@ ol {
 
   width:100%;
 
   width:100%;
 
 }
 
 }
 
 
 
-.toolChild > div::before {
 
+/* .toolChild > div::before { */
 
   /* content: "";
 
   /* content: "";
 
   width: 15px;
 
   width: 15px;
 
   height: 1px;
 
   height: 1px;
 
@@ -25683,7 +25748,7 @@ ol {
 
   top: 24px;
 
   top: 24px;
 
   left: -20px;
 
   left: -20px;
 
   display: block; */
 
   display: block; */
 
-}
 
+/* } */
 
 
 
 .isGjCss {
 
 .isGjCss {
 
   /* color: #0061ff; */
 
   /* color: #0061ff; */

+ 0 - 1
src/components/studySutdentClass/commpont/evaTable.vue
View File 

@@ -4,7 +4,6 @@
 
         <el-table
 
         <el-table
 
           :data="eList"
 
           :data="eList"
 
           :header-cell-style="{ background: '#F0F4FA' }"
 
           :header-cell-style="{ background: '#F0F4FA' }"
 
-          :row-class-name="tableRowClassName"
 
           border
 
           border
 
           stripe
 
           stripe
 
           style="width: 100%"
 
           style="width: 100%"

+ 124 - 41
src/components/studySutdentClass/studyStudent.vue
View File 

@@ -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
 
@@ -462,10 +462,10 @@
 
           <div
 
           <div
 
             class="vedioBox"
 
             class="vedioBox"
 
             v-if="
 
             v-if="
 
-              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+              (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                 .taskDetail != '' ||
 
                 .taskDetail != '' ||
 
               vChapterData[0].length > 0 ||
 
               vChapterData[0].length > 0 ||
 
-              fileC[0].length > 0
 
+              fileC[0].length > 0) && (tType == 1 || (tType == 2 && IsStulook))
 
             "
 
             "
 
             style="border-radius: 0 0 20px 20px"
 
             style="border-radius: 0 0 20px 20px"
 
           >
 
           >
 
@@ -13305,6 +13305,15 @@
 
               @change="updateFollow"
 
               @change="updateFollow"
 
             ></el-switch>
 
             ></el-switch>
 
           </div>
 
           </div>
 
+          <div class="switch_box" v-if="courseDetail.userid == userid">
 
+            <span>允许学生查看内容资料</span>
 
+            <el-switch
 
+              v-model="IsStulook"
 
+              active-text=""
 
+              class="switchCss"
 
+              @change="updateIsStulook"
 
+            ></el-switch>
 
+          </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div slot="footer">
 
       <div slot="footer">
 
@@ -15965,6 +15974,8 @@ export default {
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
+      // 是否允许学生查看内容资料 2不可以 1可以
 
+      IsStulook:false,
 
       homeWorkLoading:false,
 
       homeWorkLoading:false,
 
 			toolsList: toolsList,
 
 			toolsList: toolsList,
 
       wordCloudKey: 0,
 
       wordCloudKey: 0,
 
@@ -16366,6 +16377,48 @@ export default {
 
       diffKey:"1"
 
       diffKey:"1"
 
     };
 
     };
 
   },
 
   },
 
+  watch:{
 
+    taskCount(newVal) {
 
+      console.log('newVal',newVal);
 
+        this.AIloading = [];
 
+        this.loopLoading = [];
 
+
 
+        this.worksStudent.forEach((e, index) => {
 
+          this.loopLoading.push({ loading: false });
 
+          this.AIloading.push([]);
 
+          e.forEach(k => {
 
+            this.AIloading[index].push({ loading: false, sco: 0 });
 
+          });
 
+        });   
+        if(this.tType == 1){
 
+          this.refreshAssembly();
 
+        }        
+    },
 
+    worksStudent: {
 
+      handler(newVal, oldVal) {
 
+          const sum1 = newVal.reduce((total, subArr) => total + subArr.length, 0);
 
+          const sum2 = oldVal.reduce((total, subArr) => total + subArr.length, 0);
 
+          // console.log('worksStudent',sum1,sum2);
 
+          
+          if(sum1 != sum2){
 
+              this.AIloading = [];
 
+              this.loopLoading = [];
 
+
 
+              this.worksStudent.forEach((e, index) => {
 
+                this.loopLoading.push({ loading: false });
 
+                this.AIloading.push([]);
 
+                e.forEach(k => {
 
+                  this.AIloading[index].push({ loading: false, sco: 0 });
 
+                });
 
+              });
 
+              if(this.tType == 1){
 
+                this.refreshAssembly();
 
+              }
 
+          }
 
+      },
 
+      deep:true,
 
+    }
 
+  },
 
   methods: {
 
   methods: {
 
     //查看应用中心作业
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
     openCocoFlow(w){
 
@@ -16469,7 +16522,7 @@ export default {
 
       }
 
       }
 
 
 
       this.$message.success("重置完成");
 
       this.$message.success("重置完成");
 
-      // this.refreshAssembly();
 
+
 
 
 
       this.worksStudent.forEach((e, index) => {
 
       this.worksStudent.forEach((e, index) => {
 
         if (toolIndex == index) {
 
         if (toolIndex == index) {
 
@@ -16948,9 +17001,8 @@ export default {
 
       });
 
       });
 
     },
 
     },
 
     // 组件刷新
 
     // 组件刷新
 
-    refreshAssembly(val) {
 
+    refreshAssembly() {
 
       this.refreshKey++;
 
       this.refreshKey++;
 
-      // console.log(this.refreshKey)
 
     },
 
     },
 
     updateLoading(payload) {
 
     updateLoading(payload) {
 
       this.AIloading[payload.val][payload.val2].loading = payload.val3;
 
       this.AIloading[payload.val][payload.val2].loading = payload.val3;
 
@@ -17283,7 +17335,7 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     jumpGj(i, j, k, l) {
 
     jumpGj(i, j, k, l) {
 
-      this.refreshAssembly();
 
+      // this.refreshAssembly();
 
       for (var z = 0; z < this.navList.length; z++) {
 
       for (var z = 0; z < this.navList.length; z++) {
 
         for (var q = 0; q < this.navList[z].task.length; q++) {
 
         for (var q = 0; q < this.navList[z].task.length; q++) {
 
           for (var w = 0; w < this.navList[z].task[q].tool.length; w++) {
 
           for (var w = 0; w < this.navList[z].task[q].tool.length; w++) {
 
@@ -20273,24 +20325,7 @@ export default {
 
             this.joinGroup(gindex);
 
             this.joinGroup(gindex);
 
           }
 
           }
 
           this.worksStudent = _worksStudent;
 
           this.worksStudent = _worksStudent;
 
-          if (
 
-            JSON.stringify(this.worksStudentCopy) !=
 
-            JSON.stringify(this.worksStudent)
 
-          ) {
 
-            console.log("88888999999");
 
-            this.worksStudentCopy = this.worksStudent;
 
-            this.AIloading = [];
 
-            this.loopLoading = [];
 
-
 
-            this.worksStudent.forEach((e, index) => {
 
-              this.loopLoading.push({ loading: false });
 
-              this.AIloading.push([]);
 
-              e.forEach(k => {
 
-                this.AIloading[index].push({ loading: false, sco: 0 });
 
-              });
 
-            });
 
-            this.refreshAssembly();
 
-          }
 
+  
           this.selectWorksStudent();
 
           this.selectWorksStudent();
 
           for (let ci = 0; ci < this.isCloseList.length; ci++) {
 
           for (let ci = 0; ci < this.isCloseList.length; ci++) {
 
             this.$nextTick(() => {
 
             this.$nextTick(() => {
 
@@ -21763,7 +21798,20 @@ export default {
 
           }
 
           }
 
 
 
 
 
+          // 判断进入课程是否是创建老师，如果去创建老师，就自动开启下面两个按钮
 
+          if (type == 10) {
 
+            console.log('this.courseDetail.userid',this.courseDetail.userid);
 
+            console.log('this.userid',this.userid);
 
 
 
+            
+            if (this.courseDetail.userid == this.userid) {
 
+            
+              // 开局关闭学生查看内容
 
+              this.StulookMode(false)
 
+              // 开局打开跟随模式
 
+              this.followingMode(true)
 
+            }
 
+          }
 
 
 
 
 
           //  else {
 
           //  else {
 
@@ -22157,6 +22205,35 @@ export default {
 
           console.error(err);
 
           console.error(err);
 
         });
 
         });
 
     },
 
     },
 
+    updateIsStulook(){
 
+      let params = [
 
+        {
 
+          sopen: this.IsStulook == false ? 2 : 1,
 
+          cid: this.id
 
+        }
 
+      ];
 
+
 
+      this.ajax
 
+        .post(this.$store.state.api + "updateCourseStulook", params)
 
+        .then(res => {
 
+          
+          if (this.IsStulook == true) {
 
+            this.$message({
 
+              message: "学生查看内容资料权限已开启",
 
+              type: "success"
 
+            });
 
+          } else {
 
+            this.$message({
 
+              message: "关闭学生查看内容资料权限",
 
+              type: "success"
 
+            });
 
+          }
 
+          // this.setCTask();
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     updateFollow() {
 
     updateFollow() {
 
       let params = [
 
       let params = [
 
         {
 
         {
 
@@ -22169,12 +22246,12 @@ export default {
 
         .then((res) => {
 
         .then((res) => {
 
           if (this.IsFollow == true) {
 
           if (this.IsFollow == true) {
 
             this.$message({
 
             this.$message({
 
-              message: "开启成功",
 
+              message: "跟随模式已开启",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           } else {
 
           } else {
 
             this.$message({
 
             this.$message({
 
-              message: "关闭成功",
 
+              message: "跟随模式已关闭",
 
               type: "success",
 
               type: "success",
 
             });
 
             });
 
           }
 
           }
 
@@ -22238,6 +22315,7 @@ export default {
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
+          this.IsStulook = res.data[0][0].isStulook == 2 ? false : true;
 
           if (!this.IsLookOpen) {
 
           if (!this.IsLookOpen) {
 
             this.setNavList();
 
             this.setNavList();
 
           } else {
 
           } else {
 
@@ -24237,8 +24315,9 @@ export default {
 
           document.getElementsByClassName("navBox")[0].style.height =
 
           document.getElementsByClassName("navBox")[0].style.height =
 
             a - 40 + 0+ "px";
 
             a - 40 + 0+ "px";
 
         } else {
 
         } else {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + "px";
 
+            if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+              document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
+            }
 
         }
 
         }
 
       }
 
       }
 
       this.Stbodywidth =
 
       this.Stbodywidth =
 
@@ -25541,7 +25620,11 @@ export default {
 
     followingMode(flag) {
 
     followingMode(flag) {
 
       this.IsFollow = flag;
 
       this.IsFollow = flag;
 
       this.updateFollow();
 
       this.updateFollow();
 
-    }
 
+    },
 
+    StulookMode(flag) {
 
+      this.IsStulook = flag;
 
+      this.updateIsStulook();
 
+    },
 
   },
 
   },
 
   directives: {
 
   directives: {
 
     // 使用局部注册指令的方式
 
     // 使用局部注册指令的方式
 
@@ -25818,12 +25901,12 @@ export default {
 
     }
 
     }
 
     this.setOperationTime();
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.selectEva();
 
-    this.getCourseDetail();
 
+    this.getCourseDetail(10);
 
     this.selectCount();
 
     this.selectCount();
 
     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;
 
@@ -25897,9 +25980,9 @@ export default {
 
   align-items: center !important;
 
   align-items: center !important;
 
 }
 
 }
 
 
 
-.dialog_diy >>> .el-dialog {
 
+/* .dialog_diy >>> .el-dialog { */
 
   /* margin-top: 10vh !important; */
 
   /* margin-top: 10vh !important; */
 
-}
 
+/* } */
 
 
 
 .body_student {
 
 .body_student {
 
   width: 77%;
 
   width: 77%;
 
@@ -25921,7 +26004,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;
 
@@ -27681,10 +27764,10 @@ export default {
 
   justify-content: center;
 
   justify-content: center;
 
 }
 
 }
 
 
 
-.answerBg > div:nth-child(1) {
 
+/* .answerBg > div:nth-child(1) { */
 
   /* font-size: 22px;
 
   /* font-size: 22px;
 
   padding: 25px 0 10px; */
 
   padding: 25px 0 10px; */
 
-}
 
+/* } */
 
 
 
 .answerContent {
 
 .answerContent {
 
   width: 215px;
 
   width: 215px;
 
@@ -27853,8 +27936,8 @@ export default {
 
   width: 400px;
 
   width: 400px;
 
 }
 
 }
 
 
 
-.e_add_btn {
 
-}
 
+/* .e_add_btn {
 
+} */
 
 
 
 .e_add_content {
 
 .e_add_content {
 
   display: flex;
 
   display: flex;

Some files were not shown because too many files changed in this diff