Browse Source

fix: 更新模型名称

bill 2 years ago
parent
commit
f143878034
5 changed files with 19 additions and 10 deletions
  1. 1 0
      src/api/constant.ts
  2. 10 3
      src/api/scene.ts
  3. 2 2
      src/model/app.vue
  4. 2 2
      src/model/platform.ts
  5. 4 3
      src/views/sign-model/index.vue

+ 1 - 0
src/api/constant.ts

@@ -20,6 +20,7 @@ export const FUSE_INSERT_MODEL = `/fusion/caseFusion/add`
 export const FUSE_UPDATE_MODEL = `/fusion/caseFusion/update`
 export const FUSE_DELETE_MODEL = `/fusion/caseFusion/delete`
 // 场景列表
+export const SCENE_LIST_ALL = `/fusion/api/scene/list`
 export const MODEL_LIST = `/fusion/case/sceneList`
 export const MODEL_SIGN = `/fusion/model/getInfo`
 

+ 10 - 3
src/api/scene.ts

@@ -1,6 +1,7 @@
 import axios from './instance'
-import { MODEL_LIST, MODEL_SIGN } from './constant'
+import { MODEL_LIST, MODEL_SIGN, SCENE_LIST_ALL } from './constant'
 import { params } from '@/env'
+import type { PagingResult } from './index'
 
 export enum SceneType {
   SWKK = 0,
@@ -22,9 +23,9 @@ export enum SceneStatus {
 export const SceneTypeDesc: Record<SceneType, string>  = {
   [SceneType.SWKK]: '四维看看',
   [SceneType.SWKJ]: '四维看见',
-  [SceneType.SWSS]: '四维深时',
+  [SceneType.SWSS]: '四维深时点云场景',
   [SceneType.SWMX]: '三维模型',
-  [SceneType.SWSSMX]: '四维深时模型'
+  [SceneType.SWSSMX]: '四维深时obj模型'
 }
 
 export interface Scene {
@@ -60,6 +61,12 @@ export const fetchScenes = async () => {
   return scenes.map(toLocalScene)
 }
 
+export const fetchScenesAll = async (params: {numList: Scene['num'][], type: SceneType}) => {
+  const scenes = await axios.post<Scenes>(SCENE_LIST_ALL, params)
+  return scenes.map(toLocalScene)
+}
+
+
 export const fetchScene = async (modelId: Scene['modelId']) => {
   const scene = await axios.get<Scene>(MODEL_SIGN, { params: { modelId } })
   return toLocalScene(scene)

+ 2 - 2
src/model/app.vue

@@ -40,8 +40,8 @@ export const Model = defineComponent({
         [SceneType.SWKK]: `/swkk/spg.html?m=${scene.value.num}`,
         [SceneType.SWKJ]: `/swkk/spg.html?m=${scene.value.num}`,
         [SceneType.SWSS]: `/swss/index.html?m=${scene.value.num}`,
-        [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}&share=1#sign-model`,
-        [SceneType.SWSSMX]: `index.html?caseId=${params.caseId}&m=${scene.value.num}&share=1#sign-model`
+        [SceneType.SWSSMX]: `/swkk/spg.html?m=${scene.value.num}`,
+        [SceneType.SWMX]: `index.html?caseId=${params.caseId}&modelId=${scene.value.num}&share=1#sign-model`
       }
       return urls[type]
     })

+ 2 - 2
src/model/platform.ts

@@ -147,8 +147,8 @@ export async function exposeFactory(type: ModelType, win?: any): Promise<ModelEx
       }
     }
   }
-  platforms[SceneType.SWKJ] = platforms[SceneType.SWKK]
-  platforms[SceneType.SWSSMX] = platforms[SceneType.SWMX] = {
+  platforms[SceneType.SWSSMX] = platforms[SceneType.SWKJ] = platforms[SceneType.SWKK]
+  platforms[SceneType.SWMX] = {
     getSDK: async () => findObjectAttr(win , '__sdk'),
     expose: platforms[fuseModel].expose
   }

+ 4 - 3
src/views/sign-model/index.vue

@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { loadModel, fuseModel as FModel } from '@/model'
-import { fetchScene, fetchScenes, Scene, SceneType } from '@/api'
+import { fetchScene, fetchScenesAll, Scene, SceneType } from '@/api'
 import { createFuseModels, defTitle, fuseModels, SceneStatus } from '@/store'
 import { params, showModelsMapStack } from '@/env'
 import { Dialog } from 'bill/index'
@@ -22,8 +22,9 @@ const loadSignModel = async () => {
       scene = mscene
     }
   } else if ('m' in params) {
-    const scenes = await fetchScenes()
-    scene = scenes.find(scene => scene.num === params.m && scene.type === SceneType.SWSSMX)
+    const scenes = await fetchScenesAll({ numList: [params.m!], type: SceneType.SWSSMX })
+    scene = scenes.find(scene => scene.num === params.m)
+    console.log(scene)
   } 
 
   if (!scene) {