Inicio Explorar Axuda
Iniciar sesión
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

lsc hai 3 semanas
pai
3728732599 cf685ecce5
achega
91ba8a23ac
Modificáronse 14 ficheiros con 64 adicións e 27 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.b97840032ed3009157aa9d60f661cf2b.css
  3. 0 0
      dist/static/css/app.b97840032ed3009157aa9d60f661cf2b.css.map
  4. 0 0
      dist/static/css/app.d76c07f92a5ac4c512d3adb012f57680.css
  5. 0 0
      dist/static/css/app.d76c07f92a5ac4c512d3adb012f57680.css.map
  6. 0 0
      dist/static/js/app.1da562c66c0b702ae303.js
  7. 0 0
      dist/static/js/app.1da562c66c0b702ae303.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 1 1
      src/components/courseDetail.vue
  10. 12 3
      src/components/easy2/studyStudent.vue
  11. 18 9
      src/components/easy3/studyStudent.vue
  12. 1 1
      src/components/pptEasyClass/index_old.vue
  13. 19 9
      src/components/studyStudent.vue
  14. 12 3
      src/components/studySutdentClass/studyStudent.vue

+ 1 - 1
dist/index.html
Ver ficheiro 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.b97840032ed3009157aa9d60f661cf2b.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.ee00c28ff4adee9e36fd.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.d76c07f92a5ac4c512d3adb012f57680.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.1da562c66c0b702ae303.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.b97840032ed3009157aa9d60f661cf2b.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.b97840032ed3009157aa9d60f661cf2b.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.d76c07f92a5ac4c512d3adb012f57680.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.d76c07f92a5ac4c512d3adb012f57680.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.1da562c66c0b702ae303.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.1da562c66c0b702ae303.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 1 - 1
src/components/courseDetail.vue
Ver ficheiro 

@@ -144,7 +144,7 @@
 
                 <div
 
                   class="now_study"
 
                   @click="setQr(courseDetail.courseId)"
 
-                  v-if="tType != 2"
 
+                  v-if="tType != 2 && courseDetail.state!=7"
 
                 >
 
                   <div class="returnIndexImg">
 
                     <img src="../assets/icon/newIcon/codeIcon.png" alt="" />

+ 12 - 3
src/components/easy2/studyStudent.vue
Ver ficheiro 

@@ -560,12 +560,12 @@
 
                       style="height: 650px; width: calc(100% - 50px)"
 
                     >
 
                       <video-player
 
-                        class="video-player vjs-custom-skin"
 
+                        class="video-player vjs-custom-skin notop"
 
                         :class="contentDialog == false ? 'isAllWidth' : ''"
 
                         :playsinline="true"
 
                         :options="playerO[taskCount]"
 
                         @play="onPlayerPlay($event)"
 
-                        style="width: 100%; height: 100%; margin: 0 0 0 30px"
 
+                        style="width: 100%; height: 650px; margin: 0 0 0 30px"
 
                       ></video-player>
 
                     </div>
 
                   </div>
 
@@ -22129,6 +22129,9 @@ export default {
 
                 } else if (_chapterData[this.taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[this.taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -22298,6 +22301,9 @@ export default {
 
                 } else if (_chapterData[this.taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[this.taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -22407,7 +22413,7 @@ export default {
 
             if (this.courseDetail.userid == this.userid) {
 
             
               // 开局关闭学生查看内容
 
-              this.StulookMode(false)
 
+              this.StulookMode(true)
 
               // 开局打开跟随模式
 
               this.followingMode(true)
 
             }
 
@@ -31214,4 +31220,7 @@ div::-webkit-scrollbar {
 
     white-space: normal !important;
 
     display: inline !important;
 
 }
 
+.notop >>> .vjs_video_3-dimensions.vjs-fluid{
 
+  padding-top: 0 !important;
 
+}
 
 </style>

+ 18 - 9
src/components/easy3/studyStudent.vue
Ver ficheiro 

@@ -570,12 +570,12 @@
 
                       style="height: 650px; width: calc(100% - 50px)"
 
                     >
 
                       <video-player
 
-                        class="video-player vjs-custom-skin"
 
+                        class="video-player vjs-custom-skin notop"
 
                         :class="contentDialog == false ? 'isAllWidth' : ''"
 
                         :playsinline="true"
 
                         :options="playerO[0]"
 
                         @play="onPlayerPlay($event)"
 
-                        style="width: 100%; height: 100%; margin: 0 0 0 30px"
 
+                        style="width: 100%; height: 650px; margin: 0 0 0 30px"
 
                       ></video-player>
 
                     </div>
 
                   </div>
 
@@ -17602,6 +17602,9 @@ export default {
 
                 } else if (_chapterData[taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -17772,6 +17775,9 @@ export default {
 
                 } else if (_chapterData[taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -17811,7 +17817,7 @@ export default {
 
             if (this.courseDetail.userid == this.userid) {
 
 
               // 开局关闭学生查看内容
 
-              this.StulookMode(false)
 
+              this.StulookMode(true)
 
               // 开局打开跟随模式
 
               this.followingMode(true)
 
             }
 
@@ -21924,12 +21930,12 @@ export default {
 
       hour12: false, 
       timeZone: "Asia/Shanghai" 
     }).replace(/\//g, "-")
 
-    if (this.tType == 1) {
 
-       // 开局关闭学生查看内容
 
-      this.StulookMode(false)
 
-      // 开局打开跟随模式
 
-      this.followingMode(true)
 
-    }
 
+    // if (this.tType == 1) {
 
+    //    // 开局关闭学生查看内容
 
+    //   this.StulookMode(false)
 
+    //   // 开局打开跟随模式
 
+    //   this.followingMode(true)
 
+    // }
 
     document.body.addEventListener("click", (e) => {
 
       if (this.isUpdateToolDetail1) {
 
         this.updateToolDetail(this.toolDetailIndex);
 
@@ -26470,4 +26476,7 @@ div::-webkit-scrollbar {
 
     white-space: normal !important;
 
     display: inline !important;
 
 }
 
+.notop >>> .vjs_video_3-dimensions.vjs-fluid{
 
+  padding-top: 0 !important;
 
+}
 
 </style>

+ 1 - 1
src/components/pptEasyClass/index_old.vue
Ver ficheiro 

@@ -23,7 +23,7 @@
 
 
             <div
 
               @click.stop="back"
 
-              v-if="screenType!=2"
 
+              v-if="tType == 1 || screenType!=2"
 
             >
 
               <img src="../../assets/icon/newIcon/return.png" alt="" />
 
               <span style="color: #000">返回</span>

+ 19 - 9
src/components/studyStudent.vue
Ver ficheiro 

@@ -535,12 +535,12 @@
 
                       style="height: 650px; width: calc(100% - 50px)"
 
                     >
 
                       <video-player
 
-                        class="video-player vjs-custom-skin"
 
+                        class="video-player vjs-custom-skin notop"
 
                         :class="contentDialog == false ? 'isAllWidth' : ''"
 
                         :playsinline="true"
 
                         :options="playerO[taskCount]"
 
                         @play="onPlayerPlay($event)"
 
-                        style="width: 100%; height: 100%; margin: 0 0 0 30px"
 
+                        style="width: 100%; height: 650px; margin: 0 0 0 30px"
 
                       ></video-player>
 
                     </div>
 
                   </div>
 
@@ -17534,6 +17534,9 @@ export default {
 
                 } else if (_chapterData[this.taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[this.taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -17703,6 +17706,9 @@ export default {
 
                 } else if (_chapterData[this.taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[this.taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -17744,7 +17750,7 @@ export default {
 
             if (this.courseDetail.userid == this.userid) {
 
             
               // 开局关闭学生查看内容
 
-              this.StulookMode(false)
 
+              this.StulookMode(true)
 
               // 开局打开跟随模式
 
               this.followingMode(true)
 
             }
 
@@ -21856,12 +21862,13 @@ export default {
 
       hour12: false, 
       timeZone: "Asia/Shanghai" 
     }).replace(/\//g, "-");
 
-    if (this.tType == 1) {
 
-       // 开局关闭学生查看内容
 
-      this.StulookMode(false)
 
-      // 开局打开跟随模式
 
-      this.followingMode(true)
 
-    }
 
+
 
+    // if (this.tType == 1) {
 
+    //    // 开局关闭学生查看内容
 
+    //   this.StulookMode(false)
 
+    //   // 开局打开跟随模式
 
+    //   this.followingMode(true)
 
+    // }
 
     document.body.addEventListener("click", (e) => {
 
       if (this.isUpdateToolDetail1) {
 
         this.updateToolDetail(this.toolDetailIndex);
 
@@ -26419,4 +26426,7 @@ div::-webkit-scrollbar {
 
     white-space: normal !important;
 
     display: inline !important;
 
 }
 
+.notop >>> .vjs_video_3-dimensions.vjs-fluid{
 
+  padding-top: 0 !important;
 
+}
 
 </style>

+ 12 - 3
src/components/studySutdentClass/studyStudent.vue
Ver ficheiro 

@@ -569,12 +569,12 @@
 
                       style="height: 650px; width: calc(100% - 50px)"
 
                     >
 
                       <video-player
 
-                        class="video-player vjs-custom-skin"
 
+                        class="video-player vjs-custom-skin notop"
 
                         :class="contentDialog == false ? 'isAllWidth' : ''"
 
                         :playsinline="true"
 
                         :options="playerO[0]"
 
                         @play="onPlayerPlay($event)"
 
-                        style="width: 100%; height: 100%; margin: 0 0 0 30px"
 
+                        style="width: 100%; height: 650px; margin: 0 0 0 30px"
 
                       ></video-player>
 
                     </div>
 
                   </div>
 
@@ -21576,6 +21576,9 @@ export default {
 
                 } else if (_chapterData[taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -21746,6 +21749,9 @@ export default {
 
                 } else if (_chapterData[taskCount][0].type == 16) {
 
                   this.showType = 16;
 
                   this.pptImgUrl1 = _url;
 
+                } else if (_chapterData[taskCount][0].type == 17) {
 
+                  this.showType = 16;
 
+                  this.pptImgUrl1 = _url;
 
                 }
 
               }
 
             }
 
@@ -21851,7 +21857,7 @@ export default {
 
             if (this.courseDetail.userid == this.userid) {
 
             
               // 开局关闭学生查看内容
 
-              this.StulookMode(false)
 
+              this.StulookMode(true)
 
               // 开局打开跟随模式
 
               this.followingMode(true)
 
             }
 
@@ -30534,4 +30540,7 @@ div::-webkit-scrollbar {
 
     white-space: normal !important;
 
     display: inline !important;
 
 }
 
+.notop >>> .vjs_video_3-dimensions.vjs-fluid{
 
+  padding-top: 0 !important;
 
+}
 
 </style>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio