bill 7 mēneši atpakaļ
vecāks
revīzija
405cd06b15

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

@@ -67,7 +67,7 @@ export const getSceneUrl = (sceneData: Scene) => {
         url = sceneData.modelGlbUrl;
         break;
       default:
-        url = sceneData.modelGlbUrl;
+        url = sceneData.modelGlbUrl || sceneData.modelObjUrl;
     }
     try {
       url = JSON.parse(url);
@@ -104,7 +104,7 @@ const serviceToLocal = (
       : "-",
     modelId: serviceModel.sceneData?.modelId,
     fusionId: serviceModel.fusionId,
-    type: serviceModel.sceneData?.type,
+    type: serviceModel.sceneData?.type === SceneType.DSFXJ ? SceneType.SWKK : serviceModel.sceneData?.type,
     size: serviceModel.sceneData?.modelSize,
     raw: serviceModel.sceneData,
     time: serviceModel.sceneData?.createTime,
@@ -135,6 +135,7 @@ export const fetchFuseModels = async () => {
   const serviceModels = await axios.get<ServiceFuseModel[]>(FUSE_MODEL_LIST, {
     params: { caseId: params.caseId },
   });
+  console.log('===>', serviceModels.map((item, index) => serviceToLocal(item, index == 0)))
   return serviceModels.map((item, index) => serviceToLocal(item, index == 0));
 };
 

+ 9 - 0
src/components/materials/index.vue

@@ -284,4 +284,13 @@ const handleTableChange: TableProps["onChange"] = (pag, filters) => {
 .content-header-search {
   flex: 1;
 }
+
+.ant-table-filter-dropdown .ant-dropdown-menu-title-content > span {
+  max-width: 200px;
+  overflow: hidden;
+  display: inline-block;
+  vertical-align: middle;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

+ 11 - 1
src/views/registration/index.vue

@@ -74,7 +74,13 @@ import { diffArrayChange } from "@/utils";
 import { useViewStack } from "@/hook";
 import { autoSaveFuseModels, getFuseModel, leave } from "@/store";
 import { router, RoutesName } from "@/router";
-import { currentModelStack, custom, showMeasuresStack } from "@/env";
+import {
+  currentModelStack,
+  custom,
+  showMeasuresStack,
+  showPathsStack,
+  showPathStack,
+} from "@/env";
 
 import type { ControlExpose } from "@/components/control-panl";
 
@@ -135,12 +141,16 @@ watchEffect((onCleanup) => {
   if (smodel) {
     smodel.enterAlignment();
     const pop = currentModelStack.push(model as any);
+    showPathStack.push(ref(undefined));
+    showPathsStack.push(ref(false));
 
     selectOptions.value = [options[0]];
 
     onCleanup(() => {
       smodel.leaveTransform();
       smodel.leaveAlignment();
+      showPathsStack.pop();
+      showPathStack.pop();
       pop();
     });
   } else if (isCurrent.value) {