Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/macao_army

backstage/src/pages/content/sceneAudio.vue

@@ -537,6 +537,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-table__body-wrapper{
+  max-height: 523px !important;
+  overflow-y: auto !important;
+}
 .top-body {
   border-top: 0.0625rem solid #e6e6e6;
   line-height: 1.5;

backstage/src/pages/layout/aside.vue

@@ -8,7 +8,7 @@
       <div @click="go(3,'/spirit')" :class="{activeFont:activeIdx === 3}">文物管理</div>
       <div @click="go(5,'/comment')" v-if="$role=='sys_admin'||$role=='sys_high'" :class="{activeFont:activeIdx === 5}">留言管理</div>
       <div @click="go(6,'/carousel')" :class="{activeFont:activeIdx === 6}">党史军史管理</div>
-      <div @click="go(12,'/sceneAudio')" :class="{activeFont:activeIdx === 12}">场景音频管理</div>
+      <!-- <div @click="go(12,'/sceneAudio')" :class="{activeFont:activeIdx === 12}">场景音频管理</div> -->
     </div>
     <div class="aside-item">
       <div :class="{active:activeIdx>=7&&activeIdx<=11}"><i class="iconfont iconsys_nav_system"></i>系统管理</div>

hotspot/src/views/Home.vue

@@ -176,16 +176,18 @@ export default {
             //点击的时候才加载，防止一次运行过多iframe标签导致页面崩溃
       let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
       let myFimCente =document.querySelectorAll('.swiper-wrapper .swiper-slide-active iframe')
-      console.log(myFim,myFimCente);
-      myFim.forEach((v,i)=>{
-        //拿到当前在屏幕中间的iframe
-        if(v.className.includes('swiper-slide-active') && i>1) {
-          // console.log(myFimCente[0].src);
-          if(myFimCente[0].src.includes('undefined')){
-            myFimCente[0].src =this.fixUrl(this.data.model[i])
-          }
-          }
-      })
+      // console.log(myFim,myFimCente);
+       if(myFimCente) {
+         myFim.forEach((v,i)=>{
+           //拿到当前在屏幕中间的iframe
+           if(v.className.includes('swiper-slide-active') && i>1) {
+             // console.log(myFimCente[0].src);
+             if(myFimCente[0].src.includes('undefined')){
+               myFimCente[0].src =this.fixUrl(this.data.model[i])
+             }
+             }
+         })
+       }
     },
     autoplay() {
       if (this.loadAuto) {
@@ -252,14 +254,16 @@ export default {
           //点击的时候才加载，防止一次运行过多iframe标签导致页面崩溃
             let myFim =document.querySelectorAll('.swiper-wrapper .swiper-slide')
             let myFimCente =document.querySelector('.swiper-wrapper .swiper-slide-next iframe')
-          myFim.forEach((v,i)=>{
-            //拿到右侧屏幕的iframe
-            if(v.className.includes('swiper-slide-next') && i>1) {
-              if(myFimCente.src.includes('undefined')){
-                myFimCente.src =this.fixUrl(this.data.model[i])
-              }
-              }
-          })
+            if(myFimCente) {
+              myFim.forEach((v,i)=>{
+                //拿到右侧屏幕的iframe
+                if(v.className.includes('swiper-slide-next') && i>1) {
+                  if(myFimCente.src.includes('undefined')){
+                    myFimCente.src =this.fixUrl(this.data.model[i])
+                  }
+                  }
+              })
+            }