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

hot/src/main.js

@@ -10,7 +10,7 @@ import VueLazyLoad from "vue-lazyload";
 Vue.use(VueLazyLoad, {
   // preLoad: 1,   //预加载的宽高比
   error: require("@/assets/images/IMGerror.png"),
-  loading: require("@/assets/images/loading.gif"),
+  loading: require("@/assets/images/loading.png"),
 });
 
 Vue.config.productionTip = false;

hot/src/views/Home.vue

@@ -71,7 +71,7 @@
     </div>
     <!-- 查看图片 -->
     <viewer class="viewerCla" ref="viewer" :images="lookPics">
-      <img :src="lookPics[0]" alt="" />
+      <img :src="lookPics[picIndex]" alt="" />
     </viewer>
   </div>
 </template>
@@ -91,7 +91,7 @@ export default {
       isOneAduio: false,
       // 音频状态
       audioSta: false,
-
+      picIndex: 0,
       data: {
         // 模型数组
         model: [],
@@ -174,8 +174,8 @@ export default {
     lookImg(url) {
       if (!this.dom) {
         this.dom = this.$refs.viewer.$viewer;
-        this.lookPics = [url];
       }
+      this.lookPics = [url];
       this.dom.show();
     },
     async getData() {
@@ -390,10 +390,10 @@ export default {
               width: 100%;
               height: 100%;
               object-fit: contain;
-              // &[lazy="loading"] {
-              //   width: 300px;
-              //   height: 300px;
-              // }
+              &[lazy="loading"] {
+                width: 100px;
+                height: 100px;
+              }
             }
           }
         }
@@ -629,8 +629,8 @@ export default {
               justify-content: center;
               img {
                 &[lazy="loading"] {
-                  width: 6.6667rem;
-                  height: 6.6667rem;
+                  width: 1.3333rem;
+                  height: 1.3333rem;
                 }
                 &[lazy="loaded"] {
                   // width: 100px;

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:8082')
+        return src.replace('https://www.4dmodel.com/SuperTwo/hot_online1', 'hot')
         // return src //打包   
        
     }

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

@@ -12,38 +12,8 @@
           <div class="map-box" ref="mapBox" :style="`transform: translate(-50%, -50%) scale(${mapScale});`">
             <div class="map-svg">
               <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="665px" height="963px">
-                <!-- <polygon
-                  id="_x32_"
-                  class="st0"
-                  opacity="0.4"
-                  fill="rgb(134, 92, 92)"
-                  points="208.3,150.5 208.3,0 0,0 0,222 253,222 253,610 0,610 0,846 79.4,846 79.4,672.3 
-	315.5,672.3 315.5,150.5 "
-                  :class="{ active: unit == 1 }"
-                />
-                <polygon
-                  :class="{ active: unit == 2 }"
-                  id="_x31_"
-                  class="st0"
-                  opacity="0.4"
-                  fill="rgb(134, 92, 92)"
-                  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.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" />
+                <path :class="{ active: unit == 2 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,0v653.4L229,654.2v119.6H0V505.7h255.7l1.1-295.7H1.1L0,0H334.4z" />
+                <path :class="{ active: unit == 1 }" fill="rgb(134, 92, 92)" class="st0" d="M334.4,0v653.5l110.6,0.9v119.5h219.4V505.7L411.3,506l1.1-295l253.1-0.3L664.4,0H334.4z" />
               </svg>
 
               <div class="point-list">
@@ -52,7 +22,7 @@
                   :pano-id="id"
                   @click="goPano(id)"
                   :class="{ current: panoId == id, over: i.over }"
-                  :style="`transform:translate(${i.x}px,${i.y}px);`"
+                  :style="`transform:translate(${i.x}px,${i.y - 70}px);`"
                   v-for="(i, id, index) in points"
                 >
                   <p class="tips">点位{{ id }}</p>
@@ -61,7 +31,6 @@
             </div>
           </div>
         </div>
-
         <div class="point-type-list">
           <dl>
             <dt class="over"></dt>
@@ -285,8 +254,8 @@ export default {
           top: 50%;
           overflow: hidden;
           .map-svg {
-            left: 70px;
-            top: 61px;
+            left: 69px;
+            top: 70px;
             position: absolute;
 
             polygon {