首頁 探索 說明
註冊 登入
shaogen1995
/
huangMaQiYi
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

upp

shaogen1995 1 年之前
父節點
e46032358b
當前提交
55af5a2438
共有 3 個文件被更改，包括 53 次插入 和 26 次删除
統一視圖 顯示文件統計
  1. 40 24
      public/index.html
  2. 12 1
      public/model.html
  3. 1 1
      src/pages/A3Goods/index.tsx

+ 40 - 24
public/index.html
查看文件 

@@ -1,25 +1,39 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="zh">
 
 <html lang="zh">
 
-  <head>
 
-    <meta charset="utf-8" />
 
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-    <meta name="theme-color" content="#000000" />
 
-    <meta
 
-      name="description"
 
-      content="Web site created using create-react-app"
 
-    />
 
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
-
 
-    <!-- 打包配置 -->
 
-    <script src="http://192.168.20.55:8080/data.js"></script>
 
-
 
-    <!--
 
+
 
+<head>
 
+  <meta charset="utf-8" />
 
+  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
 
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
 
+  <meta name="theme-color" content="#000000" />
 
+  <meta name="description" content="Web site created using create-react-app" />
 
+  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 
+
 
+  <script>
 
+    const scriptDom = document.createElement('script')
 
+
 
+    let src = ''
 
+
 
+    if (window.location.href.includes('localhost:')) {
 
+      // 本地环境
 
+      src = 'http://192.168.20.55:8080/data.js'
 
+    } else {
 
+      // 正式环境
 
+      src = './staticData/data.js'
 
+    }
 
+
 
+    scriptDom.src = src
 
+
 
+    document.querySelector('html').appendChild(scriptDom)
 
+
 
+  </script>
 
+
 
+  <!--
 
       manifest.json provides metadata used when your web app is installed on a
 
       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/
 
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
 
     -->
 
     -->
 
 
 
-    <!--
 
+  <!--
 
       Notice the use of %PUBLIC_URL% in the tags above.
 
       Notice the use of %PUBLIC_URL% in the tags above.
 
       It will be replaced with the URL of the `public` folder during the build.
 
       It will be replaced with the URL of the `public` folder during the build.
 
       Only files inside the `public` folder can be referenced from the HTML.
 
       Only files inside the `public` folder can be referenced from the HTML.
 
@@ -28,12 +42,13 @@
 
       work correctly both with client-side routing and a non-root public URL.
 
       work correctly both with client-side routing and a non-root public URL.
 
       Learn how to configure a non-root public URL by running `npm run build`.
 
       Learn how to configure a non-root public URL by running `npm run build`.
 
     -->
 
     -->
 
-    <title>黄麻起义红色基因库</title>
 
-  </head>
 
-  <body>
 
-    <noscript>You need to enable JavaScript to run this app.</noscript>
 
-    <div id="root"></div>
 
-    <!--
 
+  <title>黄麻起义红色基因库</title>
 
+</head>
 
+
 
+<body>
 
+  <noscript>You need to enable JavaScript to run this app.</noscript>
 
+  <div id="root"></div>
 
+  <!--
 
       This HTML file is a template.
 
       This HTML file is a template.
 
       If you open it directly in the browser, you will see an empty page.
 
       If you open it directly in the browser, you will see an empty page.
 
 
 
@@ -43,5 +58,6 @@
 
       To begin the development, run `npm start` or `yarn start`.
 
       To begin the development, run `npm start` or `yarn start`.
 
       To create a production bundle, use `npm run build` or `yarn build`.
 
       To create a production bundle, use `npm run build` or `yarn build`.
 
     -->
 
     -->
 
-  </body>
 
-</html>
 
+</body>
 
+
 
+</html>

+ 12 - 1
public/model.html
查看文件 

@@ -38,8 +38,19 @@
 
     window.autoRotate = true; // 是否自动旋转
 
     window.autoRotate = true; // 是否自动旋转
 
 
 
     // 打包配置
 
     // 打包配置
 
+
 
+    let src = ''
 
+
 
+    if (window.location.href.includes('localhost:')) {
 
+      // 本地环境
 
+      src = 'http://192.168.20.55:8080/'
 
+    } else {
 
+      // 正式环境
 
+      src = './staticData/'
 
+    }
 
+
 
     // fdage.embed( number, {
 
     // fdage.embed( number, {
 
-    fdage.embed(`http://192.168.20.55:8080/3Goods/${number}/main${num}.4dage`, {
 
+    fdage.embed(`${src}/3Goods/${number}/main${num}.4dage`, {
 
       transparentBackground: true,
 
       transparentBackground: true,
 
       width: 800,
 
       width: 800,
 
       height: 600,
 
       height: 600,

+ 1 - 1
src/pages/A3Goods/index.tsx
查看文件 

@@ -183,7 +183,7 @@ function A3Goods() {
 
               showQuickJumper
 
               showQuickJumper
 
               current={page}
 
               current={page}
 
               total={dataRes.total}
 
               total={dataRes.total}
 
-              pageSize={10}
 
+              pageSize={8}
 
               hideOnSinglePage={true}
 
               hideOnSinglePage={true}
 
               onChange={pageChangeFu}
 
               onChange={pageChangeFu}
 
               showSizeChanger={false}
 
               showSizeChanger={false}