瀏覽代碼

fix: 修改截图需求

bill 2 年之前
父節點
當前提交
9ee4683496
共有 1 個文件被更改,包括 12 次插入3 次删除
  1. 12 3
      src/views/scene/photo.vue

+ 12 - 3
src/views/scene/photo.vue

@@ -63,7 +63,17 @@ const screenshot = async (sdk: LaserSDK) => {
     const data = sdk.scene.screenshot(dom.offsetWidth, dom.offsetHeight);
     const data = sdk.scene.screenshot(dom.offsetWidth, dom.offsetHeight);
     const { dataUrl: base64 } = await data.finishPromise;
     const { dataUrl: base64 } = await data.finishPromise;
     const blob = base64ToBlob(base64);
     const blob = base64ToBlob(base64);
-    let url: string = await uploadImage(blob);
+    let url: string;
+    if (down) {
+      const filename = `img_${formatDate(new Date(), "yyyyMMddhhmmss")}_${
+        data.meterPerPixel || 1
+      }_${new Date().getTime().toString().substring(8)}.jpg`;
+      url = await uploadImage(blob, filename);
+      await downloadImage(blob, filename);
+    } else {
+      url = await uploadImage(blob);
+    }
+
     return {
     return {
       url,
       url,
       meterPerPixel: data.meterPerPixel,
       meterPerPixel: data.meterPerPixel,
@@ -73,8 +83,7 @@ const screenshot = async (sdk: LaserSDK) => {
 
 
   baseLines.value.concat(list.value).forEach((item) => (item.show = false));
   baseLines.value.concat(list.value).forEach((item) => (item.show = false));
   await nextTick();
   await nextTick();
-
-  const screenshot = await getScreenshot();
+  const screenshot = await getScreenshot(true);
   baseLines.value.concat(list.value).forEach((item) => (item.show = true));
   baseLines.value.concat(list.value).forEach((item) => (item.show = true));
   await nextTick();
   await nextTick();