bill 5 달 전
부모
커밋
e0a13ca0f4
4개의 변경된 파일15개의 추가작업 그리고 12개의 파일을 삭제
  1. 4 3
      src/api/fuse-model.ts
  2. 4 2
      src/env/index.ts
  3. 6 6
      src/main.ts
  4. 1 1
      vite.config.ts

+ 4 - 3
src/api/fuse-model.ts

@@ -5,7 +5,7 @@ import {
   FUSE_UPDATE_MODEL,
   FUSE_DELETE_MODEL,
 } from "./constant";
-import { params } from "@/env";
+import { namespace, params } from "@/env";
 
 import { Scene, SceneStatus, SceneType } from "./scene";
 
@@ -39,6 +39,7 @@ interface ServiceFuseModel {
   opacity: number;
   bottom: number;
   fusionNumId: number;
+  modelType: number
   transform: {
     position: SceneLocalPos;
     rotation: SceneLocalPos;
@@ -48,7 +49,7 @@ interface ServiceFuseModel {
 }
 
 export const uploadMaterialToModel = async (uploadId: number) => {
-  const model = await axios.post<{modelId: number}>('/fusion/model/addByMediaLibrary', {caseId: params.caseId, uploadId})
+  const model = await axios.post<{modelId: number}>(`${namespace}/model/addByMediaLibrary`, {caseId: params.caseId, uploadId})
   return model
 }
 
@@ -92,7 +93,7 @@ const serviceToLocal = (
     opacity: serviceModel.opacity || 1,
     bottom: serviceModel.bottom || 0,
     fusionNumId: serviceModel.fusionNumId,
-    modelType: serviceModel.sceneData?.modelDateType,
+    modelType: serviceModel.sceneData?.modelType,
     position: serviceModel.transform.position,
     rotation: serviceModel.transform.rotation,
     id: serviceModel.fusionNumId.toString(),

+ 4 - 2
src/env/index.ts

@@ -2,7 +2,6 @@ import { stackFactory, flatStacksValue, strToParams } from '@/utils'
 import { reactive, ref } from 'vue'
 
 import type { FuseModel, Path, TaggingPosition, View } from '@/store'
-export const namespace = '/fusion'
 export const viewModeStack = stackFactory(ref<'full' | 'auto'>('auto'))
 export const showToolbarStack = stackFactory(ref<boolean>(false))
 export const showHeadBarStack = stackFactory(ref<boolean>(true))
@@ -55,6 +54,7 @@ export type Params = {
   caseId: number,
   baseURL?: string,
   modelId?: string,
+  service: string
   fileUrl?: string
   sign?: string
   type?: string
@@ -76,4 +76,6 @@ export const getResource = (uri: string) => {
   } else {
     return `${baseURL}/${uri}`
   }
-}
+}
+// /fusion
+export const namespace = '/fusion'

+ 6 - 6
src/main.ts

@@ -4,7 +4,7 @@ import "./style.scss";
 import App from "./app.vue";
 import Components from "bill/index";
 import router from "./router";
-import { params } from "@/env";
+import { namespace, params } from "@/env";
 import { addHook, addUnsetTokenURLS, delHook, delUnsetTokenURLS } from "@/api";
 import { currentLayout, RoutesName } from "./router";
 import * as URL from "@/api/constant";
@@ -71,11 +71,11 @@ watchEffect(
         URL.CASE_INFO,
         URL.PATH_LIST,
         URL.AUTH_PWD,
-        '/fusion/caseInquest/info',
-        '/fusion/caseExtractDetail/info',
-        '/fusion/caseInquest/downDocx',
-        '/fusion/caseExtractDetail/downDocx',
-        '/fusion/caseImg/getFfmpegImage'
+        `${namespace}/caseInquest/info`,
+        `${namespace}/caseExtractDetail/info`,
+        `${namespace}/caseInquest/downDocx`,
+        `${namespace}/caseExtractDetail/downDocx`,
+        `${namespace}/caseImg/getFfmpegImage`
       ]
       addUnsetTokenURLS(...untokenURLS);
       onCleanup(() => {

+ 1 - 1
vite.config.ts

@@ -7,7 +7,7 @@ import { createServer as createLangServer } from "./scripts/lang";
 import { resolve } from "path";
 
 const langProt = 7072;
-const ip = `http://192.168.0.25`;
+const ip = `http://192.168.0.62:8808`;
 const proxy = {
   "/dev": {
     target: `http://localhost:${langProt}`,