Просмотр исходного кода

feat: 更改深时模型查看编辑

bill 2 лет назад
Родитель
Сommit
fadfa791f6

+ 4 - 4
src/constant/scene.ts

@@ -13,9 +13,9 @@ export type ModelSceneType = SceneType.SWMX
 export const SceneTypeDesc: { [key in SceneType]: string }  = {
   [SceneType.SWKK]: '四维看看',
   [SceneType.SWKJ]: '四维看见',
-  [SceneType.SWSS]: '四维深时',
+  [SceneType.SWSS]: '四维深时点云场景',
+  [SceneType.SWSSMX]: '四维深时obj模型',
   [SceneType.SWMX]: '三维模型',
-  [SceneType.SWSSMX]: '四维深时模型'
   // [SceneType.QJKK]: '全景看看',
 }
 
@@ -24,7 +24,7 @@ export const SceneTypeDomain: { [key in SceneType]: string } = {
   [SceneType.SWKJ]: window.location.href,
   [SceneType.SWSS]: window.location.href,
   [SceneType.SWMX]: process.env.NODE_ENV === 'development' ? 'http://localhost:5173' : window.location.href,
-  [SceneType.SWSSMX]: process.env.NODE_ENV === 'development' ? 'http://localhost:5173' : window.location.href,
+  [SceneType.SWSSMX]: window.location.href
 }
 
 export const SceneTypePaths: { [key in SceneType]: string[] } = {
@@ -32,7 +32,7 @@ export const SceneTypePaths: { [key in SceneType]: string[] } = {
   [SceneType.SWKJ]: ['/swkk/spg.html', '/swkk/epg.html'],
   [SceneType.SWSS]: ['/swss/index.html', '/swss/index.html'],
   [SceneType.SWMX]: process.env.NODE_ENV === 'development' ? ['index.html', 'index.html'] : ['/code/index.html', '/code/index.html'],
-  [SceneType.SWSSMX]: process.env.NODE_ENV === 'development' ? ['index.html', 'index.html'] : ['/code/index.html', '/code/index.html'],
+  [SceneType.SWSSMX]: ['/swkk/spg.html', '/swkk/epg.html'],
 }
 
 

+ 1 - 1
src/store/scene.ts

@@ -105,7 +105,7 @@ export const getSceneLink = (scene: Scene, flag: SceneLinkFlag): URL => {
     const token = getToken()
     token && url.searchParams.append('token', token)
   }
-  if ([SceneType.SWMX, SceneType.SWSSMX].includes(scene.type)) {
+  if ([SceneType.SWMX].includes(scene.type)) {
     url.hash = '#sign-model'
     url.searchParams.append('share', '1')
   }

+ 2 - 8
src/views/scene/columns.tsx

@@ -81,7 +81,7 @@ export const getSceneActions = (scene: Scene, fource = false): ColumnAction[] =>
     return []
   } else {
     const query = { text: '查看', action: openSceneQueryPage.bind(null, scene) }
-    return [SceneType.SWMX, SceneType.SWSSMX].includes(scene.type)
+    return [SceneType.SWMX].includes(scene.type)
       ? [query]
       : [
           query,
@@ -105,6 +105,7 @@ export const getSceneColumns = (type: SceneType, actionColumn: SceneColumn = sce
     case SceneType.SWKJ:
     case SceneType.SWSS:
     case SceneType.SWKK:
+    case SceneType.SWSSMX:
       return [
         sceneTitleColumn,
         sceneSNcodeColumn,
@@ -112,13 +113,6 @@ export const getSceneColumns = (type: SceneType, actionColumn: SceneColumn = sce
         quoteSceneStatusColumn,
         actionColumn
       ] as SceneColumn<Scene>[]
-    case SceneType.SWSSMX:
-      return [
-        sceneTitleColumn,
-        sceneSNcodeColumn,
-        sceneTimeColumn,
-        quoteSceneStatusColumn
-      ] as SceneColumn<Scene>[]
     case SceneType.SWMX:
       return [
         modelSceneRawTypeColumn,

+ 1 - 1
src/views/scene/header.tsx

@@ -32,7 +32,7 @@ export const SceneHeader = memo(({ readonly, type, onSearch, onDataChange }: Lis
 
   const renderUpload = readonly || (type === SceneType.SWMX && (
     <Upload beforeUpload={onUpload} multiple={false} accept="application/zip">
-      <Popover content="请上传zip文件(支持obj/ply/las格式的数据),大小在1GB以内">
+      <Popover content="请上传zip文件(支持obj/ply/las/b3dm格式的数据),大小在1GB以内">
         <Button type="primary" children="上传数据" />
       </Popover>
     </Upload>

+ 7 - 2
src/views/scene/index.tsx

@@ -15,8 +15,13 @@ export const ScenePage = ({ TabContent = SceneTabContent }: ScenePageProps) => {
     SceneType.SWSS,
     str => Number(str) as SceneType
   )
-  const tabItems = Object.entries(SceneTypeDesc)
-    .map(([key, val]) => [Number(key) as SceneType, val] as const)
+  const tabItems = [
+    [SceneType.SWKK, SceneTypeDesc[SceneType.SWKK]],
+    [SceneType.SWKJ, SceneTypeDesc[SceneType.SWKJ]],
+    [SceneType.SWSS, SceneTypeDesc[SceneType.SWSS]],
+    [SceneType.SWSSMX, SceneTypeDesc[SceneType.SWSSMX]],
+    [SceneType.SWMX, SceneTypeDesc[SceneType.SWMX]],
+  ] as [SceneType, string][]
   
   return (
     <Tabs

+ 15 - 10
test/index.html

@@ -7,24 +7,29 @@
   <title>Document</title>
   <style>
     .test {
-      height: 10em;
-      text-align: center;
-    }
-    .test::before {
-      content: '';
+      position: relative;
       display: inline-block;
-      height: 100%;
-      /* vertical-align: middle; */
     }
-
     img {
-      vertical-align: middle;
+      margin: 0;
+      padding: 0;
+    }
+    h2 {
+      mix-blend-mode: screen;
+      color: #000;
+      background-color: rgba(255,255,255,.6);
+      text-align: center;
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      top: 0;
     }
   </style>
 </head>
 <body>
   <div class="test">
-    <img src="../public/favicon.ico" alt="">
+    <img src="https://4dkk.4dage.com/images/imagesSS-t-sd04dnbZ8i/tiles/4k/0_skybox2.jpg?x-oss-process=image/resize,h_512&time=20221031163357" alt="">
+    <h2>Hello word</h2>
   </div>
 </body>
 </html>