SanHQin 4 dienas atpakaļ
vecāks
revīzija
1cbc961695

+ 11 - 4
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.fb00174be64e4ec101c162929c3317a0.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.acbd8cb5870df69e0141.js></script><script type=text/javascript src=./static/js/app.ff462ee07c76d3bfd9e3.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.eea43e87efb06b71ebb38e5ab3c542a1.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.acbd8cb5870df69e0141.js></script><script type=text/javascript src=./static/js/app.f4d4923aeaf26b1ae494.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {
@@ -53,15 +53,22 @@
 
   window.onload = () => {
     stopSafari();
+    let topU = ""
     try{
       if(window.parent.U){
         topU = window.parent
-      }
+      }else if(window.parent.parent.U){
+        topU =  window.parent.parent
+      }else if(window.top.U){
+        topU = window.top
+      } 
     }catch(e){
       try {
         if(window.parent.parent.U){
-          topU = window.parent.parent
-        }
+          topU =  window.parent.parent
+        }else if(window.top.U){
+          topU = window.top
+        } 
       } catch (error) {
         if(window.top.U){
           topU = window.top

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.eea43e87efb06b71ebb38e5ab3c542a1.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/css/app.eea43e87efb06b71ebb38e5ab3c542a1.css.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.f4d4923aeaf26b1ae494.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/app.f4d4923aeaf26b1ae494.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 12 - 2
src/components/easy/studyStudent.vue

@@ -239,9 +239,19 @@
                     <iframe style="width: 100%; height: 100%; border: none" :src="pptImgUrl1"></iframe>
                   </div>
                   <div class="wheel" v-else-if="showType == 2" style="width: 95%; margin: 0 auto">
-                    <iframe style="width: 100%; height: 100%; border: none" security="restricted"
+                    <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.includes('cloud.cocorobo.cn')!=-1"
+                      :src="pptImgUrl1"
+                    ></iframe>
+                    <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-else
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
-                      :src="pptImgUrl1"></iframe>
+                      :src="pptImgUrl1"
+                    ></iframe>
                   </div>
                   <div class="wheel" v-if="showType == 3" style="width: 95%; margin: 0 auto">
                     <pdf :pdfUrl="pptImgUrl1" style="width: 100%; height: 100%; overflow: auto"></pdf>

+ 14 - 7
src/components/easy2/studyStudent.vue

@@ -654,9 +654,16 @@
                     v-else-if="showType == 2"
                     style="width: 95%; margin: 0 auto"
                   >
+                  <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.includes('cloud.cocorobo.cn')!=-1"
+                      :src="pptImgUrl1"
+                    ></iframe>
                     <iframe
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
+                      v-else
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
                       :src="pptImgUrl1"
                     ></iframe>
@@ -26010,13 +26017,13 @@ export default {
         this.updateToolDetail(this.toolDetailIndex);
       }
     });
-    if (this.screenType == 2) {
-      window.topU.postMessage({ allScreen: 4 }, "*");
-    } else if (this.screenType == 3) {
-      window.topU.postMessage({ allScreen: 5 }, "*");
-    } else if (this.screenType == 1) {
-      window.topU.postMessage({ allScreen: 6 }, "*");
-    }
+    //if (this.screenType == 2) {
+    //  window.topU.postMessage({ allScreen: 4 }, "*");
+    //} else if (this.screenType == 3) {
+    //  window.topU.postMessage({ allScreen: 5 }, "*");
+    //} else if (this.screenType == 1) {
+    //  window.topU.postMessage({ allScreen: 6 }, "*");
+    //}
     this.setOperationTime();
     this.selectEva();
     this.getCourseDetail();

+ 9 - 0
src/components/easy3/studyStudent.vue

@@ -617,12 +617,21 @@
                     v-else-if="showType == 2"
                     style="width: 95%; margin: 0 auto"
                   >
+
+                  <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.includes('cloud.cocorobo.cn')!=-1"
+                      :src="pptImgUrl1"
+                    ></iframe>
                     <iframe
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
+                      v-else
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
                       :src="pptImgUrl1"
                     ></iframe>
+                   
                   </div>
                   <div
                     class="wheel"

+ 7 - 0
src/components/studyStudent.vue

@@ -583,9 +583,16 @@
                     v-else-if="showType == 2"
                     style="width: 95%; margin: 0 auto"
                   >
+                  <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.includes('cloud.cocorobo.cn')!=-1"
+                      :src="pptImgUrl1"
+                    ></iframe>
                     <iframe
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
+                      v-else
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
                       :src="pptImgUrl1"
                     ></iframe>

+ 7 - 0
src/components/studySutdentClass/studyStudent.vue

@@ -617,9 +617,16 @@
                     v-else-if="showType == 2"
                     style="width: 95%; margin: 0 auto"
                   >
+                  <iframe
+                      style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.includes('cloud.cocorobo.cn')!=-1"
+                      :src="pptImgUrl1"
+                    ></iframe>
                     <iframe
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
+                      v-else
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
                       :src="pptImgUrl1"
                     ></iframe>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels