upp

pc/src/pages/A0Map/data.ts

@@ -190,7 +190,7 @@ export const maoData2 = [
     id: 13,
     name: "虎门墙寨",
     x: "35.4%",
-    y: "5.8%",
+    y: "5.2%",
     b: "auto",
     r: "auto",
     ind: 21,

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

@@ -2,16 +2,16 @@ export const appTab1Loc1 = [
   {
     // 这里的id从2开始，之前已经有图片加载的id为1了
     id: 2,
-    name: "鸦片战争博物馆（虎门林则徐纪念馆）",
-    name2:'虎门林则徐纪念馆',
-    top: "5%",
-    left: "28.5%",
+    name: "鸦片战争博物馆",
+    name2: "虎门林则徐纪念馆",
+    top: "6.5%",
+    left: "30.5%",
   },
   {
     id: 3,
     name: "海战博物馆",
-    top: "35%",
-    left: "15.5%",
+    top: "36.3%",
+    left: "14.2%",
   },
 ];
 
@@ -20,16 +20,17 @@ export const appTab1Loc2 = [
     id: 4,
     name: "镇远炮台",
     top: "38%",
-    left: "4.5%",
+    left: "3.8%",
     right: "auto",
     bottom: "auto",
+
     code: "https://www.4dkankan.com/spc.html?m=SS-HWGdXUwTz7&lang=zh",
   },
   {
     id: 5,
     name: "靖远炮台",
     top: "40%",
-    left: "7.5%",
+    left: "7%",
     right: "auto",
     bottom: "auto",
     code: "https://www.4dkankan.com/spc.html?m=SS-kI3GS3HAfe&lang=zh",
@@ -37,8 +38,8 @@ export const appTab1Loc2 = [
   {
     id: 6,
     name: "山顶营炮台",
-    top: "35%",
-    left: "9%",
+    top: "34%",
+    left: "7%",
     right: "auto",
     bottom: "auto",
     code: "https://www.4dkankan.com/spc.html?m=SS-v1F1J0ryJ5&lang=zh",
@@ -47,8 +48,8 @@ export const appTab1Loc2 = [
   {
     id: 7,
     name: "威远炮台旧址",
-    top: "39%",
-    left: "11%",
+    top: "41%",
+    left: "9%",
     right: "auto",
     bottom: "auto",
     code: "https://www.4dkankan.com/spc.html?m=SS-w1y1zhoOa0&lang=zh",
@@ -57,9 +58,10 @@ export const appTab1Loc2 = [
     id: 8,
     name: "蛇头湾炮台",
     top: "36%",
-    left: "2%",
+    left: "2.8%",
     right: "auto",
     bottom: "auto",
+    loc: "顶部",
     code: "https://www.4dkankan.com/spc.html?m=SS-3yiIoMBSnw&app&lang=zh",
   },
 
@@ -68,38 +70,38 @@ export const appTab1Loc2 = [
     name: "沙角炮台",
     top: "auto",
     left: "auto",
-    right: "29%",
-    bottom: "22%",
-    code: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
-    sonLeft: "-30px",
+    right: "29.6%",
+    bottom: "29%",
     loc: "顶部",
+    code: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
   },
   {
     id: 10,
     name: "节兵义坟",
     top: "auto",
     left: "auto",
-    right: "28%",
-    bottom: "20%",
+    right: "30%",
+    bottom: "26%",
+    sonLeft: "-5px",
+    // loc: "顶部",
     code: "https://laser.4dkankan.com/index.html?m=SS-twDivJV13k#",
-    sonLeft: "20px",
-    loc: "顶部",
   },
   {
     id: 11,
     name: "捕鱼台旧址",
     top: "auto",
     left: "auto",
-    right: "17%",
-    bottom: "14%",
-    code: "https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh",
+    right: "28%",
+    bottom: "19%",
     loc: "顶部",
+    sonLeft: "10px",
+    code: "https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh",
   },
   {
     id: 12,
     name: "定洋炮台旧址",
-    top: "36%",
-    left: "47%",
+    top: "37%",
+    left: "45.6%",
     right: "auto",
     bottom: "auto",
     code: "https://www.4dkankan.com/spg.html?m=SS-suYJyuqvS4z&lang=zh",
@@ -107,8 +109,8 @@ export const appTab1Loc2 = [
   {
     id: 13,
     name: "虎门墙寨",
-    top: "8%",
-    left: "39%",
+    top: "6%",
+    left: "33%",
     right: "auto",
     bottom: "auto",
     code: "https://www.4dkankan.com/spg.html?m=SS-SyyOlkOmrAW&lang=zh",

pc/src/pages/App/MainM/Tab1/index.module.scss

@@ -106,6 +106,15 @@
           }
         }
 
+        .tab1Loc1Long{
+          .tab1Loc1_2{
+            left:-13px;
+          }
+          .tab1Loc1_2Long{
+            left: 20px;
+          }
+        }
+
         .tab1Loc2 {
           .tab1Loc1_1 {
             width: 26px;

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

@@ -74,12 +74,19 @@ function Tab1() {
           {appTab1Loc1.map((v, i) => (
             <div
               onClick={() => setUnityId(v.id)}
-              className={classNames("tab1Loc1", acId === 2 ? "tab1Loc1Ac" : "")}
+              className={classNames(
+                "tab1Loc1",
+                acId === 2 ? "tab1Loc1Ac" : "",
+                v.id === 2 ? "tab1Loc1Long" : ""
+              )}
               key={v.id}
               style={{ top: v.top, left: v.left }}
             >
               <div className="tab1Loc1_1">{i + 1}</div>
               <div className="tab1Loc1_2">{v.name}</div>
+              {v.name2 ? (
+                <div className="tab1Loc1_2 tab1Loc1_2Long">{v.name2}</div>
+              ) : null}
             </div>
           ))}