lsc 1 year ago
parent
commit
8bbede717d

+ 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.9eca6bc382527fe8a4f6b8083daef0f2.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.83b405f05472d363c1b6.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.91973af68ffcdca29eef2285811ed5ad.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.b8c65ce317ac36ff34f6.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.91973af68ffcdca29eef2285811ed5ad.css


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


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


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


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


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


+ 41 - 41
src/components/noTerminal/studyStudent.vue

@@ -1835,6 +1835,12 @@
                     tType == 4) &&
                   tool.tool.indexOf(16) != -1
                 " class="worksBox">
+                  <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
+                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -1996,12 +2002,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
-                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2014,6 +2014,12 @@
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
                   ">
+                                    <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
+                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
+                      {{ s.student }}
+                    </div>
+                  </div>
                     <div class="worksTop">
                       <div>作业预览</div>
                       <div class="corOpen" @click="contract(toolIndex)" v-if="
@@ -2090,12 +2096,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
-                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2104,6 +2104,12 @@
                     tType == 4) &&
                   tool.tool.indexOf(57) != -1
                 " class="worksBox">
+                                  <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
+                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2184,14 +2190,14 @@
                       </div>
                     </div>
                   </div>
+                </div>
+                <div v-if="tool.tool.indexOf(50) != -1" class="worksBox">
                   <div class="noWorksS">
                     <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
                       @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
                       {{ s.student }}
                     </div>
                   </div>
-                </div>
-                <div v-if="tool.tool.indexOf(50) != -1" class="worksBox">
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2326,12 +2332,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName"
-                      @click="teacherWorkSubmit(16, toolIndex, taskCount, s)">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2376,6 +2376,11 @@
                     tType == 4) &&
                   tool.tool.indexOf(4) != -1
                 " class="worksBox">
+                                  <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2414,11 +2419,6 @@
                     </div>
                   </div>
 
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2463,6 +2463,11 @@
                     tType == 4) &&
                   tool.tool.indexOf(45) != -1
                 " class="worksBox">
+                               <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2505,12 +2510,6 @@
                       </div>
                     </div>
                   </div>
-
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2519,6 +2518,11 @@
                     tType == 4) &&
                   tool.tool.indexOf(15) != -1
                 " class="worksBox">
+                           <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2606,11 +2610,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
-                      {{ s.student }}
-                    </div>
-                  </div>
                 </div>
                 <div v-if="
                   tType &&
@@ -2619,6 +2618,11 @@
                     tType == 4) &&
                   tool.tool.indexOf(1) != -1
                 " class="worksBox">
+                                  <div class="noWorksS">
+                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
+                      {{ s.student }}
+                    </div>
+                  </div>
                   <div class="zuoyeYulan" v-if="
                     worksStudent2.length &&
                     worksStudent2[toolIndex].length > 0
@@ -2694,11 +2698,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="noWorksS">
-                    <div v-for="(s, sIndex) in noWorksS[toolIndex]" :key="sIndex" class="noWorksName">
-                      {{ s.student }}
-                    </div>
-                  </div>
+
                 </div>
                 <div v-if="
                   tType &&

+ 149 - 0
src/components/studyStudent.vue

@@ -8322,6 +8322,155 @@ export default {
             } else {
               this.isClickNav = "video0";
             }
+          }else{
+            var a = JSON.parse(res.data[0][0].chapters)[this.courseType]
+              .chapterInfo[0].taskJson;
+            var b = [
+              "AVI",
+              "NAVI",
+              "MPEG",
+              "ASF",
+              "MOV",
+              "WMV",
+              "3GP",
+              "RM",
+              "RMVB",
+              "FLV",
+              "F4V",
+              "H.264",
+              "H.265",
+              "REAL VIDEO",
+              "MKV",
+              "WebM",
+              "HDDVD",
+              "MP4",
+              "MPG",
+              "M4V",
+              "MGV",
+              "OGV",
+              "QTM",
+              "STR",
+              "AMC",
+              "DVX",
+              "EVO",
+              "DAT",
+              "OGG",
+              "OGM",
+              "MP3",
+            ];
+
+            for (var i = 0; i < a.length; i++) {
+              var c = a[i].chapterData;
+              this.vedio[i] = [];
+              this.textList[i] = [];
+              this.lineList[i] = [];
+              this.chapToolList[i] = [];
+              this.file[i] = [];
+              this.fileC[i] = [];
+              for (var j = 0; j < c.length; j++) {
+                if (c[j].type == 7) {
+                  this.chapToolList[i].push(c[j]);
+                } else if (c[j].type == 8) {
+                  this.lineList[i].push(c[j]);
+                } else if (c[j].type == 6) {
+                  this.textList[i].push(c[j]);
+                } else if (c[j].type == 12) {
+                  this.fileC[i].push(c[j]);
+                } else {
+                  if (
+                    b.indexOf(
+                      c[j].url
+                        .split(".")
+                      [c[j].url.split(".").length - 1].toLocaleUpperCase()
+                    ) != -1
+                  ) {
+                    this.vedio[i].push(c[j]);
+                  } else {
+                    this.file[i].push(c[j]);
+                  }
+                }
+              }
+              var d = JSON.parse(JSON.stringify(this.playerOptions));
+              d.sources[0].src =
+                this.vedio[i].length > 0 ? this.vedio[i][0].url : this.mr;
+              this.playerO[i] = d;
+            }
+            if (
+              !this.vedio[this.taskCount][0] ||
+              this.vedio[this.taskCount][0].url == ""
+            ) {
+              if (
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                  this.taskCount
+                ].chapterData.length > 0
+              ) {
+                // if (
+                //   this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                //     this.taskCount
+                //   ].chapterData[0].type != 8
+                // ) {
+                let _url =
+                  this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                    this.taskCount
+                  ].chapterData[0].url;
+                if (
+                  this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                    this.taskCount
+                  ].chapterData[0].type == 8
+                ) {
+                  this.showType = 2;
+                  if (
+                    _url.indexOf("https://") == -1 &&
+                    _url.indexOf("http://") == -1
+                  ) {
+                    _url = "https://" + _url;
+                  }
+                  this.pptImgUrl1 = _url;
+                  this.isClickNav = "line0";
+                } else if (
+                  this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                    this.taskCount
+                  ].chapterData[0].type == 3
+                ) {
+                  if (
+                    _url
+                      .split(".")
+                    [_url.split(".").length - 1].toLocaleUpperCase() == "PDF"
+                  ) {
+                    this.showType = 3;
+                    this.pptImgUrl1 = _url;
+                    this.isClickNav = "word0";
+                  } else if (
+                    this.isAssetTypeAnImage(
+                      _url
+                        .split(".")
+                      [_url.split(".").length - 1].toLocaleLowerCase()
+                    )
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                    this.isClickNav = "word0";
+                  } else {
+                    this.showType = 2;
+                    this.pptImgUrl1 =
+                      "https://view.officeapps.live.com/op/view.aspx?src=" +
+                      _url;
+                    this.isClickNav = "word0";
+                  }
+                } else if (
+                  this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                    this.taskCount
+                  ].chapterData[0].type == 6
+                ) {
+                  this.showType = 1;
+                  this.text = this.textList[this.taskCount][0];
+                  this.isClickNav = "text0";
+                }
+              }
+            } else {
+              this.isClickNav = "video0";
+            }
+            this.$forceUpdate();
           }
           //  else {
           //   this.courseDetail = res.data[0][0];

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