0604

backstage/src/pages/content/Dynamic.vue

@@ -477,7 +477,7 @@ export default {
       this.tableData = result.data.list;
       this.total = result.data.total;
       this.tableData.forEach((item, i) => {
-        item["idx"] = i + 1;
+        item["idx"] = i + 1 + this.size * (this.currentPage-1);
         item["display"] = Boolean(item["display"]);
       });
     },

backstage/src/pages/content/Upload.vue

@@ -26,7 +26,7 @@
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope" >
-              <span class="o-span" @click="dowload(scope.row)">下载附件</span>
+              <span class="o-span" v-show="scope.row.code" @click="dowload(scope.row)">下载附件</span>
               <span class="o-span" @click="del(scope.row)">删除</span>
             </template>
           </el-table-column>
@@ -212,7 +212,7 @@ export default {
       this.tableData = result.data.list
       this.total = result.data.total
       this.tableData.forEach((item, i) => {
-        item["idx"] = i + 1;
+        item["idx"] = (i + 1) + this.size * (this.currentPage-1);
       });
     }
   }

backstage/src/pages/system/Menu.vue

@@ -218,7 +218,7 @@ export default {
       this.tableData = result.data
       this.total = result.data.total
       this.tableData.forEach((item, i) => {
-        item["idx"] = i + 1;
+        item["idx"] = i + 1 + this.size * (this.currentPage-1);
       });
     }
   }

backstage/src/pages/system/Worklog.vue

@@ -109,7 +109,8 @@ export default {
       this.tableData = result.data.list
       this.total = result.data.total
       this.tableData.forEach((item, i) => {
-        item['idx'] = i + 1
+        item["idx"] = i + 1 + this.size * (this.currentPage-1);
+
         item['typeName'] = TYPENAME[item.type]
         item['statusStr'] = STATUSNAME[item.status]
       })

web/public/static/js/main_2020_show.js

@@ -15931,8 +15931,8 @@ window.Modernizr = function(n, e, t) {
                     //打开热点的时候把背景音乐关闭了，避免与热点里面的音乐冲突
                     //g_bgAudio && g_bgAudio.pause();
                     if(g_bgAudio && !g_bgAudio.paused){
-                        manage.switchBgmState(false); 
-                        g_bgAudio.pauseByHot = true
+                        // manage.switchBgmState(false); 
+                        // g_bgAudio.pauseByHot = true
                     } 
                     if(g_tourAudio)g_tourAudio.pause()
                     

web/public/static/js/manage.js

@@ -108,7 +108,7 @@ Manage.prototype.loadWeixin = function() {
 Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     g_bgAudio = new Audio;
     g_bgAudio.loop = true;
-    g_bgAudio.autoplay = true;
+    g_bgAudio.autoplay = false;
     g_bgAudio.id = "bgaudio";
     
     //https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
@@ -116,7 +116,7 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     var play = function(){
         //if(window.tourAudioSta) return;
          
-        this.switchBgmState(true)
+        // this.switchBgmState(true)
         
         document.removeEventListener("touchstart",play);
         document.removeEventListener("click",play);
@@ -124,10 +124,10 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     }.bind(this);
     
     g_bgAudio.oncanplay = ()=>{ 
-        this.switchBgmState(true)
+        // this.switchBgmState(true)
     }
     document.addEventListener("WeixinJSBridgeReady", ()=> {
-        this.switchBgmState(true)
+        // this.switchBgmState(true)
     }, false);
     
     document.addEventListener("touchstart", play);//ios需要加个事件才能播放 不能自动播放；如果还有浏览器不行，换成别的交互事件

web/src/components/longvideo/index.vue

@@ -200,15 +200,16 @@ export default {
     >div{
       position: absolute;
       top: 0;
-      right: 0;
+      left: 50%;
+      transform: translateX(-50%);
       width: 50%;
       height: 100%;
       display: flex;
       align-items: center;
       justify-content: center;
-      background: rgba(0, 0, 0, 0.2);
+      // background: rgba(0, 0, 0, 0.2);
       >img{
-        width: 20px;
+        width: 30px;
         margin-right: 6px;
       }
       >span{

web/src/components/popupLayout/index.js

@@ -12,8 +12,8 @@ const Map = Vue.extend(UIMap)
 const Alert = Vue.extend(UIAlert)
 
 
-let alertInstance = ''
 export function $showAlert(data={}) {
+    let alertInstance = ''
     if (alertInstance) {
         return
     }
@@ -25,6 +25,8 @@ export function $showAlert(data={}) {
 
     Vue.nextTick(() => {
         alertInstance.show = true
+        console.log(alertInstance.show);
+
     })
 }
 

web/src/components/welcome/index.vue

@@ -2,10 +2,10 @@
   <div class="welcome">
     <template v-show="!isVideo">
       <img class="bg" :style="{'z-index': isVideo?-1:0}" :src="require('@/assets/images/bg.jpg')" alt="">
-      <div class="we_title">欢迎访问信息工程大学数字史馆</div>
+      <div  v-if="!isVideo" class="we_title">欢迎访问信息工程大学数字史馆</div>
       <span v-if="!isVideo" class="btn" @click="showVideo">开始预览</span>
     </template>
-    <video @click="autoplay" ref="welcome" preload="auto" loop :src="require('@/assets/video/welcome.mp4')"></video>
+    <video @click="autoplay" ref="welcome" preload="auto" :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>
   </div>
 </template>
@@ -31,6 +31,13 @@ export default {
     }
   },
   mounted(){
+
+     this.$nextTick(()=> {
+        this.$refs.welcome && this.$refs.welcome.addEventListener('ended',()=>{
+          this.$bus.$emit('toggleWelcome', false)
+        })
+      })
+    
     // this.autoplay()
   }
 }
@@ -55,7 +62,7 @@ export default {
     
   }
   .we_title{
-    background-color: none;
+    background: none;
     position: absolute;
     top: 35%;
     left: 50%;
@@ -64,6 +71,8 @@ export default {
     color: #FCD67B;
     letter-spacing: 6px;
     font-weight: bold;
+    width: 100%;
+    text-align: center;
   }
   >video{
     width: 100%;

web/src/pages/Home.vue

@@ -16,7 +16,8 @@
 
             <!-- 退出VR模式按钮 -->
             <div id="vrOff">
-                <img id="vrOffImg" src="images/vrOffImg.png" alt="">
+                <!--  -->
+                <img id="vrOffImg" :src="require('@/assets/images/vrOffImg.png')" alt="">
             </div>
 
             <!-- 热点列表 -->
@@ -176,6 +177,9 @@ export default {
         else{
           this.showWelcome = data
         }
+        if (!data) {
+            manage.switchBgmState(true); 
+        }
     })
     
     this.$bus.$on('toggleLongVideo',data=>{

web/src/views/gui/newguide.vue

@@ -14,7 +14,7 @@
           :key="i"
         >
           <div :class="{'slActive':guideActive === i,hoverCls:hoverIdx===i}">
-            <img @click="gotoLight(item)" @mouseleave="hoverOutHandle(item,i)" @mouseenter="hoverHandle(item,i)" :src="`http://8.135.106.227:8009/`+item.locations?item.locations[0].thumbnail_signed_src : item.thumbnail_signed_src" :alt="item.name" />
+            <img @click="gotoLight(item)" @mouseleave="hoverOutHandle(item,i)" @mouseenter="hoverHandle(item,i)" :src="(item.locations?item.locations[0].thumbnail_signed_src : item.thumbnail_signed_src)" :alt="item.name" />
             <span :title="item.name">{{item.name}}</span>
           </div>
         </swiper-slide>
@@ -160,6 +160,7 @@ export default {
     this.$nextTick(() => {
       window.addEventListener("loadfinish", () => {
         this.guide = window.player.model.images;
+        console.log(this.guide);
          //监听导览状态
           window.player.on('onplayStatus', (data)=>{
             this.guideActive = data.destinationItem && data.destinationItem[0]

web/src/views/uploadflie/index.vue

@@ -106,7 +106,7 @@ export default {
         })
       }
       let params = {
-          "code": this.fileCode,
+          "code": this.fileList.length>0?this.fileCode:'',
           "description": this.desc,
           "phone": this.contact
       }
@@ -121,7 +121,6 @@ export default {
         this.$showAlert({
             tips:'提交成功'
         })
-        console.log(111111);
         this.$bus.$emit('toggleUploadFile',false)
       }
     },