Startseite Erkunden Hilfe
Anmelden
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Merge branch 'beta' into HK

lsc vor 2 Jahren
Ursprung
97167ec822 c8b14b4760
Commit
db12c360ed
10 geänderte Dateien mit 29 neuen und 5 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 4 0
      dist/index.html
  2. 0 0
      dist/static/css/app.45bd5d50e22e881933feb346c5406457.css
  3. 0 0
      dist/static/css/app.45bd5d50e22e881933feb346c5406457.css.map
  4. 0 0
      dist/static/js/app.28698691db058d0c757b.js
  5. 1 0
      dist/static/js/app.28698691db058d0c757b.js.map
  6. 0 0
      dist/static/js/app.4135340ca8fd42a19589.js
  7. 1 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 10 1
      src/components/easy2/studyStudent.vue
  9. 8 0
      src/components/easy3/studyStudent.vue
  10. 5 4
      src/components/studyStudent.vue

+ 4 - 0
dist/index.html
Datei anzeigen 

@@ -19,6 +19,7 @@
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
 <<<<<<< HEAD
 
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 
     }</style><link href=./static/css/app.fdc715d6a472a6fb9f9739782f316e92.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.6ce63202945bed04a56b.js></script></body></html><script>function stopSafari() {
 
 =======
 
@@ -26,6 +27,9 @@
 
 >>>>>>> beta
 
 =======
 
     }</style><link href=./static/css/app.f41fc8f312c2bf035c8d4f4c5d6b1dea.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.4135340ca8fd42a19589.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
+=======
 
+    }</style><link href=./static/css/app.45bd5d50e22e881933feb346c5406457.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.28698691db058d0c757b.js></script></body></html><script>function stopSafari() {
 
 >>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.45bd5d50e22e881933feb346c5406457.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.45bd5d50e22e881933feb346c5406457.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.28698691db058d0c757b.js


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
dist/static/js/app.28698691db058d0c757b.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.4135340ca8fd42a19589.js


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 10 - 1
src/components/easy2/studyStudent.vue
Datei anzeigen 

@@ -47,6 +47,7 @@
 
         style="
 
           left: 0;
 
           background-image: linear-gradient(90deg, #477cd7, #65b9fc);
 
+          top: 140px;
 
         "
 
         v-if="mlDialog == false"
 
         @click="setContent2(true)"
 
@@ -156,6 +157,13 @@
 
             <div class="returnBtn commentIcon" @click="setPz" v-if="tType == 1">
 
               评论
 
             </div>
 
+            <div
 
+              class="returnBtn vedioIcon"
 
+              @click="startRecording"
 
+              v-if="!videoStart && (tType == 1 || tType == 4)"
 
+            >
 
+              录制
 
+            </div>
 
             <!-- <div class="returnBtn" @click="allScrell">全屏</div> -->
 
             <!-- <div class="returnBtn" @click="startRecording" v-if="!videoStart && (tType == 1 || tType == 4)">
 
               开始录制
 
@@ -15419,7 +15427,8 @@ export default {
 
       this.ajax
 
         .get(this.$store.state.api + "selectCourseSLook", params)
 
         .then((res) => {
 
-          this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          // this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          this.sIsOpen = true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           if (!this.IsLookOpen) {

+ 8 - 0
src/components/easy3/studyStudent.vue
Datei anzeigen 

@@ -47,6 +47,7 @@
 
         style="
 
           left: 0;
 
           background-image: linear-gradient(90deg, #477cd7, #65b9fc);
 
+          top: 140px;
 
         "
 
         v-if="mlDialog == false"
 
         @click="setContent2(true)"
 
@@ -156,6 +157,13 @@
 
             <div class="returnBtn commentIcon" @click="setPz" v-if="tType == 1">
 
               评论
 
             </div>
 
+            <div
 
+              class="returnBtn vedioIcon"
 
+              @click="startRecording"
 
+              v-if="!videoStart && (tType == 1 || tType == 4)"
 
+            >
 
+              录制
 
+            </div>
 
             <!-- <div class="returnBtn" @click="allScrell">全屏</div> -->
 
             <!-- <div class="returnBtn" @click="startRecording" v-if="!videoStart && (tType == 1 || tType == 4)">
 
               开始录制

+ 5 - 4
src/components/studyStudent.vue
Datei anzeigen 

@@ -15,6 +15,7 @@
 
         style="
 
           left: 0;
 
           background-image: linear-gradient(90deg, #477cd7, #65b9fc);
 
+          top: 140px;
 
         "
 
         v-if="mlDialog == false && !(IsFollow && tType == 2)"
 
         @click="setContent2(true)"
 
@@ -229,7 +230,6 @@
 
               .chapterData.length == 0 &&
 
             chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
               .toolChoose[0].tool.length == 0 &&
 
-            chapInfoList[courseType].chapterInfo[0].video.length == 0 &&
 
             chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
               .taskDetail == '' &&
 
             !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList
 
@@ -572,12 +572,12 @@
 
               class="vedioBox"
 
               :style="{borderRadius:(vChapterData[taskCount].length == 0 && fileC[taskCount].length == 0) ? '0 0 20px 20px' : '20px'}"
 
               v-if="
 
-                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .toolChoose[0].tool &&
 
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                   .toolChoose[0].tool.length &&
 
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
-                  .toolChoose[0].tool.length > 0 || (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .toolChoose[0].tool.length > 0) || (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                     .taskDetail != '')
 
               "
 
             >
 
@@ -14518,7 +14518,8 @@ export default {
 
       this.ajax
 
         .get(this.$store.state.api + "selectCourseSLook", params)
 
         .then((res) => {
 
-          this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          // this.sIsOpen = res.data[0][0].sopen == 1 ? false : true;
 
+          this.sIsOpen = true;
 
           this.IsLookOpen = res.data[0][0].look == 1 ? false : true;
 
           this.IsFollow = res.data[0][0].follow == 1 ? false : true;
 
           if (!this.IsLookOpen) {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.