jinx 9 месяцев назад
Родитель
Сommit
de70655718

+ 20 - 20
public/json/list.json

@@ -2,81 +2,81 @@
   "models": [
     {
       "id": 2,
-      "thumb": "model-1.png",
+      "thumb": "pic-1.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=JinShaJinag",
       "name": "金沙江石鼓渡口(中国工农红军第二方面军长征渡江纪念碑)",
       "desc": ""
     },
     {
       "id": 3,
-      "thumb": "model-2.png",
+      "thumb": "pic-2.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=MuGuaTaiDuKou",
       "name": "木瓜寨渡口标志牌",
       "desc": ""
     },
     {
       "id": 4,
-      "thumb": "model-3.png",
+      "thumb": "pic-3.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=MuQuDuDuKou",
       "name": "木取独渡口标志牌",
       "desc": ""
     },
     {
       "id": 5,
-      "thumb": "model-4.png",
+      "thumb": "pic-4.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=GeZiDuDuKou",
       "name": "格子渡口标志牌",
       "desc": ""
     },
     {
       "id": 6,
-      "thumb": "model-5.png",
+      "thumb": "pic-5.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=ShiKeDuKou",
       "name": "士可渡口标志牌",
       "desc": ""
     },
     {
       "id": 7,
-      "thumb": "model-6.png",
+      "thumb": "pic-6.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=JuDianDuKou",
       "name": "巨甸渡口标志牌",
       "desc": ""
     },
     {
       "id": 8,
-      "thumb": "model-7.png",
+      "thumb": "pic-7.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=WuMingHongJunZhanShiMu",
       "name": "无名红军战士墓",
       "desc": ""
     },
     {
       "id": 9,
-      "thumb": "model-8.png",
+      "thumb": "pic-8.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=ShiGuJie",
       "name": "石鼓碣",
       "desc": ""
     },
     {
       "id": 10,
-      "thumb": "model-9.png",
+      "thumb": "pic-9.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=ShiGuXiTai",
       "name": "石鼓戏台",
       "desc": ""
     },
     {
       "id": 11,
-      "thumb": "model-10.png",
+      "thumb": "pic-10.png",
       "modelType": 2,
-      "fileName": "https://rjbwg.4dage.com/web/index.html#/gis?id=4",
+      "fileName": "https://gis.4dage.com/gis/data/index.html#/map?data=TieHongQiao",
       "name": "铁红桥",
       "desc": ""
     }

BIN
public/thumb/model/pic-1.png


BIN
public/thumb/model/pic-10.png


BIN
public/thumb/model/pic-2.png


BIN
public/thumb/model/pic-3.png


BIN
public/thumb/model/pic-4.png


BIN
public/thumb/model/pic-5.png


BIN
public/thumb/model/pic-6.png


BIN
public/thumb/model/pic-7.png


BIN
public/thumb/model/pic-8.png


BIN
public/thumb/model/pic-9.png


+ 31 - 9
src/pages/detail/model.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="model-box" :class="{ isMobile }" v-if="metadata">
     <div class="close-btn" @click="onClose"></div>
-    <!-- <div class="control-bar" :class="{ bottom: isMobile && isFullscreen }" v-if="modelLoaded || info.modelType == 2">
+    <!-- <div class="control-bar" :class="{ bottom: isMobile && isFullscreen, bottomRight: info.modelType == 2 && isMobile }" v-if="modelLoaded || info.modelType == 2">
       <template v-for="(i, index) in controls">
         <div v-if="info.modelType == 1 || (info.modelType == 2 && i.name == 'fullScreen')" class="item" @click="onClickBar(i)" :style="`background-image:url(${i.url});`"></div>
       </template>
@@ -12,15 +12,15 @@
         <!-- <div class="model-view"> -->
         <!-- <div class="frame-box" :class="{ 'no-move': info.modelType == 2 }"> -->
         <div class="frame-box">
-          <!-- <iframe id="ifr" :src="getIframeUrl()" frameborder="0"></iframe> -->
-          <img :src="`./thumb/model/${info.thumb}`" alt="" />
+          <iframe id="ifr" :src="getIframeUrl()" frameborder="0"></iframe>
+          <!-- <img :src="`./thumb/model/${info.thumb}`" alt="" /> -->
         </div>
-        <!-- <div class="frame-box no-move"></div> -->
+    
       </div>
-      <div class="model-text">
+      <!-- <div class="model-text">
         <p class="title">{{ info.name }}</p>
         <span class="desc">{{ info.desc }}</span>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -71,7 +71,7 @@ export default {
       if (this.info.modelType == 1) {
         url = `/html/model.html?m=${encodeURIComponent(this.info.fileName)}`;
       } else {
-        url = `https://rjbwg.4dage.com/museum/musum/index.html?id=4`;
+        url = this.info.fileName;
       }
       return url;
     },
@@ -172,6 +172,7 @@ export default {
     right: 40px;
     bottom: 100px;
     z-index: 101;
+
     .item {
       width: 32px;
       height: 32px;
@@ -202,10 +203,16 @@ export default {
       align-items: center;
       justify-content: flex-start;
       flex-direction: column;
+      // width: 100%;
+      // height: 70%;
+
       width: 100%;
-      height: 70%;
+      height: 100%;
+      position: fixed;
+      z-index: 1;
       .frame-box {
-        width: 50%;
+        // width: 50%;
+        width: 100%;
         height: 100%;
         display: flex;
         align-items: center;
@@ -243,6 +250,16 @@ export default {
     }
     .model-text {
       padding: 0 25%;
+      height: 30%;
+      overflow-y: auto;
+      &::-webkit-scrollbar-thumb {
+        background-color: #e5c4a8;
+        outline: none;
+      }
+      &::-webkit-scrollbar {
+        width: 4px;
+        height: 4px;
+      }
       .title {
         font-weight: bold;
         font-size: 24px;
@@ -279,6 +296,11 @@ export default {
       &.bottom {
         bottom: 0.5333rem;
       }
+      &.bottomRight {
+        left: auto;
+        right: 0;
+        width: auto;
+      }
     }
     .model-content {
       width: 100%;