lanxin 1 settimana fa
parent
commit
d65dda7c07
4 ha cambiato i file con 60 aggiunte e 254 eliminazioni
  1. 2 18
      hot/public/data.js
  2. 23 30
      scene/public/index.html
  3. 3 26
      scene/src/pages/Home.vue
  4. 32 180
      scene/src/views/gui/menu.vue

File diff suppressed because it is too large
+ 2 - 18
hot/public/data.js


+ 23 - 30
scene/public/index.html

@@ -1,37 +1,32 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-
-<head>
-    <meta charset="utf-8">
-    <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">
+  <head>
+    <meta charset="utf-8" />
+    <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>
-    <meta name="description" content="澳門基本法紀念館">
-    <meta property="og:title" content="澳門基本法紀念館">
-    <meta property="og:description" content="澳門基本法紀念館">
-    <meta property="og:image:type" content="image/jpg">
-    <link rel="icon" type="image/png" sizes="32x32" href="./favicon.ico" class="keep">
+    <meta name="description" content="澳門基本法紀念館" />
+    <meta property="og:title" content="澳門基本法紀念館" />
+    <meta property="og:description" content="澳門基本法紀念館" />
+    <meta property="og:image:type" content="image/jpg" />
+    <link rel="icon" type="image/png" sizes="32x32" href="./favicon.ico" class="keep" />
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/oldVer/main0.css" />
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/css/main.css?v=2.25" />
     <!-- <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/CAD/cad.css?v=2.25"/> -->
-    <style>
-    </style>
+    <style></style>
     <script>
-        var number = window.location.href.substring(window.location.href.indexOf("=") + 1);
-        if (number.indexOf("&") != -1) {
-            number = number.substring(0, number.indexOf("&"));
-        }
-        if (number.indexOf("#") != -1) {
-            number = number.substring(0, number.indexOf("#"));
-        }
+      var number = window.location.href.substring(window.location.href.indexOf("=") + 1);
+      if (number.indexOf("&") != -1) {
+        number = number.substring(0, number.indexOf("&"));
+      }
+      if (number.indexOf("#") != -1) {
+        number = number.substring(0, number.indexOf("#"));
+      }
+      window.number = "SG-KY3cAw6MWrl";
     </script>
+  </head>
 
-
-
-</head>
-
-<body>
+  <body>
     <div id="app"></div>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/jquery-2.1.1.min.js" class="build keep"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/player-0.0.12.min.js" class="build keep"></script>
@@ -44,7 +39,5 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/OBJLoader.js"></script>
     <!-- <script src="<%= VUE_APP_STATIC_DIR %>/js/CAD/bundle.js"></script> -->
     <script src="<%= VUE_APP_STATIC_DIR %>/js/loadCAD.js"></script>
-
-</body>
-
-</html>
+  </body>
+</html>

+ 3 - 26
scene/src/pages/Home.vue

@@ -32,29 +32,13 @@
         <v-title />
 
         <!-- 底部菜单 -->
-        <v-menu
-          :loadingstate="loading"
-          :hideTools="hideTools"
-          @toHome="showWelcome = true"
-        />
+        <v-menu :loadingstate="loading" :hideTools="hideTools" @toHome="showWelcome = true" />
 
         <!-- 导览 -->
         <v-guide />
 
         <!-- logo -->
-        <div
-          id="myCompany"
-          style="
-            width: 100%;
-            position: absolute;
-            bottom: 0px;
-            text-align: center;
-            font-size: 14px;
-            font-family: '微软雅黑';
-            font-weight: 580;
-            color: rgba(255, 255, 255, 0.8);
-          "
-        >
+        <div id="myCompany" style="width: 100%; position: absolute; bottom: 0px; text-align: center; font-size: 14px; font-family: '微软雅黑'; font-weight: 580; color: rgba(255, 255, 255, 0.8)">
           <!-- 四维时代提供技术支持 -->
         </div>
       </div>
@@ -139,13 +123,7 @@ export default {
     },
     getHotSpotList() {
       $.ajax({
-        url:
-          g_Prefix +
-          "data/" +
-          window.number +
-          "/hot/js/data.js" +
-          "?" +
-          Math.random(),
+        url: g_Prefix + "data/" + window.number + "/hot/js/data.js" + "?" + Math.random(),
         type: "get",
         dataType: "json",
         contentType: "application/json",
@@ -175,7 +153,6 @@ export default {
     });
   },
   created() {
-    // 雷锋故居场景需求,会携带 hideCover=1
     this.hideTools = Boolean(Number(this.$route.query.hideCover));
     this.showWelcome = !this.hideTools;
   },

+ 32 - 180
scene/src/views/gui/menu.vue

@@ -11,36 +11,16 @@
 
       <div>
         <div class="viewContainer">
-          <div
-            id="previous"
-            class="previous desktop-only ui-icon"
-            style="display: none"
-          >
+          <div id="previous" class="previous desktop-only ui-icon" style="display: none">
             <a>
-              <img
-                rel="tooltip"
-                title=""
-                :src="require('@/assets/images/play.png')"
-                width="24"
-                height="24"
-                :data-original-title="$t('operation.bf')"
-              />
+              <img rel="tooltip" title="" :src="require('@/assets/images/play.png')" width="24" height="24" :data-original-title="$t('operation.bf')" />
             </a>
           </div>
-          <div
-            id="play"
-            class="ui-icon"
-            rel="tooltip"
-            :data-original-title="$t('operation.bf')"
-          >
+          <div id="play" class="ui-icon" rel="tooltip" :data-original-title="$t('operation.bf')">
             <!-- 鼠标移入的显示 -->
             <div class="hoverTit">{{ $t("operation.zddl") }}</div>
             <a>
-              <img
-                :src="require('@/assets/images/icon/play.png')"
-                width="24"
-                height="24"
-              />
+              <img :src="require('@/assets/images/icon/play.png')" width="24" height="24" />
             </a>
           </div>
           <div id="pause" class="ui-icon" style="display: none">
@@ -48,102 +28,40 @@
             <div class="hoverTit">{{ $t("operation.zddl") }}</div>
 
             <a>
-              <img
-                rel="tooltip"
-                title=""
-                :src="require('@/assets/images/icon/pause.png')"
-                width="24"
-                height="24"
-                :data-original-title="$t('operation.zt')"
-              />
+              <img rel="tooltip" title="" :src="require('@/assets/images/icon/pause.png')" width="24" height="24" :data-original-title="$t('operation.zt')" />
             </a>
           </div>
-          <div
-            id="next"
-            class="next desktop-only ui-icon wide"
-            style="display: none"
-          >
+          <div id="next" class="next desktop-only ui-icon wide" style="display: none">
             <a>
-              <i
-                rel="tooltip"
-                title=""
-                class="icon icon-dpad-right"
-                :data-original-title="$t('operation.xyg')"
-              ></i>
+              <i rel="tooltip" title="" class="icon icon-dpad-right" :data-original-title="$t('operation.xyg')"></i>
             </a>
           </div>
           <div id="gui-modes-map" class="ui-icon double active">
-            <div
-              :data-original-title="$t('operation.dl')"
-              @click="isGuide = !isGuide"
-              id="pullTab"
-              rel="tooltip"
-              :title="$t('operation.cjdl')"
-            >
+            <div :data-original-title="$t('operation.dl')" @click="isGuide = !isGuide" id="pullTab" rel="tooltip" :title="$t('operation.cjdl')">
               <!-- 鼠标移入的显示 -->
               <div class="hoverTit">{{ $t("operation.dllist") }}</div>
 
-              <img
-                title=""
-                class="icon icon-inside"
-                :src="
-                  require(`@/assets/images/icon/auto${
-                    !isGuide ? '_active' : ''
-                  }.png`)
-                "
-              />
+              <img title="" class="icon icon-inside" :src="require(`@/assets/images/icon/auto${!isGuide ? '_active' : ''}.png`)" />
             </div>
 
-            <div
-              :data-original-title="$t('operation.mnmx')"
-              id="gui-modes-inside"
-              rel="tooltip"
-            >
+            <div :data-original-title="$t('operation.mnmx')" id="gui-modes-inside" rel="tooltip">
               <!-- 鼠标移入的显示 -->
               <div class="hoverTit">{{ $t("operation.qjmy") }}</div>
 
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/inside.png')"
-              />
-              <img
-                class="icon icon-inside active"
-                :src="require('@/assets/images/icon/inside_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/inside.png')" />
+              <img class="icon icon-inside active" :src="require('@/assets/images/icon/inside_active.png')" />
             </div>
-            <div
-              :title="$t('operation.mnmy')"
-              :data-original-title="$t('operation.mnmx')"
-              id="gui-modes-dollhouse"
-              rel="tooltip"
-            >
+            <div :title="$t('operation.mnmy')" :data-original-title="$t('operation.mnmx')" id="gui-modes-dollhouse" rel="tooltip">
               <!-- 鼠标移入的显示 -->
               <div class="hoverTit">{{ $t("operation.swsj") }}</div>
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/dollhouse.png')"
-              />
-              <img
-                class="icon icon-inside active"
-                :src="require('@/assets/images/icon/dollhouse_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/dollhouse.png')" />
+              <img class="icon icon-inside active" :src="require('@/assets/images/icon/dollhouse_active.png')" />
             </div>
-            <div
-              :data-original-title="$t('operation.fst')"
-              id="gui-modes-floorplan"
-              rel="tooltip"
-              :title="$t('operation.fst')"
-            >
+            <div :data-original-title="$t('operation.fst')" id="gui-modes-floorplan" rel="tooltip" :title="$t('operation.fst')">
               <!-- 鼠标移入的显示 -->
               <div class="hoverTit">{{ $t("operation.pmt") }}</div>
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/icon/floor.png')"
-              />
-              <img
-                class="active icon icon-inside active"
-                :src="require('@/assets/images/icon/floor_active.png')"
-              />
+              <img class="icon icon-inside" :src="require('@/assets/images/icon/floor.png')" />
+              <img class="active icon icon-inside active" :src="require('@/assets/images/icon/floor_active.png')" />
             </div>
 
             <!-- 热点列表 -->
@@ -153,29 +71,11 @@
               <img src="../../assets/images/icon/hot.png" alt="" />
             </div>
 
-            <div
-              data-original-title="VR"
-              id="vr"
-              rel="tooltip"
-              title=""
-              style="display: none"
-            >
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/VR.png')"
-              />
+            <div data-original-title="VR" id="vr" rel="tooltip" title="" style="display: none">
+              <img class="icon icon-inside" :src="require('@/assets/images/VR.png')" />
             </div>
-            <div
-              :data-original-title="$t('operation.xcwk')"
-              id="gui-remove-face"
-              rel="tooltip"
-              :title="$t('operation.xcwk')"
-              style="display: none; float: left"
-            >
-              <img
-                class="icon icon-inside"
-                :src="require('@/assets/images/face.jpg')"
-              />
+            <div :data-original-title="$t('operation.xcwk')" id="gui-remove-face" rel="tooltip" :title="$t('operation.xcwk')" style="display: none; float: left">
+              <img class="icon icon-inside" :src="require('@/assets/images/face.jpg')" />
             </div>
           </div>
         </div>
@@ -194,20 +94,12 @@
 
         <div id="vr" class="ui-icon wide hidden" style="display: none">
           <a>
-            <i
-              rel="tooltip"
-              title="{[{ VIEW_IN_VR }]}"
-              class="icon icon-webvr"
-            ></i>
+            <i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
           </a>
         </div>
         <div id="sharing" class="ui-icon wide hidden" style="display: none">
           <a>
-            <i
-              rel="tooltip"
-              title="{[{ SOCIAL_SHARING }]}"
-              class="icon icon-share"
-            ></i>
+            <i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
           </a>
         </div>
         <div class="pull-right terms terms2">
@@ -228,18 +120,7 @@
           <img src="../../assets/img/openVR.png" alt="" />
         </div> -->
         <div class="fgx">
-          <img
-            style="
-              display: block;
-              width: 9px;
-              width: 9px;
-              position: relative;
-              left: -8px;
-              top: 10px;
-            "
-            src="../../assets/images/icon/border.png"
-            alt=""
-          />
+          <img style="display: block; width: 9px; width: 9px; position: relative; left: -8px; top: 10px" src="../../assets/images/icon/border.png" alt="" />
         </div>
         <!-- 音乐 -->
         <div id="volume" class="ui-icon bgandshare wide">
@@ -248,20 +129,8 @@
             {{ musicState ? $t("operation.gbyy") : $t("operation.dkyy") }}
           </div>
           <div>
-            <img
-              id="openMusic"
-              style="display: block"
-              @click="switchBGM(true)"
-              src="../../assets/images/icon/musicAc.png"
-              alt=""
-            />
-            <img
-              id="closeMusic"
-              style="display: none"
-              @click="switchBGM(false)"
-              src="../../assets/images/icon/music.png"
-              alt=""
-            />
+            <img id="openMusic" style="display: block" @click="switchBGM(true)" src="../../assets/images/icon/musicAc.png" alt="" />
+            <img id="closeMusic" style="display: none" @click="switchBGM(false)" src="../../assets/images/icon/music.png" alt="" />
           </div>
         </div>
         <!-- 分享 -->
@@ -324,12 +193,7 @@
 
         <div class="toHomeBox" @click="handleFullscreen">
           <div class="hoverTit">{{ $t("operation.qp") }}</div>
-          <img
-            :src="
-              require(`../../assets/images/icon/full${isFull ? 'x' : ''}.png`)
-            "
-            alt=""
-          />
+          <img :src="require(`../../assets/images/icon/full${isFull ? 'x' : ''}.png`)" alt="" />
         </div>
 
         <!-- <div class="toHomeBox">
@@ -469,8 +333,7 @@ export default {
       // 全屏
       if (element.requestFullscreen) element.requestFullscreen();
       else if (element.mozRequestFullScreen) element.mozRequestFullScreen();
-      else if (element.webkitRequestFullscreen)
-        element.webkitRequestFullscreen();
+      else if (element.webkitRequestFullscreen) element.webkitRequestFullscreen();
       else if (element.msRequestFullscreen) element.msRequestFullscreen();
     },
     exitFullscreen() {
@@ -482,10 +345,7 @@ export default {
     },
     checkIfMobile() {
       const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-      this.isMyMobile =
-        /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(
-          userAgent
-        );
+      this.isMyMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
     },
     switchBGM(flag) {
       this.musicState = flag;
@@ -517,14 +377,7 @@ export default {
       localStorage.setItem("locale", item.key);
       // this.updateReadList();
       this.$nextTick(() => {
-        document.title =
-          item.key === "zh-hk"
-            ? "澳門基本法紀念館"
-            : item.key === "en"
-            ? "Macao Basic Law Memorial Museum"
-            : item.key === "pe"
-            ? "Museu Memorial da Lei Básica de Macau"
-            : "澳門基本法紀念館";
+        document.title = item.key === "zh-hk" ? "澳門基本法紀念館" : item.key === "en" ? "Macao Basic Law Memorial Museum" : item.key === "pe" ? "Museu Memorial da Lei Básica de Macau" : "澳門基本法紀念館";
         hotGroup?.children.forEach((item) => {
           item.setTitleElem();
         });
@@ -552,8 +405,7 @@ export default {
         url: `https://sit-visitcommon.4dage.com//api/visit/trend/period/${this.m}`,
       });
       console.log("getReadData", res);
-      this.readVlaue =
-        (res.data && res.data.data && res.data.data.pcsVisit) || 0;
+      this.readVlaue = (res.data && res.data.data && res.data.data.pcsVisit) || 0;
     },
   },
   beforeDestroy() {