lsc 1 year ago
parent
commit
a62794c4eb

+ 1 - 1
dist/index.html

@@ -18,7 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.8f418d1a552badda88c6ef0e2685b61d.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.aaf060920e70df5e50c4.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.ef5f2085ccf28ae9685b44701867f47c.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.0ab781322b0afaf95d3b.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


BIN
dist/static/img/allHistory.2b42789.png


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


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


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


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


BIN
src/assets/icon/fourthToolList/allHistory.png


BIN
src/assets/icon/learn/last.png


BIN
src/assets/icon/learn/next.png


BIN
src/assets/icon/learn/return.png


BIN
src/assets/icon/learn/screen.png


File diff suppressed because it is too large
+ 365 - 323
src/components/noTerminal/studyStudent.vue


+ 12 - 11
src/components/studyStudent.vue

@@ -4,11 +4,11 @@
       <div class="pButton" style="
                                   left: 0;
                                   background-image: linear-gradient(90deg, #477cd7, #65b9fc);
-                                " v-if="mlDialog == false" @click="setContent2(true)">
+                                " v-if="mlDialog == false && !(this.IsFollow && this.courseDetail.userid != this.userid)" @click="setContent2(true)">
         <!-- 批 , getCourseDetail()-->
         <img src="../assets/mlBtn.png" style="width: 25px" alt="" />
       </div>
-      <div class="pb_left" v-else>
+      <div class="pb_left" v-else-if="!(this.IsFollow && this.courseDetail.userid != this.userid)">
         <!-- <div class="courseTitle">{{ courseDetail.title }}</div> -->
         <div class="courseTitle">
           <div style="width:calc(100% - 25px)">
@@ -83,8 +83,8 @@
             <div>任务{{ taskCount + 1 }}</div>
           </div>
           <div class="btnAll">
-            <div class="returnBtn" @click="nextOrpreSteps(0)">上一步</div>
-            <div class="returnBtn" @click="nextOrpreSteps(1)">下一步</div>
+            <div class="returnBtn" @click="nextOrpreSteps(0)" v-if="!(this.IsFollow && this.courseDetail.userid != this.userid)">上一步</div>
+            <div class="returnBtn" @click="nextOrpreSteps(1)" v-if="!(this.IsFollow && this.courseDetail.userid != this.userid)">下一步</div>
             <div class="returnBtn" @click="allScrell">全屏</div>
             <div class="returnBtn" @click="startRecording" v-if="!videoStart && (tType == 1 || tType == 4)">
               开始录制
@@ -6008,7 +6008,7 @@ export default {
 
     selectCStudent() {
       let params = {
-        cid: this.classId,
+        cid: this.tcid ? this.tcid : this.courseDetail.juri,
         oid: this.oid,
         cn: '',
       };
@@ -8752,7 +8752,7 @@ export default {
             _this.selectSWorks(gindex);
           }
 
-
+          _this.selectCStudent();
           _this.selectStudent();
           _this.selectSLook();
           if (_this.courseDetail.userid == _this.userid && _this.IsFollow) {
@@ -9078,6 +9078,7 @@ export default {
           }
 
           if (this.IsFollow && this.courseDetail.userid != this.userid) {
+            this.setContent2(false)
             let _followC = res.data[0][0].followC.split('-')
             if (this.courseType != _followC[0] || this.taskCount != _followC[1]) {
               this.navList[this.courseType].isOpen = false;
@@ -9785,10 +9786,11 @@ export default {
           return;
         }
         this.plworkFile = [];
-        this.uploadCid =
-          this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
-            index
-          ].toolChoose[i].uploadJson[0];
+        this.uploadCid = this.tcid ? this.tcid : this.courseDetail.juri
+        // this.uploadCid =
+        //   this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+        //     index
+        //   ].toolChoose[i].uploadJson[0];
         this.selectUploadStudent();
         this.dialogVisiblePl = true;
       } else if (t == 8) {
@@ -10811,7 +10813,6 @@ export default {
     this.getCourseDetail();
     this.selectCount();
     this.getHomeWork();
-    this.selectCStudent();
     this.contentDialog = true;
     this.setContent2(true)
     if (this.tType == 4) {

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