瀏覽代碼

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

xzw 6 月之前
父節點
當前提交
2bc12d7548
共有 5 個文件被更改,包括 19 次插入19 次删除
  1. 1 1
      .env
  2. 1 1
      .production.env
  3. 1 1
      src/api/setting.ts
  4. 1 1
      src/components/tagging/sign.vue
  5. 15 15
      src/sdk/sdk.ts

+ 1 - 1
.env

@@ -1,5 +1,5 @@
 VITE_LASER_HOST=//uat-laser.4dkankan.com
 VITE_LASER_OSS=//laser-oss.4dkankan.com/
 VITE_OSS=//4dkk.4dage.com/
-VITE_PANO_OSS=//4dkk.4dage.com/scene_view_data/
+VITE_PANO_OSS=//4dkk.4dage.com
 

+ 1 - 1
.production.env

@@ -1,5 +1,5 @@
 VITE_LASER_HOST=//uat-laser.4dkankan.com
 VITE_LASER_OSS=//laser-oss.4dkankan.com/
 VITE_OSS=//4dkk.4dage.com/
-VITE_PANO_OSS=//4dkk.4dage.com/scene_view_data/
+VITE_PANO_OSS=//4dkk.4dage.com
 

+ 1 - 1
src/api/setting.ts

@@ -27,7 +27,7 @@ export type Setting = {
   fov?: number;
   openCompass?: boolean;
 };
-const defaultCover = 'https://4dkk.4dage.com/fusion/default/images/cover.jpg'
+const defaultCover = 'https://4dkk.4dage.com/fusion/default/images/cover.png'
 
 const toLocal = (serviceSetting: ServeSetting): Setting => ({
   id: serviceSetting.settingsId,

+ 1 - 1
src/components/tagging/sign.vue

@@ -109,7 +109,7 @@ const pullIndex = ref(-1)
 const isHover = ref(false)
 const queryItems = computed(() => 
   props.tagging.images.map(image => ({
-    type: MediaType.img, 
+    type: MetaType.image, 
     url: getResource(getFileUrl(image))
   }))
 )

+ 15 - 15
src/sdk/sdk.ts

@@ -119,9 +119,9 @@ export interface MeasureBase {
 
 export type Measure<T extends StoreMeasure["type"] = StoreMeasure["type"]> =
   MeasureBase &
-    (T extends MeasureType.area
-      ? { getArea: () => { value: number } }
-      : { getDistance: () => { value: number } });
+  (T extends MeasureType.area
+    ? { getArea: () => { value: number } }
+    : { getDistance: () => { value: number } });
 
 export type StartMeasure<T extends StoreMeasure["type"]> = Measure<T> & {
   bus: Emitter<{
@@ -133,17 +133,17 @@ export type StartMeasure<T extends StoreMeasure["type"]> = Measure<T> & {
 
 export type Pose =
   | {
-      position: SceneLocalPos;
-      target: SceneLocalPos;
-    }
+    position: SceneLocalPos;
+    target: SceneLocalPos;
+  }
   | {
-      panoId: any;
-      model: SceneModel;
-      posInModel: SceneLocalPos;
-      rotInModel: SceneLocalPos;
-      position: SceneLocalPos;
-      target: SceneLocalPos;
-    };
+    panoId: any;
+    model: SceneModel;
+    posInModel: SceneLocalPos;
+    rotInModel: SceneLocalPos;
+    position: SceneLocalPos;
+    target: SceneLocalPos;
+  };
 
 export interface SDK {
   layout: HTMLDivElement;
@@ -224,11 +224,11 @@ export const initialSDK = async (props: InialSDKProps) => {
   await Promise.all(libs.map(loadLib));
   await loadLib(`./lib/potree/potree.js`);
 
-  console.log('initSDK_last',props);
+  console.log('initSDK_last', props);
   const localSdk = cover({
     ...props,
     dom: props.layout,
-    isLocal: false,
+    isLocal: offline ? true : false,
     scenes: props.scenes,
     lonlat: props.lonlat,
     mapDom: null,