Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

lsc 2 months ago
parent
commit
784ed31d1f

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     html,
     body{
     body{
       font-family: '黑体';
       font-family: '黑体';
-    }</style><link href=./static/css/app.4b9d24fa8095bfcffb21ca999a3d90e4.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.d6d47d008c180699b2a1.js></script><script type=text/javascript src=./static/js/app.8887e78fe10afe04b8b2.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.fda0b75239ee7a11d8b83e216f360791.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.d6d47d008c180699b2a1.js></script><script type=text/javascript src=./static/js/app.e29b884278c37006d12b.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.4b9d24fa8095bfcffb21ca999a3d90e4.css


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


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


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


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


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


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


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

@@ -20650,7 +20650,8 @@ export default {
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
           this.taskCount
           this.taskCount
         ].isLook = true;
         ].isLook = true;
-        this.addCourseState(3);
+        let yym = JSON.parse(JSON.stringify(this.chapInfoList))
+        this.addCourseState(3,yym);
       }
       }
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
         this.isCloseList[ci].isClose = 0;
         this.isCloseList[ci].isClose = 0;
@@ -21853,8 +21854,9 @@ export default {
           console.error(err);
           console.error(err);
         });
         });
     },
     },
-    addCourseState(type) {
-      let _state = this.chapInfoList;
+    addCourseState(type,val = '') {
+      
+      let _state = val ? val : this.chapInfoList;
       // this.courseType   this.taskCount
       // this.courseType   this.taskCount
       if (type == 1 || type == 2) {
       if (type == 1 || type == 2) {
         for (var i = 0; i < _state.length; i++) {
         for (var i = 0; i < _state.length; i++) {
@@ -21883,6 +21885,7 @@ export default {
           state: JSON.stringify(_state)
           state: JSON.stringify(_state)
         }
         }
       ];
       ];
+      
       this.ajax
       this.ajax
         .post(
         .post(
           this.$store.state.api +
           this.$store.state.api +
@@ -25038,9 +25041,9 @@ export default {
   beforeDestroy() {
   beforeDestroy() {
     window.onresize = null;
     window.onresize = null;
     clearInterval(this.timer);
     clearInterval(this.timer);
-    clearInterval(this.timer2);
-
     this.timer = null;
     this.timer = null;
+
+    clearInterval(this.timer2);
     this.timer2 = null;
     this.timer2 = null;
 
 
     clearInterval(this.opertimer);
     clearInterval(this.opertimer);

+ 6 - 3
src/components/easy3/studyStudent.vue

@@ -16432,7 +16432,9 @@ export default {
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
           this.taskCount
           this.taskCount
         ].isLook = true;
         ].isLook = true;
-        this.addCourseState(3);
+
+        let yym = JSON.parse(JSON.stringify(this.chapInfoList))
+        this.addCourseState(3,yym);
       }
       }
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
         this.isCloseList[ci].isClose = 0;
         this.isCloseList[ci].isClose = 0;
@@ -17551,8 +17553,9 @@ export default {
           console.error(err);
           console.error(err);
         });
         });
     },
     },
-    addCourseState(type) {
-      let _state = this.chapInfoList;
+    addCourseState(type,val = '') {
+      let _state = val ? val : this.chapInfoList;
+
       // this.courseType   this.taskCount
       // this.courseType   this.taskCount
       if (type == 1 || type == 2) {
       if (type == 1 || type == 2) {
         for (var i = 0; i < _state.length; i++) {
         for (var i = 0; i < _state.length; i++) {

+ 6 - 4
src/components/studyStudent.vue

@@ -16356,7 +16356,6 @@ export default {
     },
     },
 
 
     openTask(s, n, i,ctype) {
     openTask(s, n, i,ctype) {
-			console.log(s, n, i,ctype)
       if (this.IsFollow && this.tType == 2) {
       if (this.IsFollow && this.tType == 2) {
         this.$message.error("已经开启跟随模式,请认真跟堂听讲");
         this.$message.error("已经开启跟随模式,请认真跟堂听讲");
         return;
         return;
@@ -16421,8 +16420,10 @@ export default {
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
           this.taskCount
           this.taskCount
         ].isLook = true;
         ].isLook = true;
-        this.addCourseState(3);
+        let yym = JSON.parse(JSON.stringify(this.chapInfoList))
+        this.addCourseState(3,yym);
       }
       }
+
       for (let ci = 0; ci < this.isCloseList.length; ci++) {
       for (let ci = 0; ci < this.isCloseList.length; ci++) {
         this.isCloseList[ci].isClose = 0;
         this.isCloseList[ci].isClose = 0;
         this.isCloseList[ci].isCloseBoolean = false;
         this.isCloseList[ci].isCloseBoolean = false;
@@ -17543,8 +17544,9 @@ export default {
           console.error(err);
           console.error(err);
         });
         });
     },
     },
-    addCourseState(type) {
-      let _state = this.chapInfoList;
+    addCourseState(type,val = '') {
+      let _state = val ? val : this.chapInfoList;
+
       // this.courseType   this.taskCount
       // this.courseType   this.taskCount
       if (type == 1 || type == 2) {
       if (type == 1 || type == 2) {
         for (var i = 0; i < _state.length; i++) {
         for (var i = 0; i < _state.length; i++) {

+ 5 - 3
src/components/studySutdentClass/studyStudent.vue

@@ -20092,7 +20092,8 @@ export default {
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
           this.taskCount
           this.taskCount
         ].isLook = true;
         ].isLook = true;
-        this.addCourseState(3);
+        let yym = JSON.parse(JSON.stringify(this.chapInfoList))
+        this.addCourseState(3,yym);
       }
       }
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
       for (var ci = 0; ci < this.isCloseList.length; ci++) {
         this.isCloseList[ci].isClose = 0;
         this.isCloseList[ci].isClose = 0;
@@ -21288,8 +21289,9 @@ export default {
           console.error(err);
           console.error(err);
         });
         });
     },
     },
-    addCourseState(type) {
-      let _state = this.chapInfoList;
+    addCourseState(type,val = '') {
+      let _state = val ? val : this.chapInfoList;
+
       // this.courseType   this.taskCount
       // this.courseType   this.taskCount
       if (type == 1 || type == 2) {
       if (type == 1 || type == 2) {
         for (var i = 0; i < _state.length; i++) {
         for (var i = 0; i < _state.length; i++) {

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