lsc 2 years ago
parent
commit
31f36e5f4a

File diff suppressed because it is too large
+ 0 - 0
dist/fca5d65f9edf96ade230.worker.js


File diff suppressed because it is too large
+ 0 - 0
dist/fca5d65f9edf96ade230.worker.js.map


+ 1 - 1
dist/index.html

@@ -18,4 +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);
-    }</style><link href=./static/css/app.ea524423cd03cc8f41a18cf40322f3a1.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.8ec9b3e36150e06c0532.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.d0f35dc8af02f16e1437f15a1ceda8f8.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.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.619060b93593c61121a8.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 876 - 71
package-lock.json


+ 2 - 2
package.json

@@ -22,11 +22,11 @@
     "js-audio-recorder": "^1.0.7",
     "jsmind": "^0.4.8",
     "lamejs": "^1.2.1",
-    "pdfjs-dist": "^2.16.105",
+    "pdfjs-dist": "^2.5.207",
     "vue": "^2.5.2",
     "vue-cookies": "^1.7.4",
     "vue-jsmind": "^1.5.0",
-    "vue-pdf": "^4.3.0",
+    "vue-pdf": "^4.2.0",
     "vue-router": "^3.0.1",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.6.2",

+ 11 - 6
src/components/components/pdf3.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pdf">
-    <div class="show" v-if="src">
+    <div class="show">
       <div v-for="i in numPages" :key="i" class="p-pdf">
         <pdf :src="src" :page="i" class="pdfbox"></pdf>
         <!-- <span>{{i}}</span> -->
@@ -63,7 +63,7 @@ export default {
       this.$emit("getPageTotal", val);
     },
     pdfUrl(newValue, oldValue) {
-      if(this.loading){
+      if (this.loading) {
         this.loading.close();
       }
       this.loading = this.$loading.service({
@@ -72,7 +72,9 @@ export default {
       });
       this.numPages = 0;
       this.src = null;
-      this.reportPreview();
+      setTimeout(() => {
+        this.reportPreview();
+      }, 500);
     },
   },
   computed: {},
@@ -93,7 +95,9 @@ export default {
     // });
     this.numPages = 0;
     this.src = null;
-    this.reportPreview();
+    setTimeout(() => {
+      this.reportPreview();
+    }, 500);
   },
   methods: {
     //下载PDF
@@ -201,12 +205,13 @@ export default {
       });
     },
     async reportPreview() {
-      this.src = pdf.createLoadingTask({
+      let _src = pdf.createLoadingTask({
         url: this.pdfUrl,
         cMapUrl: "https://cdn.jsdelivr.net/npm/pdfjs-dist@2.16.105/cmaps/",
         cMapPacked: true,
       });
-      this.src.promise.then((pdf) => {
+      _src.promise.then((pdf) => {
+        this.src = _src
         this.loading.close();
         this.numPages = pdf.numPages;
       });

+ 1 - 1
src/components/study.vue

@@ -3897,7 +3897,7 @@ 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"

+ 54 - 17
src/components/studyStudent.vue

@@ -1132,8 +1132,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(16) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(16) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1190,8 +1193,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(4) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(4) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1268,8 +1274,11 @@
                     ></AskStatic>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(15) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(15) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1327,8 +1336,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(1) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(1) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1378,8 +1390,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(3) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(3) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1429,8 +1444,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(6) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(6) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1480,8 +1498,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(7) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(7) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -1531,8 +1552,11 @@
                     </div>
                   </div>
                   <div
-                    v-if="tType && ((tType == 2 && sIsOpen == true) ||
-                          tType == 1) && tool.tool.indexOf(26) != -1"
+                    v-if="
+                      tType &&
+                      ((tType == 2 && sIsOpen == true) || tType == 1) &&
+                      tool.tool.indexOf(26) != -1
+                    "
                     class="worksBox"
                   >
                     <div
@@ -2422,6 +2446,7 @@ export default {
       isAnswer: false,
       timer: null,
       showType: 0,
+      pdfShow: false,
       fileType: 0,
       showPDF: false,
       noteName: "",
@@ -3283,6 +3308,10 @@ export default {
                   ) {
                     this.showType = 3;
                     this.pptImgUrl1 = _url;
+                    this.pdfShow = false;
+                    setTimeout(() => {
+                      this.pdfShow = true;
+                    }, 0);
                   } else if (
                     this.isAssetTypeAnImage(
                       _url
@@ -3340,6 +3369,10 @@ export default {
                       ) {
                         this.showType = 3;
                         this.pptImgUrl1 = _url;
+                        this.pdfShow = false;
+                        setTimeout(() => {
+                          this.pdfShow = true;
+                        }, 0);
                       } else if (
                         this.isAssetTypeAnImage(
                           _url
@@ -3542,6 +3575,10 @@ export default {
         this.pptImgUrl1 = f.url;
         // this.dialogVisible3 = true;
         this.showType = 3;
+        this.pdfShow = false;
+        setTimeout(() => {
+          this.pdfShow = true;
+        }, 0);
       } else {
         window.open(this.file[i].url);
       }
@@ -4737,7 +4774,7 @@ export default {
   left: 110px;
   height: 60px;
   overflow: hidden;
-  width:auto;
+  width: auto;
   word-break: break-all;
 }
 .vedioTime {

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