Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng 2 years ago
parent
commit
6562d10598
2 changed files with 10 additions and 10 deletions
  1. 4 4
      src/components/student/studyStudent.vue
  2. 6 6
      src/components/studyStudent.vue

+ 4 - 4
src/components/student/studyStudent.vue

@@ -242,7 +242,7 @@
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 3"
                     style="height: 650px; width: 95%; margin: 0 auto">
                     <iframe style="width: 100%; height: 100%; border: none" :src="chapterlist[chapterIndex].src" security="restricted"
-        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"></iframe>
                   </div>
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 8"
                     style="height: 650px; width: 95%; margin: 0 auto">
@@ -550,7 +550,7 @@
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 3"
                           style="height: 650px; width: 98%;">
                           <iframe style="width: 100%; height: 100%; border: none"
-                            :src="tool.toolData[tool.sourceIndex].src" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+                            :src="tool.toolData[tool.sourceIndex].src" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"></iframe>
                         </div>
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 8"
                           style="height: 650px; width: 98%;">
@@ -707,7 +707,7 @@
         </div>
       </div>
       <div style="height: 100%">
-        <iframe v-if="fulltype == 3" style="width: 100%; height: 100%; border: none" :src="fullUrl" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+        <iframe v-if="fulltype == 3" style="width: 100%; height: 100%; border: none" :src="fullUrl" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"></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;
@@ -751,7 +751,7 @@
       </div>
       <pdf v-if="showPDF" :pdfUrl="pptImgUrl" style="width: 100%; height: 520px; overflow: auto"
         :class="{ fullStyle: full }"></pdf>
-      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"></iframe>
     </el-dialog>
     <el-dialog title="查看文档" :visible.sync="dialogVisibleText2" :append-to-body="true" width="800px"
       :before-close="handleClose" class="dialog_diy">

+ 6 - 6
src/components/studyStudent.vue

@@ -298,7 +298,7 @@
                     <iframe
                       style="width: 100%; height: 100%; border: none"
                       security="restricted"
-                      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+                      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
                       :src="pptImgUrl1"
                     ></iframe>
                   </div>
@@ -5385,7 +5385,7 @@
         height="600"
         :class="{ fullStyle: full }"
         security="restricted"
-        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -5401,7 +5401,7 @@
         width="100%"
         height="600"
         security="restricted"
-        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -5605,7 +5605,7 @@
             height="600"
             :class="{ fullStyle: full }"
             security="restricted"
-            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"
           ></iframe>
         </div>
         <div
@@ -5859,7 +5859,7 @@
           style="width: 100%; height: 100%; border: none"
           :src="fullUrl"
           security="restricted"
-          sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+          sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"
         ></iframe>
         <pdf
           v-else-if="fulltype == 3"
@@ -6089,7 +6089,7 @@
             height="600"
             :class="{ fullStyle: full }"
             security="restricted"
-            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
+            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
           ></iframe>
         </div>
         <div