Przeglądaj źródła

feat(api): 换API

gemercheung 3 lat temu
rodzic
commit
4fc67e2078
1 zmienionych plików z 17 dodań i 26 usunięć
  1. 17 26
      src/views/scenes/list.vue

+ 17 - 26
src/views/scenes/list.vue

@@ -78,12 +78,12 @@
     checkDownloadApi,
   } from '/@/api/scene/list';
   import { useI18n } from '/@/hooks/web/useI18n';
-  // import {
-  //   downloadByUrl,
-  //   // downloadByData,
-  //   // downloadByBase64,
-  //   // downloadByOnlineUrl,
-  // } from '/@/utils/file/download';
+  import {
+    downloadByUrl,
+    // downloadByData,
+    // downloadByBase64,
+    // downloadByOnlineUrl,
+  } from '/@/utils/file/download';
 
   import { useUserStore } from '/@/store/modules/user';
   import DownloadModal from './downloadModal.vue';
@@ -257,28 +257,19 @@
         const checker = await checkDownloadApi({
           sceneNum: record.num,
         });
-        const res = await downloadSceneDataAPi({
-          sceneNum: record.num,
-        });
-        console.log('res', res);
+        console.log('');
 
-        // const downloadUrl = res as any as string;
-        // console.log('downloadUrl', downloadUrl, res);
-        /**
-         * mark 2022-03-22 message return success 是要进入openDownloadModal轮询,非表面「成功」字意思。
-         * message return url 指已下载,转mimeType download
-         *
-         * notice: 过往 downloadUrl 是 boolean / string
-         *  现在 downloadUrl 是 string[success] / string[url]
-         *
-         * */
-        // await openDownloadModal(true, record);
-        // downloadByUrl({
-        //   url: downloadUrl as any as string,
-        //   target: '_self',
-        // });
-        if (checker.downloadStatus === 0) {
+        if (checker.downloadStatus < 3) {
+          const res = await downloadSceneDataAPi({
+            sceneNum: record.num,
+          });
+          console.log('res', res);
           await openDownloadModal(true, record);
+        } else {
+          downloadByUrl({
+            url: checker.downloadUrl,
+            target: '_self',
+          });
         }
       }
       return {