shaogen1995 3 vuotta sitten
vanhempi
commit
dfa0482561

+ 1 - 1
web/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>吴忠博物馆</title>
+    <title>吴忠博物馆数字展厅</title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">

+ 1 - 7
web/public/static/js/main_2020_show.js

@@ -4748,15 +4748,9 @@ window.Modernizr = function(n, e, t) {
             ,
             n.prototype.goToDestination = function(e, t, i, n) {
                 //音频 
-                
                 var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
                 if(musicInfo && musicInfo.music){
                     let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
-
-                    console.log('自动导览有音乐,暂停背景音乐');
-                    document.querySelector('#openMusic').style.display='block'
-                    document.querySelector('#closeMusic').style.display='none'
-            
                     let audioObj = SoundManager.list.find(e=>e.name == 'tour')
                     let audioSrc1 = common.getFileNameFromUrl(audioObj.src);  
                     let audioSrc2 = common.getFileNameFromUrl(src)
@@ -6710,7 +6704,7 @@ window.Modernizr = function(n, e, t) {
                 var i = Q.pageTitle;
                 // 2 !== K.valueFromHash("mls", 0) && (i = e.name + " - " + i),
                 2 !== K.valueFromHash("mls", 0) && e.name && (i = e.name),
-                document.title = i ,
+                // document.title = i ,
                 K.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
                     delay: {
                         show: 50,

+ 6 - 4
web/public/static/js/manage.js

@@ -1127,11 +1127,13 @@ Manage.prototype.loadAudio = function() { //相关:g_tourAudio \  g_playAudio
         },
         callback:(state)=>{//play或pause时随之触发的函数(即使还没开始播放)
             if(state){
-                $("#volume a img").attr("src", "./images/Volume btn_off.png")
-                $("#volume").attr("title", "关闭声音");
+                console.log('播放背景音乐');
+                document.querySelector('#openMusic').style.display='none'
+                document.querySelector('#closeMusic').style.display='block'
             }else{
-                $("#volume a img").attr("src", "./images/Volume btn_on.png")
-                $("#volume").attr("title", "打开声音");
+                console.log('暂停背景音乐');
+                document.querySelector('#openMusic').style.display='block'
+                document.querySelector('#closeMusic').style.display='none'
             }
         }
     })  

BIN
web/src/assets/img/music.png


BIN
web/src/assets/img/musicAc.png


+ 30 - 2
web/src/views/gui/compomemt/antique.vue

@@ -67,7 +67,12 @@
           alt=""
           v-if="txtInfo.type === 'img'"
         />
-        <iframe :src="mySrc" frameborder="0" v-else></iframe>
+        <div class="iframeBox" v-else>
+          <!-- 全屏的底部名字和右上角logo -->
+          <div class="fullLogo" v-if="fullscreen"></div>
+          <div class="fullName" v-if="fullscreen">{{txtInfo.name}}</div>
+        <iframe :src="mySrc" frameborder="0"></iframe>
+        </div>
         <!-- 全屏按钮 -->
         <div class="full" @click="screen" v-if="txtInfo.type === 'model'">
           <img src="@/assets/img/tab3FullX.png" alt="" v-if="fullscreen" />
@@ -417,9 +422,32 @@ export default {
       position: relative;
       width: 558px;
       height: 478px;
-      iframe {
+      .iframeBox{
+        position: relative;
         width: 100%;
         height: 100%;
+        .fullLogo{
+          position: absolute;
+          z-index: 10;
+          right: 10px;
+          top: 10px;
+          width: 166px;
+          height: 43px;
+          background: url('../../../assets/img/logo.png');
+          background-size: 100% 100%;
+        }
+        .fullName{
+          position: absolute;
+          left: 50%;
+          bottom: 20px;
+          transform: translateX(-50%);
+          color: #774926;
+          font-size: 24px;
+        }
+        iframe {
+          width: 100%;
+          height: 100%;
+        }
       }
       & > img {
         max-width: 100%;

+ 1 - 1
web/src/views/gui/menu.vue

@@ -435,7 +435,7 @@ export default {
   background-color: #774926;
   text-align: center;
   ::before {
-    opacity: 0.07;
+    opacity: 0.06;
     content: "";
     position: absolute;
     top: 0;

+ 1 - 1
web/src/views/gui/title.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pinTop left">
+  <div class="pinTop left" v-show="0">
                 <div id="model-title">
                     <div class="title-row">
                         <div id="title-toggle">

+ 1 - 1
webM/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>吴忠博物馆</title>
+    <title>吴忠博物馆数字展厅</title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">

+ 1 - 1
webM/public/static/js/main_2020_show.js

@@ -6712,7 +6712,7 @@ window.Modernizr = function(n, e, t) {
                 var i = Q.pageTitle;
                 // 2 !== K.valueFromHash("mls", 0) && (i = e.name + " - " + i),
                 2 !== K.valueFromHash("mls", 0) && e.name && (i = e.name),
-                document.title = i ,
+                // document.title = i ,
                 K.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
                     delay: {
                         show: 50,