Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
db2ab295b0
commit
8f09d95254
17 changed files with 195 additions and 65 deletions
Split View Show Diff Stats
  1. 1 5
      dist/index.html
  2. 0 1
      dist/static/css/app.9f329b9a77ae76cece5e4a8b75ee0814.css
  3. 0 0
      dist/static/css/app.9f329b9a77ae76cece5e4a8b75ee0814.css.map
  4. 0 1
      dist/static/css/app.c7641732fe70f1a0619aa27e53898a41.css
  5. 0 0
      dist/static/css/app.c81f53ef45c36d52461423cbc59c2490.css
  6. 0 0
      dist/static/css/app.c81f53ef45c36d52461423cbc59c2490.css.map
  7. 0 0
      dist/static/js/app.49fb5bca0fc8fd85e135.js
  8. 0 0
      dist/static/js/app.49fb5bca0fc8fd85e135.js.map
  9. 0 0
      dist/static/js/app.9ee756a2ee35100de898.js
  10. 0 0
      dist/static/js/app.9ee756a2ee35100de898.js.map
  11. 0 0
      dist/static/js/app.dc4b5e8dfe618b2cccbf.js
  12. 0 0
      dist/static/js/app.dc4b5e8dfe618b2cccbf.js.map
  13. 0 1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  14. 0 0
      dist/static/js/vendor.30bffeaaa8c3b2b4d120.js
  15. 0 0
      dist/static/js/vendor.30bffeaaa8c3b2b4d120.js.map
  16. 73 16
      src/components/study.vue
  17. 121 41
      src/components/studyStudent.vue

+ 1 - 5
dist/index.html
View File 

@@ -18,8 +18,4 @@
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
-<<<<<<< HEAD
 
-    }</style><link href=./static/css/app.c7641732fe70f1a0619aa27e53898a41.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.30bffeaaa8c3b2b4d120.js></script><script type=text/javascript src=./static/js/app.9ee756a2ee35100de898.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
-=======
 
-    }</style><link href=./static/css/app.9f329b9a77ae76cece5e4a8b75ee0814.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.8585370f4405bf8a83e7.js></script><script type=text/javascript src=./static/js/app.dc4b5e8dfe618b2cccbf.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
->>>>>>> 0345a2c875cce4531bd71ab1149ea9b016fa7e98
 
+    }</style><link href=./static/css/app.c81f53ef45c36d52461423cbc59c2490.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.30bffeaaa8c3b2b4d120.js></script><script type=text/javascript src=./static/js/app.49fb5bca0fc8fd85e135.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.30bffeaaa8c3b2b4d120.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.30bffeaaa8c3b2b4d120.js.map


+ 73 - 16
src/components/study.vue
View File 

@@ -195,6 +195,7 @@
 
                         vedio.length &&
 
                         vedio[jdIndex][rwIndex] &&
 
                         vedio[jdIndex][rwIndex].length > 0 &&
 
+                        showType[jdIndex] &&
 
                         showType[jdIndex][rwIndex] == 0
 
                       "
 
                     >
 
@@ -341,7 +342,9 @@
 
                               "
 
                               alt
 
                             />
 
-                            <div class="vedioTime">{{ vedioTime }}</div>
 
+                            <div class="vedioTime" v-if="vedioTime[jdIndex]">
 
+                              {{ vedioTime[jdIndex][rwIndex][vedioIndex] }}
 
+                            </div>
 
                           </div>
 
                           <div class="vedioName">{{ media.name }}</div>
 
                         </div>
 
@@ -1044,7 +1047,7 @@
 
                           ]"
 
                           :key="wIndex"
 
                         >
 
-                          <div class="workImg" v-if="w.type == 2">
 
+                          <div class="workImg">
 
                             <!-- <img
 
                             src="../assets/icon/works/noImg.png"
 
                             @click="openTools(15, toolIndex, taskCount, w.works)"
 
@@ -3096,19 +3099,48 @@ export default {
 
           }, 5000);
 
           _this.$nextTick(function () {
 
             setTimeout(() => {
 
-              var a =
 
-                document.getElementsByClassName("box_course")[0].offsetHeight;
 
-              document.getElementsByClassName("vedioList")[0].style.height =
 
-                a + "px";
 
-              document.getElementsByClassName("navBox")[0].style.height =
 
-                a - 40 + "px";
 
+              let _box = document.getElementsByClassName("box_course");
 
+              for (var i = 0; i < _box.length; i++) {
 
+                var a =
 
+                  document.getElementsByClassName("box_course")[i].offsetHeight;
 
+                document.getElementsByClassName("vedioList")[i].style.height =
 
+                  a + "px";
 
+                document.getElementsByClassName("navBox")[i].style.height =
 
+                  a - 40 + "px";
 
+              }
 
+              let _vedio = _this.vedio;
 
+              let _count = 0;
 
+              _this.vedioTime = []
 
+              for (var i = 0; i < _vedio.length; i++) {
 
+                if (typeof _this.vedioTime != "object") {
 
+                  _this.vedioTime = [];
 
+                }
 
+                for (var j = 0; j < _vedio[i].length; j++) {
 
+                  if (!_this.vedioTime[i]) {
 
+                    _this.vedioTime[i] = [];
 
+                  }
 
+                  for (var k = 0; k < _vedio[i][j].length; k++) {
 
+                    if (!_this.vedioTime[i][j]) {
 
+                      _this.vedioTime[i][j] = [];
 
+                    }
 
+                    if (_vedio[i][j][k]) {
 
+                      _this.vedioTime[i][j].push(
 
+                        document.getElementsByClassName("vjs-duration-display")[
 
+                          _count
 
+                        ].textContent
 
+                      );
 
+                      _count++;
 
+                    }
 
+                  }
 
+                }
 
+              }
 
             }, 500);
 
           });
 
-          if (_this.vedio[_this.taskCount].length > 0) {
 
-            _this.vedioTime = document.getElementsByClassName(
 
-              "vjs-duration-display"
 
-            )[0].textContent;
 
-          }
 
+          // if (_this.vedio[_this.taskCount].length > 0) {
 
+          //   _this.vedioTime = document.getElementsByClassName(
 
+          //     "vjs-duration-display"
 
+          //   )[0].textContent;
 
+          // }
 
         })
 
         .catch((err) => {
 
           loading.close();
 
@@ -3746,9 +3778,33 @@ export default {
 
     });
 
 
     setTimeout(() => {
 
-      this.vedioTime = document.getElementsByClassName(
 
-        "vjs-duration-display"
 
-      )[0].textContent;
 
+      // this.vedioTime = document.getElementsByClassName(
 
+      //   "vjs-duration-display"
 
+      // )[0].textContent;
 
+      let _vedio = _this.vedio;
 
+      let _count = 0;
 
+      for (var i = 0; i < _vedio.length; i++) {
 
+        if (typeof _this.vedioTime != "object") {
 
+          _this.vedioTime = [];
 
+        }
 
+        for (var j = 0; j < _vedio[i].length; j++) {
 
+          if (!_this.vedioTime[i]) {
 
+            _this.vedioTime[i] = [];
 
+          }
 
+          for (var k = 0; k < _vedio[i][j].length; k++) {
 
+            if (!_this.vedioTime[i][j]) {
 
+              _this.vedioTime[i][j] = [];
 
+            }
 
+            if (_vedio[i][j][k]) {
 
+              _this.vedioTime[i][j].push(
 
+                document.getElementsByClassName("vjs-duration-display")[_count]
 
+                  .textContent
 
+              );
 
+              _count++;
 
+            }
 
+          }
 
+        }
 
+      }
 
     }, 1000);
 
   },
 
 };
 
@@ -4407,6 +4463,7 @@ export default {
 
   font-size: 14px;
 
   left: 110px;
 
   height: 60px;
 
+  overflow: hidden;
 
 }
 
 .vedioTime {
 
   width: 35px;

+ 121 - 41
src/components/studyStudent.vue
View File 

@@ -373,7 +373,7 @@
 
                             "
 
                             alt
 
                           />
 
-                          <div class="vedioTime">{{ vedioTime }}</div>
 
+                          <div class="vedioTime">{{ vedioTime[vedioIndex] }}</div>
 
                           <!-- <div class="vedioName">{{ media.name }}</div> -->
 
                         </div>
 
                         <div class="vedioName">{{ media.name }}</div>
 
@@ -934,7 +934,7 @@
 
                         v-for="(w, wIndex) in workStudent[toolIndex]"
 
                         :key="wIndex"
 
                       >
 
-                        <div class="workImg" v-if="w.type == 2">
 
+                        <div class="workImg">
 
                           <!-- <img
 
                             src="../assets/icon/works/noImg.png"
 
                             @click="openTools(15, toolIndex, taskCount, w.works)"
 
@@ -1128,13 +1128,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -1179,14 +1185,20 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div>
 
                       <div
 
                         class="worksDetailBox"
 
-                        v-if="worksStudent[toolIndex].length > 0"
 
+                        v-if="
 
+                          worksStudent.length &&
 
+                          worksStudent[toolIndex].length > 0
 
+                        "
 
                       >
 
                         <div
 
                           class="works"
 
@@ -1236,7 +1248,10 @@
 
                       </div>
 
                     </div>
 
                     <AskStatic
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                       :askJSON="worksStudent[toolIndex][0].works"
 
                       :checkJson="checkJson[toolIndex]"
 
                     ></AskStatic>
 
@@ -1247,20 +1262,26 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
                         v-for="(w, wIndex) in worksStudent[toolIndex]"
 
                         :key="wIndex"
 
                       >
 
-                        <div class="workImg" v-if="w.type == 2">
 
+                        <div class="workImg">
 
                           <!-- <img
 
                             src="../assets/icon/works/noImg.png"
 
                             @click="openTools(15, toolIndex, taskCount, w.works)"
 
@@ -1299,13 +1320,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -1343,13 +1370,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -1387,13 +1420,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -1431,13 +1470,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -1475,13 +1520,19 @@
 
                   >
 
                     <div
 
                       style="padding-top: 15px; font-size: 18px"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       作业预览
 
                     </div>
 
                     <div
 
                       class="worksDetailBox"
 
-                      v-if="worksStudent[toolIndex].length > 0"
 
+                      v-if="
 
+                        worksStudent.length &&
 
+                        worksStudent[toolIndex].length > 0
 
+                      "
 
                     >
 
                       <div
 
                         class="works"
 
@@ -2223,7 +2274,7 @@ export default {
 
       chapTools: [],
 
       chapToolList: [],
 
       file: [],
 
-      vedioTime: "",
 
+      vedioTime: [],
 
       upToolImg: "",
 
       rateList: {
 
         ca: 0,
 
@@ -2526,7 +2577,11 @@ export default {
 
             this.workStudent[i] = [];
 
             for (var j = 0; j < b.length; j++) {
 
               if (i == b[j].tool) {
 
-                if (b[j].type == 1 || b[j].type == 4) {
 
+                if (
 
+                  (b[j].type == 1 || b[j].type == 4) &&
 
+                  a[i].tool[0] != 15 &&
 
+                  a[i].tool[0] != 4
 
+                ) {
 
                   if (
 
                     c.indexOf(
 
                       b[j].content
 
@@ -2548,7 +2603,14 @@ export default {
 
                       time: b[j].time,
 
                     });
 
                   }
 
-                } else {
 
+                } else if (b[j].type == 3 && a[i].tool[0] != 15) {
 
+                  this.workStudent[i].push({
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    type: 2,
 
+                    time: b[j].time,
 
+                  });
 
+                } else if (b[j].type == 4 && a[i].tool[0] != 4) {
 
                   this.workStudent[i].push({
 
                     works: b[j].content,
 
                     sName: b[j].name,
 
@@ -2587,7 +2649,7 @@ export default {
 
             for (var j = 0; j < b.length; j++) {
 
               var data = b[j];
 
               if (i == b[j].tool) {
 
-                if (data.type == 2) {
 
+                if (data.type == 2 && a[i].tool[0] == 4) {
 
                   var checkL = JSON.parse(data.content)[0].anwer.split(",");
 
                   for (var z = 0; z < checkL.length; z++) {
 
                     if (!this.checkJson[i][z]) {
 
@@ -2608,7 +2670,11 @@ export default {
 
                         ] = 1);
 
                   }
 
                 }
 
-                if (b[j].type == 1 || b[j].type == 4) {
 
+                if (
 
+                  (b[j].type == 1 || b[j].type == 4) &&
 
+                  a[i].tool[0] != 15 &&
 
+                  a[i].tool[0] != 4
 
+                ) {
 
                   if (
 
                     c.indexOf(
 
                       b[j].content
 
@@ -2630,7 +2696,14 @@ export default {
 
                       time: b[j].time,
 
                     });
 
                   }
 
-                } else {
 
+                } else if (b[j].type == 3 && a[i].tool[0] == 15) {
 
+                  this.worksStudent[i].push({
 
+                    works: b[j].content,
 
+                    sName: b[j].name,
 
+                    type: 2,
 
+                    time: b[j].time,
 
+                  });
 
+                } else if (b[j].type == 4 && a[i].tool[0] == 4) {
 
                   this.worksStudent[i].push({
 
                     works: b[j].content,
 
                     sName: b[j].name,
 
@@ -3226,13 +3299,16 @@ export default {
 
                 a + "px";
 
               document.getElementsByClassName("navBox")[0].style.height =
 
                 a - 40 + "px";
 
+              if (_this.vedio[_this.taskCount].length > 0) {
 
+                _this.vedioTime = [];
 
+                for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
+                  _this.vedioTime[i] = document.getElementsByClassName(
 
+                    "vjs-duration-display"
 
+                  )[i].textContent;
 
+                }
 
+              }
 
             }, 500);
 
           });
 
-          if (_this.vedio[_this.taskCount].length > 0) {
 
-            _this.vedioTime = document.getElementsByClassName(
 
-              "vjs-duration-display"
 
-            )[0].textContent;
 
-          }
 
         })
 
         .catch((err) => {
 
           loading.close();
 
@@ -3883,11 +3959,14 @@ export default {
 
       document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
       document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
     });
 
-
 
+    let _this = this
 
     setTimeout(() => {
 
-      this.vedioTime = document.getElementsByClassName(
 
-        "vjs-duration-display"
 
-      )[0].textContent;
 
+      _this.vedioTime = [];
 
+      for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
+        _this.vedioTime[i] = document.getElementsByClassName(
 
+          "vjs-duration-display"
 
+        )[i].textContent;
 
+      }
 
     }, 1000);
 
   },
 
 };
 
@@ -4531,6 +4610,7 @@ export default {
 
   font-size: 14px;
 
   left: 110px;
 
   height: 60px;
 
+  overflow: hidden;
 
 }
 
 .vedioTime {
 
   width: 35px;
 
@@ -4980,7 +5060,7 @@ export default {
 
   width: calc(100% / 3 - 10px);
 
   height: auto;
 
   margin-right: 10px;
 
-  margin-bottom:10px
 
+  margin-bottom: 10px;
 
 }
 
 .workImg {
 
   width: 100%;
 
@@ -5043,11 +5123,11 @@ export default {
 
 }
 
 .textBox {
 
   font-size: 20px;
 
-    width: 90%;
 
-    display: flex;
 
-    flex-direction: column;
 
-    align-items: center;
 
-    margin: 20px auto 0;
 
+  width: 90%;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  margin: 20px auto 0;
 
 }
 
 .textContent {
 
   font-size: 18px;

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