Halaman utama Jelajahi Bantuan
Masuk
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

update

lsc 1 tahun lalu
induk
65aabfe0cb
melakukan
b0973bb3da
13 mengubah file dengan 39 tambahan dan 52 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.f2384861035582ff0f4591fda47c5f9f.css
  3. 0 0
      dist/static/css/app.f2384861035582ff0f4591fda47c5f9f.css.map
  4. 0 0
      dist/static/js/app.863632530df518dfd16d.js
  5. 0 0
      dist/static/js/app.863632530df518dfd16d.js.map
  6. 0 0
      dist/static/js/app.974d590c06d3d0f1e46b.js
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 12 13
      src/components/noTerminal/studyStudent.vue
  9. 5 11
      src/components/student/studyStudent.vue
  10. 2 2
      src/components/studentIndex.vue
  11. 2 2
      src/components/studio/index.vue
  12. 4 10
      src/components/studio/studyStudent.vue
  13. 13 13
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
Tampilan Berkas 

@@ -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.6a4256fef670e95c0d4798e09f6b985f.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.974d590c06d3d0f1e46b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.f2384861035582ff0f4591fda47c5f9f.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.863632530df518dfd16d.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f2384861035582ff0f4591fda47c5f9f.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f2384861035582ff0f4591fda47c5f9f.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.863632530df518dfd16d.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.863632530df518dfd16d.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.974d590c06d3d0f1e46b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 12 - 13
src/components/noTerminal/studyStudent.vue
Tampilan Berkas 

@@ -243,7 +243,10 @@
 
                       <div v-html="text.url" class="textContent cont"></div>
 
                     </el-form>
 
                   </div>
 
-                  <div class="wheel" v-if="showType == 2" style="width: 95%; margin: 0 auto">
 
+                  <div class="wheel" v-if="pptImgUrl1.indexOf('https://view.officeapps.live.com/op/view.aspx?src=') != -1 && showType == 2" style="width: 95%; margin: 0 auto">
 
+                    <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"
 
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
 
                       :src="pptImgUrl1"></iframe>
 
@@ -3956,13 +3959,10 @@
 
       </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  allow-popups"></iframe>
 
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
     </el-dialog>
 
     <el-dialog title="文件预览" :visible.sync="dialogVisible6" width="50%" :before-close="handleClose" class="dialog_diy">
 
-      <iframe :src="pptImgUrl1" frameborder="0" width="100%" height="600" security="restricted"
 
-        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"></iframe>
 
+      <iframe :src="pptImgUrl1" frameborder="0" width="100%" height="600"></iframe>
 
     </el-dialog>
 
     <el-dialog title="提示" :visible.sync="dialogVisible4" :append-to-body="true" width="800px" :before-close="handleClose"
 
       class="dialog_diy notice">
 
@@ -4074,9 +4074,7 @@
 
           <img src="../../assets/teacherWork.png" v-if="commentDetail.ateacher" class="w_teachert" />
 
           <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  allow-popups"></iframe>
 
+          <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
         </div>
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 0">
 
           <img src="../../assets/teacherWork.png" v-if="commentDetail.ateacher" class="w_teachert" style="right: 105px" />
 
@@ -4235,7 +4233,10 @@
 
         </div>
 
       </div>
 
       <div style="height: 100%">
 
-        <iframe v-if="fulltype == 2" style="width: 100%; height: 100%; border: none" :src="fullUrl" security="restricted"
 
+        <div class="wheel" v-if="fullUrl.indexOf('https://view.officeapps.live.com/op/view.aspx?src=') != -1 && fulltype == 2" style="width: 95%; margin: 0 auto">
 
+            <iframe style="width: 100%; height: 100%; border: none" :src="fullUrl"></iframe>
 
+        </div>
 
+        <iframe v-else-if="fulltype == 2" 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 == 3" :pdfUrl="fullUrl" style="width: 100%; height: 100%; overflow: auto"></pdf>
 
         <div class="wheel" v-if="fulltype == 1" style="
 
@@ -4419,9 +4420,7 @@
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 1">
 
           <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 allow-popups"></iframe>
 
+          <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
         </div>
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 0">
 
           <img :src="commentDetail.works" alt="" @click="previewImg(commentDetail.works)" />

+ 5 - 11
src/components/student/studyStudent.vue
Tampilan Berkas 

@@ -254,9 +254,7 @@
 
                   </div>
 
                   <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 allow-popups"></iframe>
 
+                    <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">
 
@@ -559,14 +557,13 @@
 
                         <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 allow-popups"></iframe>
 
+                            :src="tool.toolData[tool.sourceIndex].src"></iframe>
 
                         </div>
 
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 8"
 
                           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>
 
+                      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
 
                         </div>
 
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 9"
 
                           style="height: 650px; width: 98%">
 
@@ -811,8 +808,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 allow-popups"></iframe>
 
+        <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;
 
@@ -856,9 +852,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 allow-popups"></iframe>
 
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
     </el-dialog>
 
     <el-dialog title="查看文档" :visible.sync="dialogVisibleText2" :append-to-body="true" width="800px"
 
       :before-close="handleClose" class="dialog_diy">

+ 2 - 2
src/components/studentIndex.vue
Tampilan Berkas 

@@ -12,7 +12,7 @@
 
       </div>
 
       <div class="reBox">
 
         <div class="reTop">
 
-          <div>课程</div>
 
+          <div>项目</div>
 
           <div>
 
             <div class="search" @click="search">
 
               <img src="../assets/icon/search.png" alt="" />
 
@@ -162,7 +162,7 @@
 
               </div>
 
             </div>
 
             <div class="course_empty" v-if="zoneClass.length == 0">
 
-              暂无课程
 
+              暂无项目
 
             </div>
 
           </div>
 
         </div>

+ 2 - 2
src/components/studio/index.vue
Tampilan Berkas 

@@ -12,7 +12,7 @@
 
       </div>
 
       <div class="reBox">
 
         <div class="reTop">
 
-          <div>课程</div>
 
+          <div>项目</div>
 
           <div>
 
             <div class="search" @click="search">
 
               <img src="../../assets/icon/search.png" alt="" />
 
@@ -157,7 +157,7 @@
 
               </div>
 
             </div>
 
             <div class="course_empty" v-if="zoneClass.length == 0">
 
-              暂无课程
 
+              暂无项目
 
             </div>
 
           </div>
 
         </div>

+ 4 - 10
src/components/studio/studyStudent.vue
Tampilan Berkas 

@@ -254,9 +254,7 @@
 
                   </div>
 
                   <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 allow-popups"></iframe>
 
+                    <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">
 
@@ -559,8 +557,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 allow-popups"></iframe>
 
+                            :src="tool.toolData[tool.sourceIndex].src"></iframe>
 
                         </div>
 
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 8"
 
                           style="height: 650px; width: 98%">
 
@@ -811,8 +808,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 allow-popups"></iframe>
 
+        <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;
 
@@ -856,9 +852,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 allow-popups"></iframe>
 
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
     </el-dialog>
 
     <el-dialog title="查看文档" :visible.sync="dialogVisibleText2" :append-to-body="true" width="800px"
 
       :before-close="handleClose" class="dialog_diy">

+ 13 - 13
src/components/studyStudent.vue
Tampilan Berkas 

@@ -222,7 +222,11 @@
 
                       <div v-html="text.url" class="textContent cont"></div>
 
                     </el-form>
 
                   </div>
 
-                  <div class="wheel" v-if="showType == 2" style="width: 95%; margin: 0 auto">
 
+                  <div class="wheel" v-if="pptImgUrl1.indexOf('https://view.officeapps.live.com/op/view.aspx?src=') != -1 && showType == 2" style="width: 95%; margin: 0 auto">
 
+                    <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"
 
                       sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"
 
                       :src="pptImgUrl1"></iframe>
 
@@ -4154,13 +4158,10 @@
 
       </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  allow-popups"></iframe>
 
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
     </el-dialog>
 
     <el-dialog title="文件预览" :visible.sync="dialogVisible6" width="50%" :before-close="handleClose" class="dialog_diy">
 
-      <iframe :src="pptImgUrl1" frameborder="0" width="100%" height="600" security="restricted"
 
-        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts  allow-popups"></iframe>
 
+      <iframe :src="pptImgUrl1" frameborder="0" width="100%" height="600" ></iframe>
 
     </el-dialog>
 
     <el-dialog title="提示" :visible.sync="dialogVisible4" :append-to-body="true" width="800px" :before-close="handleClose"
 
       class="dialog_diy notice">
 
@@ -4272,9 +4273,7 @@
 
           <img src="../assets/teacherWork.png" v-if="commentDetail.ateacher" class="w_teachert" />
 
           <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  allow-popups"></iframe>
 
+          <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
         </div>
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 0">
 
           <img src="../assets/teacherWork.png" v-if="commentDetail.ateacher" class="w_teachert" style="right: 105px" />
 
@@ -4432,7 +4431,10 @@
 
         </div>
 
       </div>
 
       <div style="height: 100%">
 
-        <iframe v-if="fulltype == 2" style="width: 100%; height: 100%; border: none" :src="fullUrl" security="restricted"
 
+        <div class="wheel" v-if="fullUrl.indexOf('https://view.officeapps.live.com/op/view.aspx?src=') != -1 && fulltype == 2" style="width: 95%; margin: 0 auto">
 
+          <iframe style="width: 100%; height: 100%; border: none" :src="fullUrl"></iframe>
 
+        </div>
 
+        <iframe v-else-if="fulltype == 2" 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 == 3" :pdfUrl="fullUrl" style="width: 100%; height: 100%; overflow: auto"></pdf>
 
         <div class="wheel" v-if="fulltype == 1" style="
 
@@ -4560,9 +4562,7 @@
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 1">
 
           <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 allow-popups"></iframe>
 
+          <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
 
         </div>
 
         <div class="worksAnswer" v-if="commentDetail.works && commentDetail.type == 0">
 
           <img :src="commentDetail.works" alt="" @click="previewImg(commentDetail.works)" />

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini