upp

houtai/src/pages/B1Scene/index.tsx

@@ -1,6 +1,5 @@
-import React, { useCallback, useEffect, useMemo } from "react";
+import React, { useCallback, useEffect } from "react";
 import styles from "./index.module.scss";
-import demoImg from "@/assets/img/demo.jpg";
 import { Button } from "antd";
 import ImageLazy from "@/components/ImageLazy";
 import { isTokenFlagAPI } from "@/store/action/login";

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

@@ -1,11 +1,31 @@
-// 待完善-地址
+// -----大场景
+// 虎门销烟陈列：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=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://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-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
+
+
 export const pcIframeObj = {
   //海战馆
-  1: "1194",
+  1: "1426",
   // 虎门销烟陈列
-  2: "1194",
+  2: "1429",
   // 虎门故事陈列
-  3: "1194",
+  3: "1430",
   // 其他模型
   4: "https://4dscene.4dage.com/culturalrelics/YPZZBWG_TRI/Model2.html?m=ypz25",
   5: "https://4dscene.4dage.com/culturalrelics/YPZZBWG_TRI/Model2.html?m=ypz29",

pc/src/pages/A0Map/data.ts

@@ -13,7 +13,7 @@ export type TabType = {
 
 export type MapType = {
   id: number;
-  imgId:number
+  imgId: number;
   name: string;
   x: string;
   y: string;
@@ -22,17 +22,16 @@ export type MapType = {
   son: TabType[];
 };
 
-// 待完善-link
-
 export const mapData1: MapType[] = [
   {
     id: 2,
-    imgId:2,
+    imgId: 2,
     name: "鸦片战争博物馆",
     x: "31.2%",
     y: "4%",
     ind: 22,
     filename: "S1",
+    // son 暂时 无用
     son: [
       {
         id: 2.1,
@@ -58,12 +57,13 @@ export const mapData1: MapType[] = [
   },
   {
     id: 3,
-    imgId:3,
+    imgId: 3,
     name: "海战馆",
     x: "18.5%",
     y: "39.5%",
     ind: 22,
     filename: "S2",
+    // son 暂时 无用
     son: [
       {
         id: 2.1,
@@ -89,7 +89,7 @@ export const maoData2 = [
     r: "auto",
     ind: 21,
     type: "left",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spc.html?m=SS-HWGdXUwTz7&lang=zh",
   },
   {
     id: 5,
@@ -100,7 +100,7 @@ export const maoData2 = [
     r: "auto",
     ind: 21,
     type: "left",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spc.html?m=SS-kI3GS3HAfe&lang=zh",
     loc: "顶部",
   },
   {
@@ -112,7 +112,7 @@ export const maoData2 = [
     r: "auto",
     ind: 21,
     type: "left",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spc.html?m=SS-v1F1J0ryJ5&lang=zh",
     loc: "顶部",
   },
   {
@@ -124,7 +124,7 @@ export const maoData2 = [
     r: "auto",
     ind: 21,
     type: "left",
-    link: "https://laser.4dkankan.com/index.html?m=SS-w1y1zhoOa0&lang=zh#/",
+    link: "https://www.4dkankan.com/spc.html?m=SS-w1y1zhoOa0&lang=zh",
   },
   {
     id: 8,
@@ -135,18 +135,7 @@ export const maoData2 = [
     r: "auto",
     ind: 21,
     type: "left",
-    link: "/scene/?m=1194",
-  },
-  {
-    id: 12,
-    name: "定洋炮台旧址",
-    x: "50%",
-    y: "40.5%",
-    b: "auto",
-    r: "auto",
-    ind: 21,
-    type: "center",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spc.html?m=SS-3yiIoMBSnw&app&lang=zh",
   },
   {
     id: 9,
@@ -157,7 +146,7 @@ export const maoData2 = [
     r: "27.3%",
     ind: 21,
     type: "right",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spg.html?m=SS-eSOtvcwXXu0&lang=zh",
     loc: "顶部",
   },
   {
@@ -169,7 +158,7 @@ export const maoData2 = [
     r: "26.7%",
     ind: 21,
     type: "right",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
     loc: "顶部",
   },
   {
@@ -181,9 +170,32 @@ export const maoData2 = [
     r: "15%",
     ind: 21,
     type: "right",
-    link: "/scene/?m=1194",
+    link: "https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh",
     loc: "顶部",
   },
+  {
+    id: 12,
+    name: "定洋炮台旧址",
+    x: "50%",
+    y: "40.5%",
+    b: "auto",
+    r: "auto",
+    ind: 21,
+    type: "center",
+    link: "https://www.4dkankan.com/spg.html?m=SS-suYJyuqvS4z&lang=zh",
+  },
+  {
+    id: 13,
+    name: "虎门寨墙",
+    x: "41.5%",
+    y: "8%",
+    b: "auto",
+    r: "auto",
+    ind: 21,
+    type: "top",
+    link: "https://www.4dkankan.com/spg.html?m=SS-SyyOlkOmrAW&lang=zh",
+    imgType:'inco3'
+  },
 ];
 
 // 设置图片加载完成的仓库数据

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

@@ -193,30 +193,35 @@
           display: none;
         }
 
-        .ic2txtBox5{
+        .ic2txtBox5 {
           top: auto;
           left: -5px;
           bottom: -150px;
         }
+
         .ic2txtBox6 {
           top: auto;
           left: -4px;
           bottom: 40px;
         }
+
         .ic2txtBox8 {
           left: -15px;
         }
-        .ic2txtBox9{
+
+        .ic2txtBox9 {
           top: auto;
           left: -30px;
           bottom: -120px;
         }
-        .ic2txtBox10{
+
+        .ic2txtBox10 {
           top: auto;
           bottom: 60px;
           left: 0px;
         }
-        .ic2txtBox11{
+
+        .ic2txtBox11 {
           top: auto;
           bottom: 40px;
         }
@@ -262,17 +267,25 @@
           }
         }
 
-        .ic2HoverBox2 {
+        .ic2HoverBoxright {
           left: auto;
           right: 600px;
           bottom: 60px;
         }
-        .ic2HoverBox3 {
+
+        .ic2HoverBoxcenter {
           left: auto;
           left: 750px;
           top: 400px;
         }
 
+        .ic2HoverBoxtop {
+          top: 80px;
+          left: 45%;
+          bottom: auto;
+          right: auto
+        }
+
         &:hover {
           .ic2Img1 {
             display: none;

pc/src/pages/A0Map/index.tsx

@@ -7,6 +7,8 @@ import iconImg1 from "@/assets/img/map/icon1.png";
 import iconImg1Ac from "@/assets/img/map/icon1Ac.png";
 import iconImg2 from "@/assets/img/map/icon2.png";
 import iconImg2Ac from "@/assets/img/map/icon2Ac.png";
+import iconImg3 from "@/assets/img/map/icon3.png";
+import iconImg3Ac from "@/assets/img/map/icon3Ac.png";
 import ImgLoding from "@/components/ImgLoding";
 import { baseURL } from "@/utils/http";
 import MapSon from "./MapSon";
@@ -103,8 +105,16 @@ function A0Map({ type, sonChaneType }: Props) {
               zIndex: v.ind,
             }}
           >
-            <img className="ic2Img1" src={iconImg2} alt="" />
-            <img className="ic2Img2" src={iconImg2Ac} alt="" />
+            <img
+              className="ic2Img1"
+              src={v.imgType ? iconImg3 : iconImg2}
+              alt=""
+            />
+            <img
+              className="ic2Img2"
+              src={v.imgType ? iconImg3Ac : iconImg2Ac}
+              alt=""
+            />
 
             {/* 文字标题 */}
             <div className={classNames("ic2txtBox", `ic2txtBox${v.id}`)}>
@@ -112,16 +122,7 @@ function A0Map({ type, sonChaneType }: Props) {
             </div>
 
             {/* 悬停出来的图片和名称 */}
-            <div
-              className={classNames(
-                "ic2HoverBox",
-                v.type === "right"
-                  ? "ic2HoverBox2"
-                  : v.type === "center"
-                  ? "ic2HoverBox3"
-                  : ""
-              )}
-            >
+            <div className={classNames("ic2HoverBox", `ic2HoverBox${v.type}`)}>
               <div className="ic2HoverBoxll">{v.name}</div>
               <div className="ic2HoverBoxrr">
                 <img src={`${envUrl}/map/icon/${v.id}.jpg`} alt="" />

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

@@ -1,10 +1,9 @@
-// 待完善-code
 export const tab1IObj = {
   2: [
     {
       id: 1,
       name: "虎门销烟陈列",
-      code: '1194',
+      code: '1429',
       top: "17%",
       left: "12%",
       right: "auto",
@@ -12,7 +11,7 @@ export const tab1IObj = {
     {
       id: 2,
       name: "虎门故事陈列",
-      code: '1194',
+      code: '1430',
       top: "9%",
       left: "auto",
       right: "20%",
@@ -22,7 +21,7 @@ export const tab1IObj = {
     {
       id: 3,
       name: "海战馆",
-      code: '1194',
+      code: '1426',
       top: "17%",
       left: "auto",
       right: "-45%",

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

@@ -14,94 +14,104 @@ export const appTab1Loc1 = [
   },
 ];
 
-// 待完善-code
-
 export const appTab1Loc2 = [
   {
-    id: 1,
-    name: "蛇头湾炮台旧址",
-    top: "36%",
-    left: "2%",
-    right: "auto",
-    bottom: "auto",
-    code: '1194',
-  },
-  {
-    id: 2,
+    id: 4,
     name: "镇远炮台旧址",
     top: "38%",
     left: "4.5%",
     right: "auto",
     bottom: "auto",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-HWGdXUwTz7&lang=zh",
   },
   {
-    id: 3,
+    id: 5,
     name: "靖远炮台旧址",
     top: "40%",
     left: "7.5%",
     right: "auto",
     bottom: "auto",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-kI3GS3HAfe&lang=zh",
   },
   {
-    id: 4,
+    id: 6,
     name: "南山顶炮台旧址",
     top: "35%",
     left: "9%",
     right: "auto",
     bottom: "auto",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-v1F1J0ryJ5&lang=zh",
     loc: "顶部",
   },
   {
-    id: 5,
+    id: 7,
     name: "威远炮台旧址",
     top: "39%",
     left: "11%",
     right: "auto",
     bottom: "auto",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-w1y1zhoOa0&lang=zh",
   },
   {
-    id: 6,
-    name: "定洋炮台旧址",
+    id: 8,
+    name: "蛇头湾炮台旧址",
     top: "36%",
-    left: "47%",
+    left: "2%",
     right: "auto",
     bottom: "auto",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-3yiIoMBSnw&app&lang=zh",
   },
+
   {
-    id: 7,
+    id: 9,
     name: "临高台旧址",
     top: "auto",
     left: "auto",
     right: "29%",
     bottom: "22%",
-    code: '1194',
+    code: "https://www.4dkankan.com/spg.html?m=SS-eSOtvcwXXu0&lang=zh",
     sonLeft: "-30px",
     loc: "顶部",
   },
   {
-    id: 8,
+    id: 10,
     name: "濒海台旧址",
     top: "auto",
     left: "auto",
     right: "28%",
     bottom: "20%",
-    code: '1194',
+    code: "https://www.4dkankan.com/spc.html?m=SS-4gkCaRBt52&lang=zh",
     sonLeft: "20px",
     loc: "顶部",
   },
   {
-    id: 9,
+    id: 11,
     name: "捕鱼台旧址",
     top: "auto",
     left: "auto",
     right: "17%",
     bottom: "14%",
-    code: '1194',
+    code: "https://www.4dkankan.com/spg.html?m=SS-8DM80TR57iQ&lang=zh",
     loc: "顶部",
   },
+  {
+    id: 12,
+    name: "定洋炮台旧址",
+    top: "36%",
+    left: "47%",
+    right: "auto",
+    bottom: "auto",
+    code: "https://www.4dkankan.com/spg.html?m=SS-suYJyuqvS4z&lang=zh",
+  },
+  {
+    id: 13,
+    name: "虎门寨墙",
+    top: "8%",
+    left: "39%",
+    right: "auto",
+    bottom: "auto",
+    code: "https://www.4dkankan.com/spg.html?m=SS-SyyOlkOmrAW&lang=zh",
+    imgType: "inco3",
+    // loc: "顶部",
+  },
 ];

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

@@ -112,6 +112,9 @@
             height: 32px;
             background-image: url('../../../../assets/img/map/icon2.png');
           }
+          .tab1Loc1_1Inco3{
+            background-image: url('../../../../assets/img/map/icon3.png');
+          }
 
           .tab1Loc1_2 {
             top: 36px;
@@ -128,6 +131,9 @@
           .tab1Loc1_1 {
             background-image: url('../../../../assets/img/map/icon2Ac.png');
           }
+          .tab1Loc1_1Inco3{
+            background-image: url('../../../../assets/img/map/icon3Ac.png');
+          }
 
           .tab1Loc1_2 {
             opacity: 1;

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

@@ -100,7 +100,12 @@ function Tab1() {
                 acId === 3 ? "tab1Loc2Ac" : ""
               )}
             >
-              <div className="tab1Loc1_1"></div>
+              <div
+                className={classNames(
+                  "tab1Loc1_1",
+                  v.imgType === "inco3" ? "tab1Loc1_1Inco3" : ""
+                )}
+              ></div>
               <div
                 style={{ left: v.sonLeft ? v.sonLeft : "-1px" }}
                 className={classNames(

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

@@ -7,6 +7,7 @@ import { appTab1Loc2 } from "../Tab1/data";
 import ImageLazy from "@/components/ImageLazy";
 import { baseURL } from "@/utils/http";
 import Scene from "../Tab1/Scene";
+import { envUrl } from "@/utils/env";
 
 function Tab2() {
   // 切换 展陈 和 旧址
@@ -56,10 +57,14 @@ function Tab2() {
           <div className="tab2Row" key={v.id} onClick={() => setCode(v.code)}>
             <div className="tab2RowSon">
               <ImageLazy
-                // 图片直接放在测试服务器
-                src={`${baseURL}/backstage/sceneCover/${v.code}.jpg`}
+                // 图片直接放在测试服务器 //或者从本地拿
+                src={
+                  acId === 2
+                    ? `${baseURL}/backstage/sceneCover/${v.code}.jpg`
+                    : `${envUrl}/map/icon/${v.id}.jpg`
+                }
                 width="100%"
-                height='100%'
+                height="100%"
                 offline={true}
                 noLook={true}
               />