Browse Source

Merge branch 'v1.9.0' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0

xzw 3 months ago
parent
commit
5c27bd090a
3 changed files with 5 additions and 4 deletions
  1. 1 1
      .env
  2. 1 1
      src/api/scene.ts
  3. 3 2
      src/views/folder/index.vue

+ 1 - 1
.env

@@ -1,4 +1,4 @@
-VITE_LASER_HOST=
+VITE_LASER_HOST=https://mix3d.4dkankan.com/backend
 VITE_LASER_OSS=https://laser-oss.4dkankan.com
 VITE_OSS=
 VITE_PANO_OSS=https://4dkk.4dage.com

+ 1 - 1
src/api/scene.ts

@@ -24,7 +24,7 @@ export const SceneTypeDesc: Record<SceneType, string>  = {
   [SceneType.SWKK]: '八目',
   [SceneType.SWKJ]: '双目转台',
   [SceneType.SWSS]: '激光转台点云场景',
-  [SceneType.SWMX]: '三维模型',
+  [SceneType.SWMX]: '媒体库',
   [SceneType.SWSSMX]: '激光转台Mesh场景',
   [SceneType.SWYDSS]: '激光移动点云场景',
   [SceneType.SWYDMX]: '激光移动Mesh场景'

+ 3 - 2
src/views/folder/index.vue

@@ -32,7 +32,7 @@ import Fire from "./fire/index.vue";
 import type { Floder, FloderRoot } from "@/store";
 import { useViewStack } from "@/hook";
 import { showRightPanoStack } from "@/env";
-console.log(floderRoots, 88888)
+
 const showInfo = ref(false);
 const currentNdx = ref(-1);
 const currentItems = ref<MediaItem[]>([]);
@@ -40,7 +40,8 @@ const preview = async ([floder, root]: [Floder, FloderRoot]) => {
   const metaType = getUrlType(floder.filesUrl);
   if (metaType === MetaType.other) {
     const isBlob = floder.filesUrl.includes("blob");
-    if (floder.filesTypeId === 100) {
+    console.error('floder.filesUrl', floder.filesTypeId, floder.filesUrl);
+    if (floder.filesTypeId === 4 || floder.filesTypeId === 3) {
       saveAs(floder.filesUrl, floder.filesTitle + ".doc");
     } else {
       window.open(floder.filesUrl + (!isBlob ? "?time=" + Date.now() : ""));