11wqe1 22 hours ago
parent
commit
1bf3e44ab0
2 changed files with 17 additions and 6 deletions
  1. 9 2
      src/components/main/courseSelect.vue
  2. 8 4
      src/views/main.vue

+ 9 - 2
src/components/main/courseSelect.vue

@@ -614,9 +614,16 @@ const getTimeCourse = (id, item) => {
   } catch (e) {
     console.log(e)
   }
-  // 
-  const area = areaJson.value.find(item => user.user.schooldest.includes(item.code) || user.user.schooldest.includes(item.name));
+  let area = ''
+  try {
+    area = areaJson.value.find(item => user.user.schooldest.includes(item.code) || user.user.schooldest.includes(item.name)); 
+  } catch (e) {
+    console.log(e)
+  }
+
   let dest = area ? area.name : '未知';
+  console.log('dest',dest);
+  
   const middleTime = Math.random() * 2 + 6;
   const interValtTime = Math.floor(middleTime * 60) * 1000 + 30000;
   const params = {

+ 8 - 4
src/views/main.vue

@@ -82,12 +82,12 @@
       </div>
       <div class="iframe" :style="leftShow ? { width: '100%' } : ''" v-else-if="activeIndex == 1" v-loading="loading">
         <iframe ref="iframeRef1" :src="iframeRef1Url" 
-        allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;"
+        allow="camera *; microphone *;display-capture;midi;encrypted-media;clipboard-write;clipboard-read" :webkitallowfullscreen="true" :mozallowfullscreen="true" :allowfullscreen="true"
         frameborder="0"></iframe>
       </div>
       <div class="iframe" :style="leftShow ? { width: '100%' } : ''" v-else-if="activeIndex == 2" v-loading="loading">
         <iframe ref="iframeRef2" :src="iframeRef2Url" 
-        allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;"
+        allow="camera *; microphone *;display-capture;midi;encrypted-media;clipboard-write;clipboard-read" :webkitallowfullscreen="true" :mozallowfullscreen="true" :allowfullscreen="true"
         frameborder="0"></iframe>
         <el-dialog v-model="iframeRef2Dialog" width="450" @close="clickSwitch(1)">
           <template #header="{ }">
@@ -109,10 +109,14 @@
         </el-dialog>
       </div>
       <div class="iframe" :style="leftShow ? { width: '100%' } : ''" v-else-if="activeIndex == 3" v-loading="loading">
-        <iframe allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;" ref="iframeRef" src="//app.cocorobo.cn/#/appSelection" frameborder="0"></iframe>
+        <iframe 
+        allow="camera *; microphone *;display-capture;midi;encrypted-media;clipboard-write;clipboard-read" :webkitallowfullscreen="true" :mozallowfullscreen="true" :allowfullscreen="true"
+        ref="iframeRef" src="//app.cocorobo.cn/#/appSelection" frameborder="0"></iframe>
       </div>
       <div class="iframe" :style="leftShow ? { width: '100%' } : ''" v-else v-loading="loading">
-        <iframe allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;" ref="iframeRef4" :src="iframeRef1Url4" frameborder="0"></iframe>
+        <iframe 
+        allow="camera *; microphone *;display-capture;midi;encrypted-media;clipboard-write;clipboard-read" :webkitallowfullscreen="true" :mozallowfullscreen="true" :allowfullscreen="true"
+        ref="iframeRef4" :src="iframeRef1Url4" frameborder="0"></iframe>
       </div>
     </div>
     <Feedback></Feedback>