浏览代码

修改一个build的路径和配置

shaogen1995 1 年之前
父节点
当前提交
327e14a504

code/src/pages/B1CardM/swiperCard/swiper-bundle.min.css → code/public/SwiperCard/swiper-bundle.min.css


code/src/pages/B1CardM/swiperCard/swiper-bundle.min.js → code/public/SwiperCard/swiper-bundle.min.js


+ 4 - 1
code/public/index.html

@@ -9,9 +9,12 @@
   <meta name="description" content="Web site created using create-react-app" />
   <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
+  <!-- 卡片轮播图,因为版本问题,在这里直接引入 -->
+  <script src="./SwiperCard/swiper-bundle.min.js"></script>
+  <link rel="stylesheet" href="./SwiperCard/swiper-bundle.min.css">
 
   <script src="http://127.0.0.1:8080/staticData/dataTemp.js"></script>
-  <script src="./web/staticData/dataTemp.js"></script>
+  <script src="./staticData/dataTemp.js"></script>
   <script src="%PUBLIC_URL%/krpano.js"></script>
 
   <!--

+ 3 - 3
code/src/components/ArcOrBuildInfo/index.tsx

@@ -2,7 +2,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import styles from "./index.module.scss";
 import { baseUrl } from "@/index";
-import history from "@/utils/history";
+import history, { modelUrl } from "@/utils/history";
 import classNames from "classnames";
 import { InfoRowType } from "@/types";
 
@@ -88,7 +88,7 @@ function ArcOrBuildInfo({ info, type }: Props) {
       >
         <iframe
           ref={ifrRefNew}
-          src={`/model.html?m=${info.id}&n=new&r=${type}`}
+          src={`${modelUrl}model.html?m=${info.id}&n=new&r=${type}`}
           frameBorder="0"
         ></iframe>
         {/* 进入室内按钮 */}
@@ -162,7 +162,7 @@ function ArcOrBuildInfo({ info, type }: Props) {
                 {/* 模型或者图片 */}
                 {info.isOld.type === "model" ? (
                   <iframe
-                    src={`/model.html?m=${info.id}&n=old&r=${type}`}
+                    src={`${modelUrl}/model.html?m=${info.id}&n=old&r=${type}`}
                     frameBorder="0"
                   ></iframe>
                 ) : (

+ 2 - 2
code/src/components/ArcOrBuildInfoM/index.tsx

@@ -4,7 +4,7 @@ import React, { useMemo, useRef, useState } from "react";
 import styles from "./index.module.scss";
 import { baseUrl } from "@/index";
 import { InfoRowType } from "@/types";
-import history from "@/utils/history";
+import history, { modelUrl } from "@/utils/history";
 import { SwapRightOutlined } from "@ant-design/icons";
 import classNames from "classnames";
 
@@ -74,7 +74,7 @@ function ArcOrBuildInfoM({ info, type }: Props) {
         {/* 模型 */}
         <iframe
           ref={ifrRefNew}
-          src={`/model.html?m=${info.id}&n=new&r=${type}`}
+          src={`${modelUrl}model.html?m=${info.id}&n=new&r=${type}`}
           frameBorder="0"
         ></iframe>
         {/* 右侧按钮 */}

+ 0 - 2
code/src/index.tsx

@@ -22,11 +22,9 @@ const container = document.getElementById("root") as HTMLElement;
 const root = createRoot(container);
 
 // 静态资源地址
-// @ts-ignore
 export const baseUrl = baseUrlTemp;
 
 // 数据存到仓库
-// @ts-ignore
 store.dispatch({ type: "layout/setDataAll", payload: staticDataTemp });
 
 if (isMobileFu()) {

+ 0 - 3
code/src/pages/B1CardM/index.tsx

@@ -7,9 +7,6 @@ import classNames from "classnames";
 import btnImg from "@/assets/img/tab2/btn_m.png";
 import { SwapRightOutlined } from "@ant-design/icons";
 
-import Swiper from "./swiperCard/swiper-bundle.min.js";
-import "./swiperCard/swiper-bundle.min.css";
-
 type Props = {
   closeFu: () => void;
   clickCardFu: (id: number) => void;

+ 0 - 2
code/src/pages/C1ArchitecM/index.tsx

@@ -14,8 +14,6 @@ import classNames from "classnames";
 import upimg from "@/assets/img/tab3/icon_up.png";
 import downimg from "@/assets/img/tab3/icon_down.png";
 
-import Swiper from "../B1CardM/swiperCard/swiper-bundle.min.js";
-import "../B1CardM/swiperCard/swiper-bundle.min.css";
 import history from "@/utils/history";
 import { InfoRowType } from "@/types";
 

+ 6 - 1
code/src/types/declaration.d.ts

@@ -5,4 +5,9 @@ declare module "*.jpg";
 declare module "*.gif";
 declare module "*.svg";
 declare module "js-export-excel";
-declare module 'braft-utils';
+declare module "braft-utils";
+
+// 一些在pubilc/index里面直接定义的数据类型声明
+declare const baseUrlTemp: string;
+declare const staticDataTemp: DataAllType;
+declare const Swiper: any;

+ 4 - 0
code/src/utils/history.ts

@@ -30,3 +30,7 @@ export const isMobileFu = () => {
 // 当前环境是测试环境还是生产环境
 export const isEnvUrl =
   process.env.NODE_ENV === "development" ? "https://sit-kpbwg.4dage.com" : "";
+
+// 模型加载的地址
+
+export const modelUrl = process.env.NODE_ENV === "development" ? "/web/" : "/";