pc-更新一波定位和地址/名称

pc/public/index.html

@@ -9,6 +9,30 @@
   <meta name="description" content="Web site created using create-react-app" />
   <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
   <script src="./staticData.js"></script>
+  <script>
+
+    // 禁用鼠标右键
+    document.addEventListener("contextmenu", function (e) {
+      e.preventDefault();
+    });
+
+    document.onkeydown = () => {
+      //禁用F12
+      if (window.event && window.event.keyCode == 123) {
+        return false;
+        //禁用ctrl+shift+i,
+      } else if (
+        window.event.ctrlKey &&
+        window.event.shiftKey &&
+        window.event.keyCode == 73
+      ) {
+        return false;
+        //屏蔽Shift+F10
+      } else if (window.event.shiftKey && window.event.keyCode == 121) {
+        return false;
+      }
+    };
+  </script>
   <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

pc/public/staticData.js

@@ -12,13 +12,13 @@ const staticData = [
       // {
       //   id: 1,
       //   img: "1.png",
-      //   name: "鸦片战争博物馆",
+      //   name: "鸦片战争博物馆（虎门林则徐纪念馆）",
       //   path: "https://www.4dkankan.com/spg.html?m=KJ-Db5vr10oMd&lang=zh",
       // },
       // {
       //   id: 2,
       //   img: "2.png",
-      //   name: "海战馆",
+      //   name: "海战博物馆",
       //   path: "https://www.4dkankan.com/spg.html?m=KJ-PoA0YhcfD7&lang=zh",
       // },
       // {

pc/src/pages/A0Map/MapSon/data.ts

@@ -1,26 +1,26 @@
 // -----大场景
 // 虎门销烟陈列：http://www.4dmodel.com/SuperTwo/index.html?m=1429
 // 虎门故事陈列：http://www.4dmodel.com/SuperTwo/index.html?m=1430
-// 海战馆：http://www.4dmodel.com/SuperTwo/index.html?m=1426
+// 海战博物馆：http://www.4dmodel.com/SuperTwo/index.html?m=1426
 // 海战博物馆-第一展厅:http://www.4dmodel.com/SuperTwo/index.html?m=1428
 //  海战博物馆-第二展厅：http://www.4dmodel.com/SuperTwo/index.html?m=1431 
 //  海战博物馆第三展厅：http://www.4dmodel.com/SuperTwo/index.html?m=1432
 
 // -----四维看看
 // 捕鱼台旧址：https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh
-// 濒海台旧址：https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh
+// 节兵义坟：https://laser.4dkankan.com/index.html?m=SS-twDivJV13k#
 // 定洋炮台旧址：https://www.4dkankan.com/spg.html?m=SS-suYJyuqvS4z&lang=zh
 // 威远炮台旧址：https://www.4dkankan.com/spc.html?m=SS-w1y1zhoOa0&lang=zh
 // 靖远炮台：https://www.4dkankan.com/spc.html?m=SS-kI3GS3HAfe&lang=zh
 // 镇远炮台：https://www.4dkankan.com/spc.html?m=SS-HWGdXUwTz7&lang=zh
-// 南山顶炮台旧址：https://www.4dkankan.com/spc.html?m=SS-v1F1J0ryJ5&lang=zh
+// 山顶营炮台：https://www.4dkankan.com/spc.html?m=SS-v1F1J0ryJ5&lang=zh
 // 蛇头湾炮台：https://www.4dkankan.com/spc.html?m=SS-3yiIoMBSnw&app&lang=zh
-// 临高台旧址：https://www.4dkankan.com/spg.html?m=SS-eSOtvcwXXu0&lang=zh
-// 虎门寨墙：https://www.4dkankan.com/spg.html?m=SS-SyyOlkOmrAW&lang=zh
+// 沙角炮台：https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh
+// 虎门墙寨：https://www.4dkankan.com/spg.html?m=SS-SyyOlkOmrAW&lang=zh
 
 
 export const pcIframeObj = {
-  //海战馆
+  //海战博物馆
   1: "1426",
   // 虎门故事陈列
   2: "1430",
@@ -33,8 +33,8 @@ export const pcIframeObj = {
   7: "https://4dscene.4dage.com/culturalrelics/YPZZBWG_TRI/Model2.html?m=ypz01",
   8: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-208",
   9: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-207",
-  10: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-207",
-  11: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-207",
-  12: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-207",
-  13: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-207",
+  10: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-203",
+  11: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-205",
+  12: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-206",
+  13: "https://4dscene.4dage.com/culturalrelics/YPZZ-PT/Model2.html?m=ypzz4-201",
 };

pc/src/pages/A0Map/data.ts

@@ -15,6 +15,7 @@ export type MapType = {
   id: number;
   imgId: number;
   name: string;
+  name2?:string
   x: string;
   y: string;
   ind: number;
@@ -27,8 +28,9 @@ export const mapData1: MapType[] = [
     id: 2,
     imgId: 2,
     name: "鸦片战争博物馆",
-    x: "31.2%",
-    y: "4%",
+    name2:'虎门林则徐纪念馆',
+    x: "33%",
+    y: "5%",
     ind: 22,
     filename: "S1",
     // son 暂时 无用
@@ -45,7 +47,7 @@ export const mapData1: MapType[] = [
       },
       {
         id: 2.2,
-        name: "鸦片战争博物馆",
+        name: "鸦片战争博物馆（虎门林则徐纪念馆）",
         x: "9%",
         y: "30%",
         b: "auto",
@@ -58,16 +60,16 @@ export const mapData1: MapType[] = [
   {
     id: 3,
     imgId: 3,
-    name: "海战馆",
-    x: "18.5%",
-    y: "39.5%",
+    name: "海战博物馆",
+    x: "17%",
+    y: "40%",
     ind: 22,
     filename: "S2",
     // son 暂时 无用
     son: [
       {
         id: 2.1,
-        name: "海战馆",
+        name: "海战博物馆",
         x: "39.4%",
         y: "10%",
         b: "auto",
@@ -82,19 +84,19 @@ export const mapData1: MapType[] = [
 export const maoData2 = [
   {
     id: 4,
-    name: "镇远炮台旧址",
-    x: "5.8%",
-    y: "43.4%",
+    name: "镇远炮台",
+    x: "6%",
+    y: "42.2%",
     b: "auto",
     r: "auto",
-    ind: 21,
+    ind: 22,
     type: "left",
     link: "https://www.4dkankan.com/spc.html?m=SS-HWGdXUwTz7&lang=zh",
   },
   {
     id: 5,
-    name: "靖远炮台旧址",
-    x: "9.5%",
+    name: "靖远炮台",
+    x: "10%",
     y: "42.8%",
     b: "auto",
     r: "auto",
@@ -105,9 +107,9 @@ export const maoData2 = [
   },
   {
     id: 6,
-    name: "南山顶炮台旧址",
-    x: "12%",
-    y: "37%",
+    name: "山顶营炮台",
+    x: "10%",
+    y: "36%",
     b: "auto",
     r: "auto",
     ind: 21,
@@ -118,8 +120,8 @@ export const maoData2 = [
   {
     id: 7,
     name: "威远炮台旧址",
-    x: "14.3%",
-    y: "43.9%",
+    x: "11.5%",
+    y: "46.5%",
     b: "auto",
     r: "auto",
     ind: 21,
@@ -128,8 +130,8 @@ export const maoData2 = [
   },
   {
     id: 8,
-    name: "蛇头湾炮台旧址",
-    x: "3.5%",
+    name: "蛇头湾炮台",
+    x: "5%",
     y: "40.2%",
     b: "auto",
     r: "auto",
@@ -139,26 +141,26 @@ export const maoData2 = [
   },
   {
     id: 9,
-    name: "临高台旧址",
+    name: "沙角炮台",
     x: "auto",
     y: "auto",
-    b: "13.8%",
-    r: "27.3%",
-    ind: 21,
+    b: "19.5%",
+    r: "27.8%",
+    ind: 22,
     type: "right",
-    link: "https://www.4dkankan.com/spg.html?m=SS-eSOtvcwXXu0&lang=zh",
+    link: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
     loc: "顶部",
   },
   {
     id: 10,
-    name: "濒海台旧址",
+    name: "节兵义坟",
     x: "auto",
     y: "auto",
-    b: "12%",
-    r: "26.7%",
+    b: "17%",
+    r: "28%",
     ind: 21,
     type: "right",
-    link: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
+    link: "https://laser.4dkankan.com/index.html?m=SS-twDivJV13k#",
     loc: "顶部",
   },
   {
@@ -166,8 +168,8 @@ export const maoData2 = [
     name: "捕鱼台旧址",
     x: "auto",
     y: "auto",
-    b: "2.5%",
-    r: "15%",
+    b: "9.5%",
+    r: "26.2%",
     ind: 21,
     type: "right",
     link: "https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh",
@@ -176,8 +178,8 @@ export const maoData2 = [
   {
     id: 12,
     name: "定洋炮台旧址",
-    x: "50%",
-    y: "40.5%",
+    x: "48.1%",
+    y: "41.5%",
     b: "auto",
     r: "auto",
     ind: 21,
@@ -186,9 +188,9 @@ export const maoData2 = [
   },
   {
     id: 13,
-    name: "虎门寨墙",
-    x: "41.5%",
-    y: "8%",
+    name: "虎门墙寨",
+    x: "35.4%",
+    y: "5.8%",
     b: "auto",
     r: "auto",
     ind: 21,

pc/src/pages/A0Map/index.module.scss

@@ -105,6 +105,7 @@
             background-color: rgba(255, 233, 175, 0.6);
             backdrop-filter: blur(4px);
             border-radius: 0 6px 0 6px;
+            display: flex;
 
             .hoverShowBox1 {
               width: 30px;
@@ -119,6 +120,10 @@
               line-height: 16px;
             }
 
+            .hoverShowBox1Long {
+              margin-left: -8px;
+            }
+
             .hoverShowBox2 {
               width: calc(100% - 34px);
               height: 100%;
@@ -155,14 +160,27 @@
           .hoverShowBox {
             display: block;
 
-            .hoverShowBoxM {
+            // .hoverShowBoxM {
 
-              display: flex;
-            }
+            //   display: flex;
+            // }
           }
         }
       }
 
+      .A0iconBoxLong {
+        .txtBox {
+          left: -14px;
+
+          .A0iconBoxLongTxt {
+            position: absolute;
+            top: 20px;
+            right: -36px;
+          }
+        }
+
+      }
+
       // 小图标
       .A0iconSmBox {
         cursor: pointer;
@@ -196,7 +214,7 @@
         .ic2txtBox5 {
           top: auto;
           left: -5px;
-          bottom: -150px;
+          bottom: -105px;
         }
 
         .ic2txtBox6 {
@@ -205,14 +223,18 @@
           bottom: 40px;
         }
 
+        .ic2txtBox7 {
+          left: 6px;
+        }
+
         .ic2txtBox8 {
-          left: -15px;
+          left: -26px;
         }
 
         .ic2txtBox9 {
           top: auto;
-          left: -30px;
-          bottom: -120px;
+          left: -40px;
+          bottom: -95px;
         }
 
         .ic2txtBox10 {
@@ -222,6 +244,7 @@
         }
 
         .ic2txtBox11 {
+          left: 5px;
           top: auto;
           bottom: 40px;
         }
@@ -233,7 +256,7 @@
           pointer-events: none;
           position: fixed;
           bottom: 320px;
-          left: 330px;
+          left: 20%;
           z-index: 30;
           width: 180px;
           height: 140px;
@@ -269,19 +292,19 @@
 
         .ic2HoverBoxright {
           left: auto;
-          right: 600px;
+          right: 32%;
           bottom: 60px;
         }
 
         .ic2HoverBoxcenter {
           left: auto;
-          left: 750px;
+          left: 38%;
           top: 400px;
         }
 
         .ic2HoverBoxtop {
           top: 80px;
-          left: 45%;
+          left: 38%;
           bottom: auto;
           right: auto
         }
@@ -328,6 +351,7 @@
           display: block;
         }
       }
+
     }
 
     .mapMain3 {

pc/src/pages/A0Map/index.tsx

@@ -53,7 +53,10 @@ function A0Map({ type, sonChaneType }: Props) {
               sonChaneType(2);
             }}
             key={v.id}
-            className="A0iconBox"
+            className={classNames(
+              "A0iconBox",
+              v.id === 2 ? "A0iconBoxLong" : ""
+            )}
             style={{ top: v.y, left: v.x, zIndex: v.ind }}
           >
             <div className="iconNum">{index + 1}</div>
@@ -69,12 +72,16 @@ function A0Map({ type, sonChaneType }: Props) {
               }
             >
               <div>{v.name}</div>
+              {v.name2? (
+                <div className="A0iconBoxLongTxt">{v.name2}</div>
+              ) : null}
             </div>
 
             {/* 悬停出来的图片和名称 */}
             <div className="hoverShowBox">
               <div className="hoverShowBoxM">
                 <div className="hoverShowBox1">{v.name}</div>
+                {v.name2?<div className="hoverShowBox1 hoverShowBox1Long">{v.name2}</div>:null}
                 <div className="hoverShowBox2">
                   <img src={`${envUrl}/map/icon/${v.id}.jpg`} alt="" />
                 </div>

pc/src/pages/App/MainM/Tab1/ImgLook/data.ts

@@ -20,7 +20,7 @@ export const tab1IObj = {
   3: [
     {
       id: 3,
-      name: "海战馆",
+      name: "海战博物馆",
       code: '1426',
       top: "17%",
       left: "auto",

pc/src/pages/App/MainM/Tab1/ImgLook/index.tsx

@@ -22,7 +22,7 @@ function ImgLook({ closeFu, imgId }: Props) {
 
   useEffect(() => {
     if (imgId === 3) {
-      // 海战馆，默认移动到中间
+      // 海战博物馆，默认移动到中间
       const dom = document.querySelector("#ImgLook") as HTMLDivElement;
 
       const imgDom = document.querySelector("#tab1ImgId") as HTMLImageElement;

pc/src/pages/App/MainM/Tab1/data.ts

@@ -2,13 +2,14 @@ export const appTab1Loc1 = [
   {
     // 这里的id从2开始，之前已经有图片加载的id为1了
     id: 2,
-    name: "鸦片战争博物馆",
+    name: "鸦片战争博物馆（虎门林则徐纪念馆）",
+    name2:'虎门林则徐纪念馆',
     top: "5%",
     left: "28.5%",
   },
   {
     id: 3,
-    name: "海战馆",
+    name: "海战博物馆",
     top: "35%",
     left: "15.5%",
   },
@@ -17,7 +18,7 @@ export const appTab1Loc1 = [
 export const appTab1Loc2 = [
   {
     id: 4,
-    name: "镇远炮台旧址",
+    name: "镇远炮台",
     top: "38%",
     left: "4.5%",
     right: "auto",
@@ -26,7 +27,7 @@ export const appTab1Loc2 = [
   },
   {
     id: 5,
-    name: "靖远炮台旧址",
+    name: "靖远炮台",
     top: "40%",
     left: "7.5%",
     right: "auto",
@@ -35,7 +36,7 @@ export const appTab1Loc2 = [
   },
   {
     id: 6,
-    name: "南山顶炮台旧址",
+    name: "山顶营炮台",
     top: "35%",
     left: "9%",
     right: "auto",
@@ -54,7 +55,7 @@ export const appTab1Loc2 = [
   },
   {
     id: 8,
-    name: "蛇头湾炮台旧址",
+    name: "蛇头湾炮台",
     top: "36%",
     left: "2%",
     right: "auto",
@@ -64,23 +65,23 @@ export const appTab1Loc2 = [
 
   {
     id: 9,
-    name: "临高台旧址",
+    name: "沙角炮台",
     top: "auto",
     left: "auto",
     right: "29%",
     bottom: "22%",
-    code: "https://www.4dkankan.com/spg.html?m=SS-eSOtvcwXXu0&lang=zh",
+    code: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
     sonLeft: "-30px",
     loc: "顶部",
   },
   {
     id: 10,
-    name: "濒海台旧址",
+    name: "节兵义坟",
     top: "auto",
     left: "auto",
     right: "28%",
     bottom: "20%",
-    code: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
+    code: "https://laser.4dkankan.com/index.html?m=SS-twDivJV13k#",
     sonLeft: "20px",
     loc: "顶部",
   },
@@ -105,7 +106,7 @@ export const appTab1Loc2 = [
   },
   {
     id: 13,
-    name: "虎门寨墙",
+    name: "虎门墙寨",
     top: "8%",
     left: "39%",
     right: "auto",