Browse Source

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

lsc 1 week ago
parent
commit
2cd65a43dc

+ 7 - 2
dist/index.html

@@ -1,4 +1,9 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><base target=_blank><style>/* @charset "utf-8";
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=Content-Security-Policy content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
+           media-src * data: blob:;
+           script-src * 'unsafe-inline' 'unsafe-eval';
+           style-src * 'unsafe-inline' 'unsafe-hashes';
+           img-src * data: blob:;
+           font-src * data:;"><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><base target=_blank><style>/* @charset "utf-8";
      @font-face {
         font-family: 'Source Han Sans SC';
         src: url('./static/SourceHanSans-Regular.otf') format('truetype');
@@ -27,7 +32,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.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.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.57ea1c5c854b6de31a40.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.bd53c79605a6ae859462599a27c60c0f.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.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.d71c3ca478d0f5371180.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


+ 7 - 0
index.html

@@ -3,6 +3,13 @@
 
 <head>
   <meta charset="utf-8">
+  <meta http-equiv="Content-Security-Policy" 
+  content="default-src * data: blob: 'unsafe-inline' 'unsafe-eval';
+           media-src * data: blob:;
+           script-src * 'unsafe-inline' 'unsafe-eval';
+           style-src * 'unsafe-inline' 'unsafe-hashes';
+           img-src * data: blob:;
+           font-src * data:;">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>pbl-student</title>
 	<base target="_blank">

+ 10 - 4
src/components/easy2/studyStudent.vue

@@ -613,7 +613,7 @@
                       style="width: 100%; height: 100%; border: none"
 											allow="camera *; microphone *;display-capture;midi;encrypted-media;"
                       :key="diffKey"
-                      v-if="pptImgUrl1.indexOf('knowledge.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('cloud.cocorobo.cn')!=-1 || pptImgUrl1.indexOf('app.cocorobo.cn')!=-1"
+                      v-if="pptImgUrl1.indexOf('cocorobo')!=-1"
                       :src="pptImgUrl1"
                     ></iframe>
                     <iframe
@@ -886,7 +886,7 @@
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                               </div>
-                              <!-- <div
+                              <div
                                 class="downIcon"
                                 @click="downloadFile2(vitem)"
                               >
@@ -894,7 +894,7 @@
                                   src="../../assets/icon/newIcon/down.png"
                                   alt
                                 />
-                              </div> -->
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -13984,7 +13984,13 @@
         <iframe
           style="width: 100%; height: 100%; border: none"
           security="restricted"
-          v-if="(fulltype == 16)"
+          v-if="(fulltype == 16) && (fullUrl.indexOf('cocorobo')!=-1)"
+          :src="fullUrl"
+        ></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="fullUrl"
         ></iframe>

+ 10 - 4
src/components/easy3/studyStudent.vue

@@ -889,7 +889,7 @@
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                               </div>
-                              <!-- <div
+                              <div
                                 class="downIcon"
                                 @click="downloadFile2(vitem)"
                               >
@@ -897,7 +897,7 @@
                                   src="../../assets/icon/newIcon/down.png"
                                   alt
                                 />
-                              </div> -->
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -10605,7 +10605,7 @@
         <iframe
             style="width: 100%; height: 100%; border: none"
 						allow="camera *; microphone *;display-capture;midi;encrypted-media;"
-            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('knowledge.cocorobo.cn')!=-1 || fullUrl.indexOf('cloud.cocorobo.cn')!=-1) || fullUrl.indexOf('app.cocorobo.cn')!=-1"
+            v-else-if="(fulltype == 2 || fulltype == 4) && (fullUrl.indexOf('cocorobo')!=-1)"
             :src="fullUrl"
         ></iframe>
         <iframe
@@ -10623,7 +10623,13 @@
         <iframe
           style="width: 100%; height: 100%; border: none"
           security="restricted"
-          v-if="(fulltype == 16)"
+          v-if="(fulltype == 16) && (fullUrl.indexOf('cocorobo')!=-1)"
+          :src="fullUrl"
+        ></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="fullUrl"
         ></iframe>

+ 9 - 3
src/components/studyStudent.vue

@@ -848,7 +848,7 @@
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                               </div>
-                              <!-- <div
+                              <div
                                 class="downIcon"
                                 @click="downloadFile2(vitem)"
                               >
@@ -856,7 +856,7 @@
                                   src="../assets/icon/newIcon/down.png"
                                   alt
                                 />
-                              </div> -->
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -10557,7 +10557,13 @@
         <iframe
           style="width: 100%; height: 100%; border: none"
           security="restricted"
-          v-if="(fulltype == 16)"
+          v-if="(fulltype == 16) && (fullUrl.indexOf('cocorobo')!=-1)"
+          :src="fullUrl"
+        ></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="fullUrl"
         ></iframe>

+ 9 - 3
src/components/studySutdentClass/studyStudent.vue

@@ -887,7 +887,7 @@
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                               </div>
-                              <!-- <div
+                              <div
                                 class="downIcon"
                                 @click="downloadFile2(vitem)"
                               >
@@ -895,7 +895,7 @@
                                   src="../../assets/icon/newIcon/down.png"
                                   alt
                                 />
-                              </div> -->
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -13795,7 +13795,13 @@
         <iframe
           style="width: 100%; height: 100%; border: none"
           security="restricted"
-          v-if="(fulltype == 16)"
+          v-if="(fulltype == 16) && (fullUrl.indexOf('cocorobo.cn')!=-1)"
+          :src="fullUrl"
+        ></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="fullUrl"
         ></iframe>

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