shaogen1995 3 年之前
父节点
当前提交
655ff200e5
共有 58 个文件被更改,包括 100 次插入52 次删除
  1. 17 4
      houtai/src/views/tab3/index.vue
  2. 0 0
      web/public/data/1.png
  3. 二进制
      web/src/assets/img/contCun/1.png
  4. 二进制
      web/src/assets/img/contCun/10.png
  5. 二进制
      web/src/assets/img/contCun/1001.png
  6. 二进制
      web/src/assets/img/contCun/11.png
  7. 二进制
      web/src/assets/img/contCun/12.png
  8. 二进制
      web/src/assets/img/contCun/2.png
  9. 二进制
      web/src/assets/img/contCun/3.png
  10. 二进制
      web/src/assets/img/contCun/4.png
  11. 二进制
      web/src/assets/img/contCun/5.png
  12. 二进制
      web/src/assets/img/contCun/6.png
  13. 二进制
      web/src/assets/img/contCun/7.png
  14. 二进制
      web/src/assets/img/contCun/8.png
  15. 二进制
      web/src/assets/img/contCun/9.png
  16. 二进制
      web/src/assets/img/cunName/1.png
  17. 二进制
      web/src/assets/img/cunName/10.png
  18. 二进制
      web/src/assets/img/cunName/1001.png
  19. 二进制
      web/src/assets/img/cunName/11.png
  20. 二进制
      web/src/assets/img/cunName/12.png
  21. 二进制
      web/src/assets/img/cunName/2.png
  22. 二进制
      web/src/assets/img/cunName/3.png
  23. 二进制
      web/src/assets/img/cunName/4.png
  24. 二进制
      web/src/assets/img/cunName/5.png
  25. 二进制
      web/src/assets/img/cunName/6.png
  26. 二进制
      web/src/assets/img/cunName/7.png
  27. 二进制
      web/src/assets/img/cunName/8.png
  28. 二进制
      web/src/assets/img/cunName/9.png
  29. 二进制
      web/src/assets/img/cunName/bs.png
  30. 4 1
      web/src/components/eight.vue
  31. 7 3
      web/src/components/seven.vue
  32. 1 1
      web/src/components/tow.vue
  33. 1 1
      web/src/views/info/index.vue
  34. 9 7
      web/src/views/stair/component/intro.vue
  35. 2 2
      web/src/views/stair/component/share.vue
  36. 14 0
      web/src/views/stair/data.js
  37. 1 10
      web/src/views/stair/index.vue
  38. 0 0
      webM/public/data/M/1.png
  39. 二进制
      webM/src/assets/img/cName/1.png
  40. 二进制
      webM/src/assets/img/cName/10.png
  41. 二进制
      webM/src/assets/img/cName/11.png
  42. 二进制
      webM/src/assets/img/cName/12.png
  43. 二进制
      webM/src/assets/img/cName/2.png
  44. 二进制
      webM/src/assets/img/cName/3.png
  45. 二进制
      webM/src/assets/img/cName/4.png
  46. 二进制
      webM/src/assets/img/cName/5.png
  47. 二进制
      webM/src/assets/img/cName/6.png
  48. 二进制
      webM/src/assets/img/cName/7.png
  49. 二进制
      webM/src/assets/img/cName/8.png
  50. 二进制
      webM/src/assets/img/cName/9.png
  51. 1 1
      webM/src/components/five.vue
  52. 1 1
      webM/src/components/six.vue
  53. 1 1
      webM/src/components/tow.vue
  54. 17 1
      webM/src/views/info/index.vue
  55. 7 7
      webM/src/views/stair/component/intro.vue
  56. 2 2
      webM/src/views/stair/component/share.vue
  57. 14 0
      webM/src/views/stair/data.js
  58. 1 10
      webM/src/views/stair/index.vue

+ 17 - 4
houtai/src/views/tab3/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="tab3">
   <div class="tab3">
     <div class="insideTop">
     <div class="insideTop">
-      数据统计(等待开发)
+      数据统计
       <div class="addBtn">
       <div class="addBtn">
         <el-button type="primary">导出</el-button>
         <el-button type="primary">导出</el-button>
       </div>
       </div>
@@ -28,7 +28,7 @@
       </div>
       </div>
       <!-- 下面盒子 -->
       <!-- 下面盒子 -->
       <div class="bottom">
       <div class="bottom">
-        <span class="tit">VR景点打卡排行</span>
+        <span class="tit">VR景点打卡排行(等待开发)</span>
         <div class="botRowBox">
         <div class="botRowBox">
           <div class="botRow" v-for="i in 10" :key="i">
           <div class="botRow" v-for="i in 10" :key="i">
             <div class="botLeft">
             <div class="botLeft">
@@ -138,9 +138,22 @@ export default {
       },
       },
       series: [
       series: [
         {
         {
-          name: '',
           type: 'bar',
           type: 'bar',
-          data: objTemp.num
+          data: objTemp.num,
+          itemStyle: {
+            normal: {
+              label: {
+                formatter: '{c}',
+                show: true,
+                position: 'right',
+                textStyle: {
+                  fontWeight: 'bolder',
+                  fontSize: '16',
+                  color: '#02a7f0'
+                }
+              }
+            }
+          }
         }
         }
       ]
       ]
     }
     }

web/public/data/1001.png → web/public/data/1.png


二进制
web/src/assets/img/contCun/1.png


二进制
web/src/assets/img/contCun/10.png


二进制
web/src/assets/img/contCun/1001.png


二进制
web/src/assets/img/contCun/11.png


二进制
web/src/assets/img/contCun/12.png


二进制
web/src/assets/img/contCun/2.png


二进制
web/src/assets/img/contCun/3.png


二进制
web/src/assets/img/contCun/4.png


二进制
web/src/assets/img/contCun/5.png


二进制
web/src/assets/img/contCun/6.png


二进制
web/src/assets/img/contCun/7.png


二进制
web/src/assets/img/contCun/8.png


二进制
web/src/assets/img/contCun/9.png


二进制
web/src/assets/img/cunName/1.png


二进制
web/src/assets/img/cunName/10.png


二进制
web/src/assets/img/cunName/1001.png


二进制
web/src/assets/img/cunName/11.png


二进制
web/src/assets/img/cunName/12.png


二进制
web/src/assets/img/cunName/2.png


二进制
web/src/assets/img/cunName/3.png


二进制
web/src/assets/img/cunName/4.png


二进制
web/src/assets/img/cunName/5.png


二进制
web/src/assets/img/cunName/6.png


二进制
web/src/assets/img/cunName/7.png


二进制
web/src/assets/img/cunName/8.png


二进制
web/src/assets/img/cunName/9.png


二进制
web/src/assets/img/cunName/bs.png


+ 4 - 1
web/src/components/eight.vue

@@ -46,7 +46,7 @@
               </p>
               </p>
             </div>
             </div>
             <div class="detailPP">
             <div class="detailPP">
-              <span class="detailSpan">建筑概况:</span>{{ detailData.txt5 }}
+              <span class="detailSpan">建筑概况:</span><i v-html="detailData.txt5"></i>
             </div>
             </div>
           </div>
           </div>
           <!-- 图片 -->
           <!-- 图片 -->
@@ -346,6 +346,9 @@ export default {
           .detailPP {
           .detailPP {
             height: 200px;
             height: 200px;
             overflow-y: auto;
             overflow-y: auto;
+            i {
+              font-style: normal;
+            }
             .detailSpan {
             .detailSpan {
               font-family: "思源宋体";
               font-family: "思源宋体";
               font-size: 20px;
               font-size: 20px;

+ 7 - 3
web/src/components/seven.vue

@@ -39,7 +39,8 @@
               </p>
               </p>
             </div>
             </div>
             <div class="detailPP">
             <div class="detailPP">
-              <span class="detailSpan">简介:</span>{{ detailData.txt4 }}
+              <span class="detailSpan">简介:</span
+              ><i v-html="detailData.txt4"></i>
             </div>
             </div>
           </div>
           </div>
           <!-- 图片 -->
           <!-- 图片 -->
@@ -105,7 +106,7 @@ export default {
             slidesPerView: 3,
             slidesPerView: 3,
             spaceBetween: 0,
             spaceBetween: 0,
             centeredSlides: true,
             centeredSlides: true,
-            initialSlide:1
+            initialSlide: 1,
             // pagination: {
             // pagination: {
             //   el: '.swiper-pagination',
             //   el: '.swiper-pagination',
             //   clickable: true,
             //   clickable: true,
@@ -155,7 +156,7 @@ export default {
   object-fit: cover;
   object-fit: cover;
 }
 }
 .swiper-slide {
 .swiper-slide {
-  transition: all .3s;
+  transition: all 0.3s;
   opacity: 0.5;
   opacity: 0.5;
 }
 }
 .swiper-slide-active {
 .swiper-slide-active {
@@ -322,6 +323,9 @@ export default {
           .detailPP {
           .detailPP {
             height: 200px;
             height: 200px;
             overflow-y: auto;
             overflow-y: auto;
+            i {
+              font-style: normal;
+            }
             .detailSpan {
             .detailSpan {
               font-family: "思源宋体";
               font-family: "思源宋体";
               font-size: 20px;
               font-size: 20px;

+ 1 - 1
web/src/components/tow.vue

@@ -6,7 +6,7 @@
         <div class="rowLeft">{{ (index+1)<10?`0${index+1}`:index+1 }}</div>
         <div class="rowLeft">{{ (index+1)<10?`0${index+1}`:index+1 }}</div>
         <div class="rowRight">
         <div class="rowRight">
           <div class="sroolStop">{{item.name}}</div>
           <div class="sroolStop">{{item.name}}</div>
-          <p class="sroolStop">{{item.txt}}</p>
+          <p class="sroolStop" v-html="item.txt"></p>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 1 - 1
web/src/views/info/index.vue

@@ -22,7 +22,7 @@
     </div>
     </div>
     <div class="conten">
     <div class="conten">
       <div class="left">
       <div class="left">
-        <img src="../../assets/img/contCun/1001.png" alt="" />
+        <img :src="require(`@/assets/img/contCun/${$route.params.id}.png`)" alt="" />
         <div class="leftRow">
         <div class="leftRow">
           <div
           <div
             @click="cutScroll(index)"
             @click="cutScroll(index)"

文件差异内容过多而无法显示
+ 9 - 7
web/src/views/stair/component/intro.vue


+ 2 - 2
web/src/views/stair/component/share.vue

@@ -4,14 +4,14 @@
     <div class="main">
     <div class="main">
       <div class="title">分享</div>
       <div class="title">分享</div>
       <div class="bigImg">
       <div class="bigImg">
-        <img src="data/1001.png" alt="" />
+        <img src="data/1.png" alt="" />
       </div>
       </div>
       <!-- 复制和下载 -->
       <!-- 复制和下载 -->
       <div class="btn">
       <div class="btn">
         <div class="lianjie" title="复制链接" @click="copy">
         <div class="lianjie" title="复制链接" @click="copy">
           <img src="../../../assets/img/copy.png" alt="" />
           <img src="../../../assets/img/copy.png" alt="" />
         </div>
         </div>
-        <a href="data/1001.png" download title="下载">
+        <a href="data/1.png" download title="下载">
         <img src="../../../assets/img/download.png" alt="" />
         <img src="../../../assets/img/download.png" alt="" />
         </a>
         </a>
       </div>
       </div>

+ 14 - 0
web/src/views/stair/data.js

@@ -0,0 +1,14 @@
+export const txtInfo = [
+  { id: 1, tit: '东宁村', txt: '东宁村简介' },
+  { id: 2, tit: '良溪村', txt: '良溪村简介' },
+  { id: 3, tit: '卢边村', txt: '卢边村简介' },
+  { id: 4, tit: '田心村', txt: '田心村简介' },
+  { id: 5, tit: '仓前村', txt: '仓前村简介' },
+  { id: 6, tit: '霄南村', txt: '霄南村简介' },
+  { id: 7, tit: '歇马村', txt: '歇马村简介' },
+  { id: 8, tit: '自力村', txt: '自力村简介' },
+  { id: 9, tit: '马降龙村', txt: '马降龙村简介' },
+  { id: 10, tit: '浮石村', txt: '浮石村简介' },
+  { id: 11, tit: '浮月村', txt: '浮月村简介' },
+  { id: 12, tit: '横江村', txt: '横江村简介' },
+]

+ 1 - 10
web/src/views/stair/index.vue

@@ -7,8 +7,7 @@
     </div>
     </div>
     <!-- 右边村名 -->
     <!-- 右边村名 -->
     <div class="rightCM">
     <div class="rightCM">
-      <img class="name" src="../../assets/img/cunName/1001.png" alt="" />
-      <img class="bs" src="../../assets/img/cunName/bs.png" alt="" />
+      <img class="name" :src="require(`@/assets/img/cunName/${$route.params.id}.png`)" alt="" />
     </div>
     </div>
     <!-- 中间选项 -->
     <!-- 中间选项 -->
     <div class="conMain">
     <div class="conMain">
@@ -164,14 +163,6 @@ export default {
     position: absolute;
     position: absolute;
     top: 50px;
     top: 50px;
     right: 20px;
     right: 20px;
-    .name {
-      width: 50px;
-      height: 316px;
-    }
-    .bs {
-      width: 42px;
-      height: 67px;
-    }
   }
   }
   .conMain {
   .conMain {
     height: 400px;
     height: 400px;

webM/public/data/1.png → webM/public/data/M/1.png


二进制
webM/src/assets/img/cName/1.png


二进制
webM/src/assets/img/cName/10.png


二进制
webM/src/assets/img/cName/11.png


二进制
webM/src/assets/img/cName/12.png


二进制
webM/src/assets/img/cName/2.png


二进制
webM/src/assets/img/cName/3.png


二进制
webM/src/assets/img/cName/4.png


二进制
webM/src/assets/img/cName/5.png


二进制
webM/src/assets/img/cName/6.png


二进制
webM/src/assets/img/cName/7.png


二进制
webM/src/assets/img/cName/8.png


二进制
webM/src/assets/img/cName/9.png


+ 1 - 1
webM/src/components/five.vue

@@ -40,7 +40,7 @@
             <span>年代:</span><i>{{ detailData.txt3 }}</i>
             <span>年代:</span><i>{{ detailData.txt3 }}</i>
           </p>
           </p>
           <p>
           <p>
-            <span>简介:</span><i>{{ detailData.txt4 }}</i>
+            <span>简介:</span><i v-html="detailData.txt4"></i>
           </p>
           </p>
         </div>
         </div>
         <!-- 轮播图 -->
         <!-- 轮播图 -->

+ 1 - 1
webM/src/components/six.vue

@@ -49,7 +49,7 @@
             <span>保护级别:</span><i>{{ detailData.txt4 }}</i>
             <span>保护级别:</span><i>{{ detailData.txt4 }}</i>
           </p>
           </p>
           <p>
           <p>
-            <span>建筑概况:</span><i>{{ detailData.txt5 }}</i>
+            <span>建筑概况:</span><i v-html="detailData.txt5"></i>
           </p>
           </p>
         </div>
         </div>
         <!-- 轮播图 -->
         <!-- 轮播图 -->

+ 1 - 1
webM/src/components/tow.vue

@@ -12,7 +12,7 @@
         </div>
         </div>
         <div class="rowRight">
         <div class="rowRight">
           <div class="sroolStop">{{ item.name }}</div>
           <div class="sroolStop">{{ item.name }}</div>
-          <p class="sroolStop">{{ item.txt }}</p>
+          <p class="sroolStop" v-html="item.txt"></p>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

+ 17 - 1
webM/src/views/info/index.vue

@@ -45,6 +45,7 @@
     </div>
     </div>
     <!-- 下一页序列帧 -->
     <!-- 下一页序列帧 -->
     <div
     <div
+      :class="{pageOpc:pageOpcAc}"
       class="pageGif"
       class="pageGif"
       @click="pageInd++"
       @click="pageInd++"
       v-if="pageInd < leftData.length - 1"
       v-if="pageInd < leftData.length - 1"
@@ -91,6 +92,7 @@ export default {
       // 关于序列帧
       // 关于序列帧
       pageGifLeft: 0,
       pageGifLeft: 0,
       pageGifTim: null,
       pageGifTim: null,
+      pageOpcAc:false
     };
     };
   },
   },
   //监听属性 类似于data概念
   //监听属性 类似于data概念
@@ -98,12 +100,20 @@ export default {
   //监控data中的数据变化
   //监控data中的数据变化
   watch: {
   watch: {
     pageInd(val) {
     pageInd(val) {
+
+      this.pageOpcAc=true
+      setTimeout(() => {
+        this.pageOpcAc=false
+      }, 500);
+
+
       // 控制顶部滑动
       // 控制顶部滑动
       let dom = document.querySelector(".rowBox");
       let dom = document.querySelector(".rowBox");
       dom.scrollTo({ left: 82 * (val - 1), behavior: "smooth" });
       dom.scrollTo({ left: 82 * (val - 1), behavior: "smooth" });
       // 控制页面滑动
       // 控制页面滑动
       let pageDom = document.querySelector(".mainBox");
       let pageDom = document.querySelector(".mainBox");
       pageDom.scrollTo({ top: this.pageHei * val, behavior: "smooth" });
       pageDom.scrollTo({ top: this.pageHei * val, behavior: "smooth" });
+
       // 切换的时候暂时视频
       // 切换的时候暂时视频
       this.$nextTick(() => {
       this.$nextTick(() => {
         setTimeout(() => {
         setTimeout(() => {
@@ -176,7 +186,9 @@ export default {
   }
   }
   // 序列帧动图
   // 序列帧动图
   .pageGif {
   .pageGif {
-    z-index: 9999;
+    transform: opacity .5s;
+    opacity: 1;
+    z-index: 1;
     position: absolute;
     position: absolute;
     bottom: 10px;
     bottom: 10px;
     left: 50%;
     left: 50%;
@@ -187,6 +199,10 @@ export default {
     background-position-x: 0px;
     background-position-x: 0px;
     background-position-y: 0px;
     background-position-y: 0px;
   }
   }
+  .pageOpc{
+    opacity: 0;
+    pointer-events: none;
+  }
   // 菜单栏
   // 菜单栏
   .meanBox {
   .meanBox {
     z-index: 3;
     z-index: 3;

文件差异内容过多而无法显示
+ 7 - 7
webM/src/views/stair/component/intro.vue


+ 2 - 2
webM/src/views/stair/component/share.vue

@@ -3,14 +3,14 @@
     <div class="main">
     <div class="main">
       <h3>分享</h3>
       <h3>分享</h3>
       <div class="imgBox">
       <div class="imgBox">
-        <img src="data/1.png" alt="" />
+        <img src="data/M/1.png" alt="" />
       </div>
       </div>
       <!-- 底部功能按钮 -->
       <!-- 底部功能按钮 -->
       <div class="btn">
       <div class="btn">
         <div class="lianjie" title="复制链接" @click="copy">
         <div class="lianjie" title="复制链接" @click="copy">
           <img src="@/assets/img/copy.png" alt="" />
           <img src="@/assets/img/copy.png" alt="" />
         </div>
         </div>
-        <a href="data/1.png" download title="下载">
+        <a href="data/M/1.png" download title="下载">
           <img src="@/assets/img/download.png" alt="" />
           <img src="@/assets/img/download.png" alt="" />
         </a>
         </a>
       </div>
       </div>

+ 14 - 0
webM/src/views/stair/data.js

@@ -0,0 +1,14 @@
+export const txtInfo = [
+  { id: 1, tit: '东宁村', txt: '东宁村简介' },
+  { id: 2, tit: '良溪村', txt: '良溪村简介' },
+  { id: 3, tit: '卢边村', txt: '卢边村简介' },
+  { id: 4, tit: '田心村', txt: '田心村简介' },
+  { id: 5, tit: '仓前村', txt: '仓前村简介' },
+  { id: 6, tit: '霄南村', txt: '霄南村简介' },
+  { id: 7, tit: '歇马村', txt: '歇马村简介' },
+  { id: 8, tit: '自力村', txt: '自力村简介' },
+  { id: 9, tit: '马降龙村', txt: '马降龙村简介' },
+  { id: 10, tit: '浮石村', txt: '浮石村简介' },
+  { id: 11, tit: '浮月村', txt: '浮月村简介' },
+  { id: 12, tit: '横江村', txt: '横江村简介' },
+]

+ 1 - 10
webM/src/views/stair/index.vue

@@ -7,8 +7,7 @@
     </div>
     </div>
     <!-- 右边村名 -->
     <!-- 右边村名 -->
     <div class="rightCM">
     <div class="rightCM">
-      <img class="name" src="../../assets/img/cName/1.png" alt="" />
-      <img class="bs" src="../../assets/img/bs.png" alt="" />
+      <img class="name" :src="require(`@/assets/img/cName/${$route.params.id}.png`)" alt="" />
     </div>
     </div>
     <!-- 底部功能 -->
     <!-- 底部功能 -->
     <div class="botBtn">
     <div class="botBtn">
@@ -145,14 +144,6 @@ export default {
     position: absolute;
     position: absolute;
     top: 17px;
     top: 17px;
     right: 14px;
     right: 14px;
-    .name {
-      width: 37px;
-      margin-right: 8px;
-    }
-    .bs {
-      vertical-align: bottom;
-      width: 27px;
-    }
   }
   }
   .botBtn {
   .botBtn {
     padding: 0 10px;
     padding: 0 10px;