up

web/public/index.html

@@ -43,11 +43,11 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/js/Tween.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/myShow.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/manage.js"></script>
-    <script src="<%= VUE_APP_STATIC_DIR %>/js/overlay.js"></script>
+    <!-- <script src="<%= VUE_APP_STATIC_DIR %>/js/overlay.js"></script> -->
     <script src="<%= VUE_APP_STATIC_DIR %>/js/Hot.js"></script>  
     <script src="<%= VUE_APP_STATIC_DIR %>/js/main_2020_show.js"></script>
     <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/CAD/bundle.js"></script> -->
     <script src="<%= VUE_APP_STATIC_DIR %>/js/loadCAD.js"></script>
 </body>
 

web/src/components/welcome/index.vue

@@ -64,7 +64,7 @@ export default {
   z-index: 9999;
   font-size: 0;
   transition: all ease 0.3s;
-  background-color: #146fb1;
+  background-color: #a6160e;
   .bg {
     width: 100%;
     height: 100%;

web/src/pages/Home.vue

@@ -31,7 +31,7 @@
         <v-title />
 
         <!-- 底部菜单 -->
-        <v-menu @openIndex="showWelcome = true" />
+        <v-menu @openIndex="showWelcome = true" ref="menuRef"/>
 
         <!-- 导览 -->
         <v-guide />
@@ -124,6 +124,9 @@ export default {
     hideWelcome() {
       this.showWelcome = false;
       window.manage.switchBgmState(true);
+
+
+      this.$refs.menuRef.openOneSon()
     },
     getHotSpotList() {
       $.ajax({

web/src/views/gui/menu.vue

@@ -301,18 +301,17 @@
           <img src="@/assets/tab/×.png" alt="" />
         </div>
         <!-- 标题 -->
-        <div class="Motitle">党史路线
+        <div class="Motitle">
+          党史路线
 
-                  <div
-          class="toIndexTxt"
-          @click="(rightTab2[0].isShow = false), $emit('openIndex')"
-        >
-          珠海市高新区红色云展厅
-        </div>
+          <div
+            class="toIndexTxt"
+            @click="(rightTab2[0].isShow = false), $emit('openIndex')"
+          >
+            珠海市高新区红色云展厅
+          </div>
         </div>
 
-
-
         <!-- 地图 -->
         <div class="MoMap">
           <img src="@/assets/tabMo/moTab1Map.png" alt="" />
@@ -573,24 +572,85 @@
       <div class="conten">
         <!-- 关闭按钮 -->
         <div class="btnX" @click="rightTab[0].isShow = false">
-          <img src="@/assets/tab/×.png" alt="" />
+          <img src="@/assets/tab/×Red.png" alt="" />
         </div>
         <!-- 标题 -->
-        <div class="title">
+        <!-- <div class="title">
           <h3>珠海高新区中共党史学习教育园地</h3>
-        </div>
+        </div> -->
         <div
+          title="首页"
           class="toIndexTxt"
           @click="(rightTab[0].isShow = false), $emit('openIndex')"
-        >
-          珠海市高新区红色云展厅
-        </div>
+        ></div>
         <!-- 地图 -->
         <div class="map">
-          <img src="../../assets/tab/tab1map.png" alt="" />
+          <img src="../../assets/tab/tab1dw.jpg" alt="" />
         </div>
+
+        <!-- 后面加的图片对应的点击事件 -->
+        <a
+          class="imgClick imgClick1"
+          target="_blank"
+          href="http://www.4dmodel.com/SuperTwo/index.html?m=1257"
+          title="金鼎党群服务中心"
+        ></a>
+        <div
+          @click="toHideHot('C9Xzw4A682213')"
+          class="imgClick imgClick2"
+          title="上栅村史馆"
+        ></div>
+
+        <a
+          class="imgClick imgClick3"
+          target="_blank"
+          href="https://www.4dkankan.com/spc.html?m=uqNseUZY9F&lang=zh"
+          title="淇澳广场"
+        ></a>
+        <a
+          class="imgClick imgClick4"
+          target="_blank"
+          href="https://www.4dkankan.com/spc.html?m=rVuZY399SA&lang=zh"
+          title="淇澳村使馆"
+        ></a>
+        <a
+          class="imgClick imgClick5"
+          target="_blank"
+          href="https://www.4dmodel.com/SuperTwo/index.html?m=997"
+          title="苏兆征故居陈列馆"
+        ></a>
+        <a
+          class="imgClick imgClick7"
+          target="_blank"
+          href="http://www.4dmodel.com/SuperTwo/index.html?m=1034"
+          title="望慈山房"
+        ></a>
+        <a
+          class="imgClick imgClick8"
+          target="_blank"
+          href="https://www.4dkankan.com/spc.html?m=9ZqmhsI1Iq&lang=zh"
+          title="共乐园"
+        ></a>
+        <a
+          class="imgClick imgClick9"
+          href="javascript:;"
+          title="金山软件"
+          @click="toHideHot('SkJMnNI650604')"
+        ></a>
+        <a
+          class="imgClick imgClick10"
+          href="javascript:;"
+          title="世纪鼎利"
+          @click="toHideHot('LKkKYP679393')"
+        ></a>
+        <a
+          class="imgClick imgClick11"
+          href="javascript:;"
+          title="派诺科技"
+          @click="toHideHot('1jugHED669838')"
+        ></a>
         <!-- 最下面的跳转链接 -->
-        <div class="bottom">
+        <!-- <div class="bottom">
           <div>
             <a href="javascript:;"></a>
             <a
@@ -646,7 +706,7 @@
               @click="toHideHot('1jugHED669838')"
             ></a>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <!-- pc  --答题 -------------------------->
@@ -943,6 +1003,15 @@ export default {
   computed: {},
   mounted() {},
   methods: {
+
+    // 给父组件调用的方法
+    openOneSon(){
+      if(this.isMobile) {
+        this.rightTab2[0].isShow=true
+        }
+      else this.rightTab[0].isShow=true
+    },
+
     toHideHot(id) {
       let temp = window.myHotList.filter((v) => v.sid == id)[0];
       setTimeout(() => {
@@ -1333,18 +1402,91 @@ export default {
 .pcTab1 {
   .conten {
     position: relative;
+    .map {
+      margin: 0 !important;
+      width: 100% !important;
+      height: 100% !important;
+    }
     .toIndexTxt {
+      width: 250px;
+      height: 61px;
       cursor: pointer;
       position: absolute;
-      top: 113px;
-      left: 78px;
+      top: 45px;
+      left: 54px;
       font-size: 26px;
       color: #edd3b0;
       letter-spacing: 2px;
       font-weight: 700;
     }
+    .imgClick {
+      cursor: pointer;
+      position: absolute;
+      z-index: 10;
+    }
+    .imgClick1 {
+      top: 365px;
+      left: 316px;
+      width: 108px;
+      height: 34px;
+    }
+    .imgClick2 {
+      top: 240px;
+      left: 348px;
+      width: 82px;
+      height: 45px;
+    }
+    .imgClick3 {
+      top: 164px;
+      left: 1026px;
+      width: 38px;
+      height: 21px;
+    }
+    .imgClick4 {
+      top: 185px;
+      left: 1050px;
+      width: 64px;
+      height: 19px;
+    }
+    .imgClick5 {
+      top: 201px;
+      left: 966px;
+      width: 82px;
+      height: 23px;
+    }
+    .imgClick7 {
+      top: 447px;
+      left: 630px;
+      width: 108px;
+      height: 25px;
+    }
+    .imgClick8 {
+      top: 416px;
+      left: 609px;
+      width: 93px;
+      height: 30px;
+    }
+    .imgClick9 {
+      top: 481px;
+      left: 769px;
+      width: 40px;
+      height: 37px;
+    }
+    .imgClick10 {
+      top: 302px;
+      left: 568px;
+      width: 49px;
+      height: 33px;
+    }
+  }
+  .imgClick11 {
+    top: 256px;
+    left: 523px;
+    width: 49px;
+    height: 33px;
   }
 }
+
 .myTab {
   position: fixed;
   top: 0;
@@ -2125,16 +2267,19 @@ export default {
 
   .MoTab1 {
     .conten {
-      .Motitle{
+      .btnX{
+        z-index: 99;
+      }
+      .Motitle {
         position: relative;
 
-      .toIndexTxt {
-        position: absolute;
-        left: 10px;
-        bottom: -22px;
-        font-size: 14px;
-        color: #edd3b0
-      }
+        .toIndexTxt {
+          position: absolute;
+          left: 10px;
+          bottom: -22px;
+          font-size: 14px;
+          color: #edd3b0;
+        }
       }
     }
   }