11wqe1 1 bulan lalu
induk
melakukan
136a1ff8a9

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

@@ -15526,6 +15526,7 @@
       :groupStudent="groupStudent"
       :oid="oid"
       :org="org"
+      @getCourseDetail="getCourseDetail"
       @selectSLook="selectSLook"
       @selectSWorks="selectSWorks"
       @selectStudent="selectStudent"
@@ -20892,6 +20893,8 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectCourseDetail3", params)
         .then(res => {
+          this.addCourseState(1, JSON.parse(res.data[0][0].chapters));
+
           if (type != 2) {
             loading.close();
             if (
@@ -21383,9 +21386,9 @@ export default {
           _this.timer = setInterval(function() {
             // _this.getCourseDetail(2);
             if (_this.tcid) {
-              _this.getCourseGroup(gindex);
+              _this.getCourseGroup();
             } else {
-              _this.selectSWorks(gindex);
+              _this.selectSWorks();
             }
 
             _this.selectStudent();
@@ -21815,9 +21818,10 @@ export default {
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
           if (!this.IsLookOpen) {
             this.setNavList();
-          } else {
+          } 
+          // else {
             this.getCourseState(1);
-          }
+          // }
           //  || (this.splitScreenData.isOpen && this.splitScreenData.uid != this.splitScreenData.myUid)
 					if ((this.IsFollow && this.tType == 2)) {
             this.setContent2(false);
@@ -21915,8 +21919,11 @@ export default {
       this.ajax
         .get(this.$store.state.api + "getCourseState", params)
         .then(res => {
-          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+          if (res.data[0].length > 0) {
             this.chapInfoList = JSON.parse(res.data[0][0].state);
+          }
+          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+            // this.chapInfoList = JSON.parse(res.data[0][0].state);
             console.log("this.chapInfoList", this.chapInfoList);
             this.setNavList();
             this.$forceUpdate();

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

@@ -12065,7 +12065,7 @@
       ref="choseWorksDetailDialogRef"
       :worksStudentData="worksStudent"
       :noWorksSData="noWorksS"
-      :chapInfoListData="chapInfoList"
+      :chapInfoListData="chapInfoList" 
       :courseType="courseType"
       :taskCount="taskCount"
       :tType="tType"
@@ -16660,6 +16660,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectCourseDetail3", params)
         .then((res) => {
+          this.addCourseState(1, JSON.parse(res.data[0][0].chapters));
           if (type != 2) {
             loading.close();
             if (
@@ -17083,9 +17084,9 @@ export default {
           _this.timer = setInterval(function () {
             // _this.getCourseDetail(2);
             if (_this.tcid) {
-              _this.getCourseGroup(gindex);
+              _this.getCourseGroup();
             } else {
-              _this.selectSWorks(gindex);
+              _this.selectSWorks();
             }
 
             _this.selectStudent();
@@ -17513,9 +17514,11 @@ export default {
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
           if (!this.IsLookOpen) {
             this.setNavList();
-          } else {
+          } 
+          
             this.getCourseState(1);
-          }
+          
+
 
 					if ((this.IsFollow && this.tType == 2)) {
             this.setContent2(false);
@@ -17613,8 +17616,11 @@ export default {
       this.ajax
         .get(this.$store.state.api + "getCourseState", params)
         .then((res) => {
+          if (res.data[0].length > 0) {
+          this.chapInfoList = JSON.parse(res.data[0][0].state);
+          }
           if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
-            this.chapInfoList = JSON.parse(res.data[0][0].state);
+            // this.chapInfoList = JSON.parse(res.data[0][0].state);
             this.setNavList();
             this.$forceUpdate();
           } else if (res.data[0].length > 0 && this.IsLookOpen && type == 2) {

+ 12 - 5
src/components/studyStudent.vue

@@ -12008,6 +12008,7 @@
       :groupStudent="groupStudent"
       :oid="oid"
       :org="org"
+      @getCourseDetail="getCourseDetail"
       @selectSLook="selectSLook"
       @selectSWorks="selectSWorks"
       @selectStudent="selectStudent"
@@ -16642,6 +16643,8 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectCourseDetail3", params)
         .then((res) => {
+          this.addCourseState(1, JSON.parse(res.data[0][0].chapters));
+
           if (type != 2) {
             loading.close();
             if (
@@ -17064,9 +17067,9 @@ export default {
           _this.timer = setInterval(function () {
             // _this.getCourseDetail(2);
             if (_this.tcid) {
-              _this.getCourseGroup(gindex);
+              _this.getCourseGroup();
             } else {
-              _this.selectSWorks(gindex);
+              _this.selectSWorks();
             }
 
             _this.selectStudent();
@@ -17496,9 +17499,10 @@ export default {
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
           if (!this.IsLookOpen) {
             this.setNavList();
-          } else {
-            this.getCourseState(1);
           }
+          //  else {
+            this.getCourseState(1);
+          // }
 
           if ((this.IsFollow && this.tType == 2)) {
             this.setContent2(false);
@@ -17596,8 +17600,11 @@ export default {
       this.ajax
         .get(this.$store.state.api + "getCourseState", params)
         .then((res) => {
-          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+          if (res.data[0].length > 0) {
             this.chapInfoList = JSON.parse(res.data[0][0].state);
+          }
+          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+            // this.chapInfoList = JSON.parse(res.data[0][0].state);
             this.setNavList();
             this.$forceUpdate();
           } else if (res.data[0].length > 0 && this.IsLookOpen && type == 2) {

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

@@ -15078,6 +15078,7 @@
       :groupStudent="groupStudent"
       :oid="oid"
       :org="org"
+      @getCourseDetail="getCourseDetail"
       @selectSLook="selectSLook"
       @selectSWorks="selectSWorks"
       @selectStudent="selectStudent"
@@ -20313,6 +20314,8 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectCourseDetail3", params)
         .then((res) => {
+          this.addCourseState(1, JSON.parse(res.data[0][0].chapters));
+
           if (type != 2) {
             loading.close();
             if (
@@ -20812,9 +20815,9 @@ export default {
           _this.timer = setInterval(function () {
             // _this.getCourseDetail(2);
             if (_this.tcid) {
-              _this.getCourseGroup(gindex);
+              _this.getCourseGroup();
             } else {
-              _this.selectSWorks(gindex);
+              _this.selectSWorks();
             }
 
             _this.selectStudent();
@@ -21243,9 +21246,10 @@ export default {
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
           if (!this.IsLookOpen) {
             this.setNavList();
-          } else {
+          } 
+          // else {
             this.getCourseState(1);
-          }
+          // }
 
 					if ((this.IsFollow && this.tType == 2) || (this.splitScreenData.isOpen && this.splitScreenData.uid != this.splitScreenData.myUid)) {
             this.setContent2(false);
@@ -21343,8 +21347,11 @@ export default {
       this.ajax
         .get(this.$store.state.api + "getCourseState", params)
         .then((res) => {
-          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+          if (res.data[0].length > 0) {
             this.chapInfoList = JSON.parse(res.data[0][0].state);
+          }
+          if (res.data[0].length > 0 && this.IsLookOpen && type == 1) {
+            // this.chapInfoList = JSON.parse(res.data[0][0].state);
             this.setNavList();
             this.$forceUpdate();
           } else if (res.data[0].length > 0 && this.IsLookOpen && type == 2) {