Merge branch 'gugong1.0' of http://192.168.0.115:3000/xingjinxing/ggbwy_onlineTour into gugong1.0

hot/src/views/Home.vue

@@ -176,22 +176,6 @@ export default {
         this.lookPics = [url];
       }
       this.dom.show();
-
-      // setTimeout(() => {
-      //   this.$refs.viewer.on("show", () => {
-      //     console.error("show");
-      //   });
-      // }, 1000);
-      // console.error(window.parent.getElementById("closepop"));
-
-      // this.$refs.viewer.$viewer.addEventListener('hide',()=>{
-
-      //   console.error('hide')
-      // })
-      // try {
-      //   let closepop = window.parent.getElementById("closepop");
-      //   closepop.style.display = "none";
-      // } catch (err) {}
     },
     async getData() {
       // https://www.4dmodel.com/
@@ -316,21 +300,17 @@ export default {
       }
     }
     .mainCon {
-      // position: relative;
-      // border-radius: 6px;
-      // overflow: hidden;
-      // width: 100%;
+      border-radius: 6px;
+      // width: 50%;
       // height: calc(100% - 200px);
+      position: relative;
 
-      // position: absolute;
-      border-radius: 6px;
+      width: 70vh;
+      max-width: 60vw;
+      height: 70vh;
+      margin: 0;
       overflow: hidden;
-      width: 50%;
-      // width: 100%;
-      height: calc(100% - 200px);
-      // left: 50%;
-      // top: 50%;
-      // transform: translate(-50%, -50%);
+
       &::before {
         content: "";
         width: 35px;
@@ -384,18 +364,19 @@ export default {
           }
         }
         .videoBox {
-          padding: 100px 100px 120px;
+          // padding: 100px 100px 120px;
+          padding:100px 0 120px 100px;
           display: flex;
           align-items: center;
           justify-content: center;
           video {
-            // width: 100%;
-            width: auto;
+            width: 100%;
+            // width: auto;
             height: 100%;
           }
         }
         .imgBox {
-          padding: 0px 70px;
+          padding: 0px 0 0 100px;
           .smImgBox {
             width: 100%;
             height: 100%;

scene/README.md

@@ -22,3 +22,5 @@ npm run lint
 
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
+
+https://houseoss.4dkankan.com/project/guGongScene/index.html#/?m=KJ-t-tHpdpKvb0ew

scene/public/static/js/Hot.js

@@ -60,7 +60,7 @@ window.initHot = function(model){
         var r = link.substring(link.indexOf("html") + 4),
             o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : ""; 
         -1 == r.indexOf("?") ? src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o : src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o
-        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'http://192.168.0.12:8081')
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'hot')
         // return src //打包   
        
     }

scene/src/assets/image/icon/new-icon/icon_detail.svg

@@ -0,0 +1,17 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_detail">
+<g id="Rectangle 5">
+<path d="M1 28C1 13.0883 13.0883 1 28 1C42.9117 1 55 13.0883 55 28C55 42.9117 42.9117 55 28 55C13.0883 55 1 42.9117 1 28Z" fill="#373635" fill-opacity="0.6"/>
+<path d="M28 0.5C12.8122 0.5 0.5 12.8122 0.5 28C0.5 43.1878 12.8122 55.5 28 55.5C43.1878 55.5 55.5 43.1878 55.5 28C55.5 12.8122 43.1878 0.5 28 0.5Z" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<g id="a">
+<path id="Vector" d="M31.1475 24.558C31.1475 24.558 33.1429 19.7838 36.6555 21.8617C40.1682 23.9478 42.3945 21.4494 42.3532 20.6414" stroke="#C7A770" stroke-width="1.64912" stroke-miterlimit="10" stroke-linecap="round"/>
+<path id="Vector_2" d="M30.4629 25.7124C30.4629 25.7124 32.4831 24.1292 34.9732 24.3766C37.4634 24.6239 39.4259 23.6757 39.4671 23.4448" stroke="#C7A770" stroke-width="1.64912" stroke-miterlimit="10" stroke-linecap="round"/>
+<path id="Vector_3" d="M17.3021 14.9558L16.4268 14.0703L12.4216 18.0296L13.297 18.915L17.3021 14.9558Z" stroke="#C7A770" stroke-width="1.64912" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_4" d="M41.7493 39.3962L40.874 38.5107L36.8689 42.47L37.7442 43.3555L41.7493 39.3962Z" stroke="#C7A770" stroke-width="1.64912" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_5" d="M33.1179 28.7136C33.1179 28.8373 27.2223 34.6834 27.0986 34.6752C27.2223 34.6752 33.2746 40.8182 33.2746 40.9419C33.2746 40.8182 39.1702 34.972 39.2939 34.9803C39.1702 34.9803 33.1179 28.8373 33.1179 28.7136Z" stroke="#C7A770" stroke-width="2.47368" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_6" d="M20.8894 16.4937C20.8894 16.6173 14.9938 22.4635 14.8701 22.4552C14.9938 22.4552 21.0461 28.5982 21.0461 28.7219C21.0461 28.5982 26.9417 22.7521 27.0654 22.7603C26.9417 22.7603 20.8894 16.6173 20.8894 16.4937Z" stroke="#C7A770" stroke-width="2.47368" stroke-linecap="round" stroke-linejoin="round"/>
+<path id="Vector_7" d="M31.7868 25.5871L30.2564 24.039C29.9363 23.7152 29.4142 23.7122 29.0904 24.0323L22.3761 30.6697C22.0522 30.9899 22.0492 31.5119 22.3693 31.8358L23.8997 33.3839C24.2199 33.7078 24.7419 33.7108 25.0658 33.3906L31.7801 26.7532C32.104 26.4331 32.107 25.911 31.7868 25.5871Z" fill="#A88959"/>
+</g>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_detail_active.svg

@@ -0,0 +1,13 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_detail">
+<g id="Rectangle 5">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Vector" d="M26.1705 43.0905L19.7607 15.834L10.9997 17.8943L17.4095 45.1507L26.1705 43.0905Z" fill="#C7A770"/>
+<path id="Vector_2" d="M17.5854 15.3182L17.3564 14.3447L11.5158 15.7182L11.7447 16.6917L17.5854 15.3182Z" fill="#C7A770"/>
+<path id="Vector_3" d="M24.682 45.4949L24.4531 44.5215L18.6125 45.895L18.8414 46.8684L24.682 45.4949Z" fill="#C7A770"/>
+<path id="Vector_4" d="M46.2215 36.6193C39.4949 35.6772 34.4526 41.9109 27.7261 40.9688C25.8501 32.9915 23.9748 25.0173 22.0989 17.04C28.8255 17.9821 33.8678 11.7485 40.5943 12.6906L46.2215 36.6193Z" fill="#A88959"/>
+<path id="Vector_5" d="M42.5829 25.5125C42.5829 25.5125 42.2739 22.0698 44.7785 24.5874C44.7785 24.5874 45.8512 25.7285 46.483 24.6237" stroke="#A88959" stroke-miterlimit="10"/>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_line.svg

@@ -0,0 +1,9 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_line">
+<g id="Rectangle 8">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Vector 95" d="M40 25.5V41L27.5 32.5L14.5 41.5L15 25.5L28 15L40 25.5Z" stroke="#A88959" stroke-width="2"/>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_line_active.svg

@@ -0,0 +1,9 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_line">
+<g id="Rectangle 8">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Vector 95" d="M42 25.6226V43.5L27.7647 34L14 43.5V25.5L27.7647 13.5L42 25.6226Z" fill="#A88959"/>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_map_active.svg

@@ -0,0 +1,10 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_map">
+<g id="Rectangle 8">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M28 45C30.8966 45 42 32.5571 42 24.8873C42 17.2176 35.732 11 28 11C20.268 11 14 17.2176 14 24.8873C14 32.5571 25.1034 45 28 45ZM28 30C31.3137 30 34 27.3137 34 24C34 20.6863 31.3137 18 28 18C24.6863 18 22 20.6863 22 24C22 27.3137 24.6863 30 28 30Z" fill="#C0A06A"/>
+<circle id="Ellipse 17" cx="28" cy="24" r="3" fill="#A88959"/>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_point.svg

@@ -0,0 +1,11 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_point">
+<g id="Rectangle 8">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Vector" d="M20.8936 38.7455L21 39.234L20.8936 38.7455L20.8926 38.7457C20.8929 38.7456 20.8933 38.7455 20.8936 38.7455ZM20.5 38.8312L14.5 40.1381V16.1688L20.5 14.8619V38.8312Z" stroke="#C7A770" stroke-width="3" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path id="Vector_2" d="M42.8936 38.7455L43 39.234L42.8936 38.7455L42.8926 38.7457C42.8929 38.7456 42.8933 38.7455 42.8936 38.7455ZM42.5 38.8312L36.5 40.1381V16.1688L42.5 14.8619V38.8312Z" stroke="#C7A770" stroke-width="3" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path id="Vector_3" d="M25.1064 38.7455L25 39.234L25.1064 38.7455C25.1067 38.7455 25.1071 38.7456 25.1074 38.7457L25.1064 38.7455ZM31.5 40.1381L25.5 38.8312V14.8619L31.5 16.1688V40.1381Z" stroke="#A98A59" stroke-width="3" stroke-miterlimit="10" stroke-linejoin="round"/>
+</g>
+</svg>

scene/src/assets/image/icon/new-icon/icon_point_active.svg

@@ -0,0 +1,11 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon_point">
+<g id="Rectangle 9">
+<rect x="1" y="1" width="54" height="54" rx="27" fill="#373635" fill-opacity="0.6"/>
+<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="#805454" stroke-opacity="0.6"/>
+</g>
+<path id="Vector" d="M22 39.234C22 39.7043 21.6723 40.111 21.2128 40.2111L14.2128 41.7358C13.5894 41.8716 13 41.3968 13 40.7587V15.766C13 15.2957 13.3277 14.889 13.7872 14.7889L20.7872 13.2642C21.4106 13.1284 22 13.6032 22 14.2413V39.234Z" fill="#C7A770"/>
+<path id="Vector_2" d="M44 39.234C44 39.7043 43.6723 40.111 43.2128 40.2111L36.2128 41.7358C35.5894 41.8716 35 41.3968 35 40.7587V15.766C35 15.2957 35.3277 14.889 35.7872 14.7889L42.7872 13.2642C43.4106 13.1284 44 13.6032 44 14.2413V39.234Z" fill="#C7A770"/>
+<path id="Vector_3" d="M24 39.234C24 39.7043 24.3277 40.111 24.7872 40.2111L31.7872 41.7358C32.4106 41.8716 33 41.3968 33 40.7587V15.766C33 15.2957 32.6723 14.889 32.2128 14.7889L25.2128 13.2642C24.5894 13.1284 24 13.6032 24 14.2413V39.234Z" fill="#A98A59"/>
+</g>
+</svg>

scene/src/views/gui/components/layerMap.vue

@@ -30,9 +30,22 @@
                   points="633,846 633,610 380,610 380,222 633,222 633,0 429,0 429,150.5 315.8,150.5 315,672 
 	554.2,672 554.2,846 "
                 /> -->
-                <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1H113.9v202H0V534.7h255.7v-205H0V-0.2H333.3z" />
-                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1h221.2v202h109.9V534.7L411.3,535V330l253.1-0.3V-0.2H333.3z" />
+                <!-- <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1H113.9v202H0V534.7h255.7v-205H0V-0.2H333.3z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1h221.2v202h109.9V534.7L411.3,535V330l253.1-0.3V-0.2H333.3z" /> -->
+
+                <!-- <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1h-94.6v202H0V534.7h255.7v-205H0V-0.2H333.3z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M333.3-0.2v645.1H437v202h227.4V534.7L411.3,535V330l253.1-0.3V-0.2H333.3z" /> -->
+
+                <!-- <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,41.6V644L229,644.9v202H0V555h255.7l1.1-229H1.1L0,25L334.4,41.6z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,41.6V644l108.6,0.9v202h221.4V555l-253.1,0.3l1.1-229l253.1-0.3l-1.1-301L334.4,41.6z" /> -->
+                <!-- 
+                <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,25v619L229,644.9v202H0V555h255.7l1.1-229H1.1L0,25H334.4z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,25v619l108.6,0.9v202h221.4V555l-253.1,0.3l1.1-229l253.1-0.3l-1.1-301H334.4z" /> -->
+
+                <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,73v604.1L229,678v168.9H0V578.7h255.7l1.1-295.7H1.1L0,73H334.4z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,73v604.1L443,678v168.9h221.4V578.7L411.3,579l1.1-295l253.1-0.3L664.4,73H334.4z" />
               </svg>
+
               <div class="point-list">
                 <div
                   class="tool_map_point"
@@ -124,7 +137,7 @@ export default {
   methods: {
     ...mapMutations(["setData"]),
     goPano(id) {
-      player.flyToPano({ pano: player.model.panos.get(id) });
+      player.blackToPano({ pano: player.model.panos.get(id) });
       // this.panoId = id;
       // if (!this.points[id].over) {
       //   this.points[id].over = true;

scene/src/views/gui/components/tourList.vue

@@ -59,7 +59,7 @@ export default {
               let data = JSON.parse(event.target.getAttribute("data-v"));
               let { panoId, quaternion } = data.heroLocations[0];
               // player.model.heroLocations里的那些item
-              player.flyToPano({ pano: player.model.panos.get(panoId), quaternion: new THREE.Quaternion(quaternion._x, quaternion._y, quaternion._z, quaternion._w) });
+              player.blackToPano({ pano: player.model.panos.get(panoId), quaternion: new THREE.Quaternion(quaternion._x, quaternion._y, quaternion._z, quaternion._w) });
             }
           },
         },

scene/src/views/gui/menu.vue

@@ -206,7 +206,7 @@
     </template>
     <!-- 音乐按钮 -->
     <transition name="fade" enter-active-class="animate__animated animate__fadeInUp animate__faster" leave-active-class="animate__animated animate__fadeOutDown animate__faster">
-      <div v-show="openType != 'immersive' || isMobile" class="right-btn" :class="{ mobile: isMobile }">
+      <div  class="right-btn" :class="{ mobile: isMobile }">
         <div id="bgm" class="button-item" :class="getActive(i.type)" v-for="(i, index) in rightButtons">
           <img class="normal" id="openMusic" :src="i.normalIcon" alt="" @click="switchBGM(false)" />
           <img class="active" id="closeMusic" :src="i.activeIcon" alt="" @click="switchBGM(true)" />
@@ -253,104 +253,104 @@ export default {
       isFullscreen: false,
       leftButtons: [
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_dollhouse.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_dollhouse_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_dollhouse.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_dollhouse_active.svg"),
           name: "3d模型",
           type: "model",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_map.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_map_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_map.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_map_active.svg"),
           name: "导航地图",
           type: "map",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_point.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_point_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_point.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_point_active.svg"),
           name: "重点展位",
           type: "tour",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_detail.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_detail_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_detail.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_detail_active.svg"),
           name: "热点列表",
           type: "hots",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_line.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_line.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.svg"),
           name: "展览路线",
           type: "route",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_screen.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_screen_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_screen.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_screen_active.svg"),
           name: "全屏",
           type: "fullScreen",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_mod.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_mod_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_mod.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_mod_active.svg"),
           name: "沉浸看展",
           type: "immersive",
         },
       ],
       rightButtons: [
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_voice_on.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_voice_off.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_voice_on.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_voice_off.svg"),
           name: "音乐",
           type: "music",
         },
       ],
       mobileTopBtns: [
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_dollhouse.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_dollhouse_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_dollhouse.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_dollhouse_active.svg"),
           name: "3d模型",
           type: "model",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_map.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_map_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_map.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_map_active.svg"),
           name: "导航地图",
           type: "map",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_mod.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_mod_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_mod.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_mod_active.svg"),
           name: "沉浸看展",
           type: "immersive",
         },
       ],
       mobileBottomBtns: [
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_detail.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_detail_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_detail.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_detail_active.svg"),
           name: "热点列表",
           type: "hots",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_point.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_point_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_point.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_point_active.svg"),
           name: "重点展位",
           type: "tour",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_line.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_line.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.svg"),
           name: "展览路线",
           type: "route",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_pre.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_pre.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.svg"),
           name: "后退",
           type: "controls",
         },
         {
-          normalIcon: require("@/assets/image/icon/new-icon/icon_next.png"),
-          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.png"),
+          normalIcon: require("@/assets/image/icon/new-icon/icon_next.svg"),
+          activeIcon: require("@/assets/image/icon/new-icon/icon_line_active.svg"),
           name: "前进",
           type: "controls",
         },
@@ -378,6 +378,13 @@ export default {
       window.addEventListener("playerAndModelReady", () => {
         player.on("flying.ended", () => {
           this.mode = player.mode;
+          if (this.mode == "dollhouse") {
+            $(".cad").hide();
+            $(".minimap-controls").hide();
+          } else {
+            $(".cad").show();
+            $(".minimap-controls").show();
+          }
         });
         player.on("pano.chosen", (oldPano, newPano) => {
           let { id } = newPano;

scene/vue.config.js

@@ -12,24 +12,24 @@ module.exports = {
       },
     },
   },
-  devServer: {
-    headers: {
-      "Cache-Control": "no-store",
-    },
-    https: false,
-    proxy: {
-      // "/page": {
-      //   target: "http://192.168.0.12:8081",
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/page/, ""),
-      // },
-      // "/js": {
-      //   target: "http://192.168.0.12:8081",
-      //   changeOrigin: true,
-      //   // rewrite: (path) => path.replace(/^\/page/, ""),
-      // },
-    },
-  },
+  // devServer: {
+  //   headers: {
+  //     "Cache-Control": "no-store",
+  //   },
+  //   https: false,
+  //   proxy: {
+  //     // "/page": {
+  //     //   target: "http://192.168.0.12:8081",
+  //     //   changeOrigin: true,
+  //     //   rewrite: (path) => path.replace(/^\/page/, ""),
+  //     // },
+  //     // "/js": {
+  //     //   target: "http://192.168.0.12:8081",
+  //     //   changeOrigin: true,
+  //     //   // rewrite: (path) => path.replace(/^\/page/, ""),
+  //     // },
+  //   },
+  // },
 };
 
 function getLessVariables(file) {