update

js/jietu.js

@@ -1,3 +1,4 @@
+let $ = $.ajax ? $ : $jq
 function jietu_shishi(uid, cid,page,type) {
   html2canvas($("body")[0]).then(function (canvas) {
     //获取截取图片路径

js/jietu2.js

@@ -11,9 +11,10 @@
 //  _lchild.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;display:flex;align-items:center;"
 //  _loading.appendChild(_lchild)
 //  document.body.appendChild(_loading)
-
+$jq = $
+var $180 = $.noConflict(); 
 function jietu_shishi(uid, cid, stage, task, tool) {
-  html2canvas($("body")[0]).then(function (canvas) {
+  html2canvas($jq("body")[0]).then(function (canvas) {
     //获取截取图片路径
 
     var base64Url = canvas.toDataURL('image/png');
@@ -22,7 +23,7 @@ function jietu_shishi(uid, cid, stage, task, tool) {
     var base64 = "<img src=" + base64Url + " />"
     var file = dataURLtoFile_shishi(base64Url, "截图")
     beforeUpload_shishi(file, uid, cid, stage, task, tool)
-    // $("body")[0].innerHTML = base64
+    // $jq("body")[0].innerHTML = base64
   });
 }
 
@@ -101,7 +102,7 @@ function addSWork_shishi(uid, cid, stage, task, tool, a, loading,atool, text) {
     text:text
     // upload: JSON.stringify(this.imgFileUp),
   };
-  $.ajax({
+  $jq.ajax({
     type: 'POST',
     url: 'https://pbl.cocorobo.cn/api/pbl/addCourseWorks4',
     data: params,

js/jietu4.js

@@ -1,6 +1,8 @@
 
+$jq = $
+var $180 = $.noConflict(); 
 function jietu_shishi(uid, cid, stage, task, tool) {
-  html2canvas($("body")[0]).then(function (canvas) {
+  html2canvas($jq("body")[0]).then(function (canvas) {
     //获取截取图片路径
 
     var base64Url = canvas.toDataURL('image/png');
@@ -9,7 +11,7 @@ function jietu_shishi(uid, cid, stage, task, tool) {
     var base64 = "<img src=" + base64Url + " />"
     var file = dataURLtoFile_shishi(base64Url, "截图")
     beforeUpload_shishi(file, uid, cid, stage, task, tool)
-    // $("body")[0].innerHTML = base64
+    // $jq("body")[0].innerHTML = base64
   });
 }
 
@@ -88,7 +90,7 @@ function addSWork_shishi(uid, cid, stage, task, tool, a, loading,atool, text) {
     text:text
     // upload: JSON.stringify(this.imgFileUp),
   };
-  $.ajax({
+  $jq.ajax({
     type: 'POST',
     url: 'https://pbl.cocorobo.cn/api/pbl/addCourseWorks4s',
     data: params,

src/components/student/studyStudent.vue

@@ -172,7 +172,7 @@
                   </div>
                 </div>
               </div>
-              <div class="vedioTaskBox" v-if="false">
+              <div class="vedioTaskBox">
                 <div class="box_course" v-if="
                   chapterlist.length > 0
                 ">
@@ -210,6 +210,11 @@
                     <iframe style="width: 100%; height: 100%; border: none"
                       :src="chapterlist[chapterIndex].src"></iframe>
                   </div>
+                  <div class="wheel" v-if="chapterlist[chapterIndex].type == 8"
+                    style="height: 650px; width: 95%; margin: 0 auto">
+                    <iframe style="width: 100%; height: 100%; border: none"
+                      :src="chapterlist[chapterIndex].src"></iframe>
+                  </div>
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 9"
                     style="height: 650px; width: 95%; margin: 0 auto">
                     <pdf :pdfUrl="chapterlist[chapterIndex].src" style="width: 100%; height: 100%; overflow: auto">
@@ -226,7 +231,7 @@
                   <div class="navBox">
                     <div>
                       <div class="vedioTimeBox" v-for="(chapter, cIndex) in chapterlist" :key="cIndex + '1'"
-                        @click="chapterIndex = cIndex">
+                        @click="setChapterIndex(cIndex)">
                         <div class="vedioName" :class="{ isClickNav: chapterIndex == cIndex }">
                           {{ chapter.name }}
                         </div>
@@ -235,18 +240,19 @@
                   </div>
                 </div>
               </div>
-              <div style="padding: 10px 30px 0" v-if="chapterlist[chapterIndex] == 3 || chapterlist[chapterIndex] == 9">
+              <div style="padding: 10px 30px 0"
+                v-if="chapterlist[chapterIndex].type == 3 || chapterlist[chapterIndex].type == 8 || chapterlist[chapterIndex].type == 9">
                 <el-button type="primary"
-                  @click="checkFileFull(showType, chapterlist[chapterIndex].src)">全屏查看</el-button>
+                  @click="checkFileFull(chapterlist[chapterIndex].type, chapterlist[chapterIndex].src)">全屏查看</el-button>
                 <el-button type="primary" @click="downloadFile(chapterlist[chapterIndex].src)"
-                  v-if="isClickNav.indexOf('line') == -1">文件下载</el-button>
-                <el-button v-if="chapterlist[chapterIndex].src" type="primary"
-                  @click="openLine(chapterlist[chapterIndex].url)">打开链接
+                  v-if="chapterlist[chapterIndex].type != 8">文件下载</el-button>
+                <el-button v-if="chapterlist[chapterIndex].type == 8" type="primary"
+                  @click="openLine(chapterlist[chapterIndex].src)">打开链接
                 </el-button>
               </div>
-              <div style="padding: 0px 30px" v-if="chapterlist[chapterIndex] == 6">
+              <div style="padding: 10px 30px 0" v-if="chapterlist[chapterIndex].type == 6">
                 <el-button type="primary"
-                  @click="checkFileFull(showType, chapterlist[chapterIndex].url)">全屏查看</el-button>
+                  @click="checkFileFull(chapterlist[chapterIndex].type, chapterlist[chapterIndex])">全屏查看</el-button>
               </div>
             </div>
           </div>
@@ -545,6 +551,73 @@
         </div>
       </div>
     </div>
+    <el-dialog
+      title="查看文档"
+      :visible.sync="fullDialogVisible"
+      :append-to-body="true"
+      width="100%"
+      :before-close="handleClose"
+      :show-close="false"
+      class="dialog_diy full_diy"
+      :class="{ full_diy2: fulltype == 9 }"
+    >
+      <div slot="title" class="header-title">
+        <div style="color: #fff">查看文档</div>
+        <div
+          @click="fullDialogVisible = false"
+          style="
+            cursor: pointer;
+            position: absolute;
+            top: 20px;
+            right: 20px;
+            color: #fff;
+          "
+        >
+          退出全屏
+        </div>
+      </div>
+      <div style="height: 100%">
+        <iframe
+          v-if="fulltype == 3"
+          style="width: 100%; height: 100%; border: none"
+          :src="fullUrl"
+        ></iframe>
+        <pdf
+          v-else-if="fulltype == 9"
+          :pdfUrl="fullUrl"
+          style="width: 100%; height: 100%; overflow: auto"
+        ></pdf>
+        <div
+          class="wheel"
+          v-if="fulltype == 6"
+          style="
+            box-shadow: 0 0 6px 1px #f2f2f2;
+            width: 100%;
+            background: #f1f1f1;
+          "
+        >
+          <div class="title" style="width: 100%; box-sizing: border-box">
+            查看文档
+          </div>
+          <el-form class="textBox" style="height: 90%">
+            <el-form-item class="textTitle">
+              <div style="font-size: 22px; max-height: 100px; overflow: auto">
+                {{ fullUrl.name }}
+              </div>
+            </el-form-item>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
+            <div
+              v-html="fullUrl.url"
+              class="textContent"
+              style="height: auto"
+            ></div>
+          </el-form>
+        </div>
+      </div>
+      <!-- <div slot="footer">
+        <el-button @click="fullDialogVisible = false">关 闭</el-button>
+      </div> -->
+    </el-dialog>
   </div>
 </template>
 
@@ -1163,6 +1236,17 @@ export default {
     get(i) {
       this.navList[i].isOpen = !this.navList[i].isOpen;
     },
+    setChapterIndex(index) {
+      this.chapterIndex = index
+      this.$nextTick(function () {
+        setTimeout(() => {
+          var a =
+            document.getElementsByClassName("box_course")[0].offsetHeight;
+          document.getElementsByClassName("vedioList")[0].style.height =
+            a + "px";
+        }, 500);
+      });
+    },
     getCourseDetail(type, gindex) {
       let loading;
       if (type != 2) {
@@ -1194,18 +1278,29 @@ export default {
               for (var k = 0; k < this.chapterlist.length; k++) {
                 if (this.chapterlist[k].type == 2) {
                   var d = JSON.parse(JSON.stringify(this.playerOptions));
-                  d.sources[0].src = this.chapterlist[k].src
+                  d.sources[0].src = this.chapterlist[k].url
                   this.chapterlist[k].src = d
                 } else if (this.chapterlist[k].type == 3) {
                   this.chapterlist[k].src = "https://view.officeapps.live.com/op/view.aspx?src=" + this.chapterlist[k].url;
                 } else if (this.chapterlist[k].type == 6) {
                   this.chapterlist[k].name += '.doc'
                 } else if (this.chapterlist[k].type == 8) {
-
+                  if (this.chapterlist[k].url.indexOf("https://") == -1 && this.chapterlist[k].url.indexOf("http://") == -1) {
+                    this.chapterlist[k].src = "https://" + this.chapterlist[k].url;
+                  }
                 } else if (this.chapterlist[k].type == 9) {
                   this.chapterlist[k].src = this.chapterlist[k].url
                 }
               }
+
+              this.$nextTick(function () {
+                setTimeout(() => {
+                  var a =
+                    document.getElementsByClassName("box_course")[0].offsetHeight;
+                  document.getElementsByClassName("vedioList")[0].style.height =
+                    a + "px";
+                }, 500);
+              });
             }
             for (var l = 0; l < this.chapInfoList.length; l++) {
               var w = this.chapInfoList[l].chapterInfo[0].taskJson;
@@ -1852,7 +1947,11 @@ export default {
           console.error(err);
         });
     },
-
+    checkFileFull(type, url) {
+      this.fullDialogVisible = true;
+      this.fulltype = type;
+      this.fullUrl = url;
+    },