Bläddra i källkod

feat: 增加 gis目录

zhangys36 2 år sedan
förälder
incheckning
5f77cf30ee

+ 33 - 34
public/geminiRender/render_dxf_project.html

@@ -86,12 +86,12 @@
   <!--  </div>-->
 </div>
 <script type="module">
-  import {DxfViewer, LocalDxfUploader, ToolbarMenuId} from "/geminiRender/libs/gemini-viewer.esm.min.js";
-  import DxfSettingsPanel from '/geminiRender/settings/DxfSettingsPanel.js';
-  import LayerManager from '/geminiRender/layerManager/LayerManager.js';
+  import { DxfViewer, LocalDxfUploader, ToolbarMenuId } from '/geminiRender/libs/gemini-viewer.esm.min.js'
+  import DxfSettingsPanel from '/geminiRender/settings/DxfSettingsPanel.js'
+  import LayerManager from '/geminiRender/layerManager/LayerManager.js'
 
   const config = {
-    containerId: "myCanvas",
+    containerId: 'myCanvas',
     enableAxisGizmo: true,
     enableToolbar: true,
     enableBottomBar: true,
@@ -101,47 +101,47 @@
     toolbarMenuConfig: {
       [ToolbarMenuId.Settings]: {
         onActive: () => {
-          console.log("[Toolbar]", "Activate Settings");
+          console.log('[Toolbar]', 'Activate Settings')
           if (!window.dxfSettingsPanel) {
-            window.dxfSettingsPanel = new DxfSettingsPanel(window.viewer);
+            window.dxfSettingsPanel = new DxfSettingsPanel(window.viewer)
           }
-          window.dxfSettingsPanel.show();
+          window.dxfSettingsPanel.show()
         },
         onDeactive: () => {
-          console.log("[Toolbar]", "Deactivate Settings");
+          console.log('[Toolbar]', 'Deactivate Settings')
           if (!window.dxfSettingsPanel) {
-            window.dxfSettingsPanel = new DxfSettingsPanel(window.viewer);
+            window.dxfSettingsPanel = new DxfSettingsPanel(window.viewer)
           }
-          window.dxfSettingsPanel.hide();
-        },
+          window.dxfSettingsPanel.hide()
+        }
       },
       [ToolbarMenuId.Layers]: {
         onActive: () => {
-          console.log("[Toolbar]", "Activate Layers");
+          console.log('[Toolbar]', 'Activate Layers')
           if (!window.layerManager) {
-            window.layerManager = new LayerManager(window.viewer);
+            window.layerManager = new LayerManager(window.viewer)
           }
-          window.layerManager.show();
+          window.layerManager.show()
         },
         onDeactive: () => {
-          console.log("[Toolbar]", "Deactivate Layers");
+          console.log('[Toolbar]', 'Deactivate Layers')
           if (!window.layerManager) {
-            window.layerManager = new LayerManager(window.viewer);
+            window.layerManager = new LayerManager(window.viewer)
           }
-          window.layerManager.hide();
-        },
-      },
-    },
-  };
-  const viewer = new DxfViewer(config);
-  // const fontFiles = ["three/fonts/Microsoft_YaHei_Regular.typeface.json"];
-  const fontFiles = ["/geminiRender/three/fonts/hztxt.shx", "/geminiRender/three/fonts/simplex.shx"];
-  await viewer.setFont(fontFiles);
-  window.viewer = viewer;
-
-  const modelUploader = new LocalDxfUploader(viewer);
+          window.layerManager.hide()
+        }
+      }
+    }
+  }
+  const viewer = new DxfViewer(config)
+  const fontFiles = ['/geminiRender/three/fonts/FangSong_GB2312_Regular.json','/geminiRender/three/fonts/simplex.shx']
+  // const fontFiles = ["/geminiRender/three/fonts/Hztxt31.shx","/geminiRender/three/fonts/Hztxt31.shx","/geminiRender/three/fonts/simplex.shx"];
+  await viewer.setFont(fontFiles)
+  window.viewer = viewer
+
+  const modelUploader = new LocalDxfUploader(viewer)
   modelUploader.onSuccess = () => {
-    !viewer.layerManager && (viewer.layerManager = new LayerManager(viewer));
+    !viewer.layerManager && (viewer.layerManager = new LayerManager(viewer))
   }
   // document.getElementById("uploadModelFile").onclick = function () {
   //   modelUploader.openFileBrowserToUpload();
@@ -157,7 +157,7 @@
   // }
 
   // as a demo page, add dxfSettingsPanel to window!
-  window.dxfSettingsPanel = new DxfSettingsPanel(viewer);
+  window.dxfSettingsPanel = new DxfSettingsPanel(viewer)
 
   function getUrlParams(url) {
     const urlSearchParams = new URLSearchParams(url)
@@ -167,7 +167,6 @@
 
   window.onload = () => {
 
-    debugger
     const path = getUrlParams(window.location.search)['path']
     console.log('path', path)
 
@@ -175,9 +174,9 @@
   (function render() {
     const path = getUrlParams(window.location.search)['path']
     console.log('path', path)
-    viewer.loadModelAsync({src: path, merge: true}).then(() => {
-      console.log(`[Demo] Loaded model ${path}`);
-      !viewer.layerManager && (viewer.layerManager = new LayerManager(viewer));
+    viewer.loadModelAsync({ src: path, merge: true }).then(() => {
+      console.log(`[Demo] Loaded model ${path}`)
+      !viewer.layerManager && (viewer.layerManager = new LayerManager(viewer))
     })
   }())
 

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
public/geminiRender/three/fonts/ChangFangSong_Regular.json


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
public/geminiRender/three/fonts/FangSong_GB2312_Regular.json


BIN
public/geminiRender/three/fonts/hztxt.shx


BIN
public/geminiRender/three/fonts/simplex.shx


+ 14 - 7
public/static/config.json

@@ -277,30 +277,37 @@
   },
   {
     "名称": "铁岭西",
-    "文件路径": "/工区DXF/01铁岭西运行工区.dwg-2023-03-06-14-49-30-716.dxf"
+    "文件路径": "/工区DXF/01铁岭西运行工区.dwg-2023-03-06-14-49-30-716.dxf",
+    "所亭路径": "/工区所亭DXF/01铁岭西运行工区.dwg-2023-03-11-00-00-13-458.dxf"
   },
   {
     "名称": "四平东",
-    "文件路径": "/工区DXF/02四平东运行工区.dwg-2023-03-06-14-49-30-722.dxf"
+    "文件路径": "/工区DXF/02四平东运行工区.dwg-2023-03-06-14-49-30-722.dxf",
+    "所亭路径": "/工区所亭DXF/02四平东运行工区.dwg-2023-03-11-00-00-13-458.dxf"
   },
   {
     "名称": "长春",
-    "文件路径": "/工区DXF/03长春运行工区.dwg-2023-03-06-14-49-30-726.dxf"
+    "文件路径": "/工区DXF/03长春运行工区.dwg-2023-03-06-14-49-30-726.dxf",
+    "所亭路径": "/工区所亭DXF/03长春运行工区.dwg-2023-03-11-00-00-13-464.dxf"
   },
   {
     "名称": "德惠西",
-    "文件路径": "/工区DXF/04德惠西运行工区.dwg-2023-03-06-14-49-30-729.dxf"
+    "文件路径": "/工区DXF/04德惠西运行工区.dwg-2023-03-06-14-49-30-729.dxf",
+    "所亭路径": "/工区所亭DXF/04德惠西运行工区.dwg-2023-03-11-00-00-13-464.dxf"
   },
   {
     "名称": "吉林",
-    "文件路径": "/工区DXF/05吉林运行工区-简洁版.dwg-2023-03-07-10-33-48-203.dxf"
+    "文件路径": "/工区DXF/05吉林运行工区-简洁版.dwg-2023-03-07-10-33-48-203.dxf",
+    "所亭路径": "/工区所亭DXF/05吉林运行工区.dwg-2023-03-11-00-00-13-464.dxf"
   },
   {
     "名称": "长白山",
-    "文件路径": "/工区DXF/06长白山运行工区-简洁版.dwg-2023-03-10-23-56-18-700.dxf"
+    "文件路径": "/工区DXF/06长白山运行工区-简洁版.dwg-2023-03-10-23-56-18-700.dxf",
+    "所亭路径": "/工区所亭DXF/06长白山运行工区.dwg-2023-03-11-00-00-13-464.dxf"
   },
   {
     "名称": "延吉西",
-    "文件路径": "/工区DXF/07延吉西运行工区-简洁版.dwg-2023-03-08-09-45-50-252.dxf"
+    "文件路径": "/工区DXF/07延吉西运行工区-简洁版.dwg-2023-03-08-09-45-50-252.dxf",
+    "所亭路径": "/工区所亭DXF/07延吉西运行工区.dwg-2023-03-11-00-00-13-480.dxf"
   }
 ]

Vissa filer visades inte eftersom för många filer har ändrats