下载高密度e57

.env.development

@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = /
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # http://192.168.0.38:8190/shop
-VITE_PROXY = [["/basic-api","https://cszfb.4dkankan.com/basic-api"],["/service","https://njs-dev.4dkankan.jp/service"],["/zfb-api","https://cszfb.4dkankan.com"]]
+VITE_PROXY = [["/basic-api","https://cszfb.4dkankan.com/basic-api"],["/service","https://test-jp.4dkankan.com/service"],["/zfb-api","https://cszfb.4dkankan.com"]]
 #["/zfb-api","http://192.168.0.47:7081"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
@@ -25,4 +25,4 @@ VITE_GLOB_API_URL_PREFIX=
 
 VITE_GOOGLE_KEY=AIzaSyBGUvCR1bppO9pfuS0MUWzuftiZ127y4Os
 
-VITE_DOMAIN=https://njs-dev.4dkankan.jp/
+VITE_DOMAIN=https://test-jp.4dkankan.com/

src/locales/lang/json/ja.json

@@ -658,5 +658,7 @@
     "layout.e57.e57Success": "アップロードに成功し、シーンを生成するのに時間がかかりますので、お待ちください！",
     "apiCode.errCode5031": "このシーンには位置情報がなく、地図に表示できません！",
     "layout.e57.e57uploadfail": "アップロードが失敗しました。",
-    "layout.e57.e57closetip": "ファイルはアップロード中です。終了を確認しますか？"
+    "layout.e57.e57closetip": "ファイルはアップロード中です。終了を確認しますか？",
+    "routes.scenes.downloadSceneGmdE57": "高密度E57",
+    "routes.scenes.downloadSceneGmdConfirmE57": "高密度E57ファイルをダウンロードしますか"
 }

src/locales/lang/json/zh-CN.json

@@ -658,5 +658,7 @@
     "layout.e57.tabs2": "obj场景",
     "layout.e57.e57objText": "生成OBJ",
     "layout.e57.e57uploadfail": "上传失败，请重新上传",
-    "layout.e57.e57closetip": "文件上传中，是否关闭上传操作？"
+    "layout.e57.e57closetip": "文件上传中，是否关闭上传操作？",
+    "routes.scenes.downloadSceneGmdE57": "高密度E57",
+    "routes.scenes.downloadSceneGmdConfirmE57": "是否确认下载场景高密度E57?"
 }

src/views/scenes/downloadE57Modal.vue

@@ -86,7 +86,7 @@
       downloadInfo.process = 0;
       downloadInfo.status = t('component.upload.downloadState');
       downloadInfo.isDownloaded = false;
-
+      const splitType = ref('');
       const [registerForm, { setFieldsValue }] = useForm({
         schemas: schemas,
         labelWidth: 120,
@@ -112,6 +112,7 @@
         });
         isObj.value = data.isObj;
         sceneNum.value = data.num;
+        splitType.value = data.splitType;
       }
       const handleSubmit = async () => {
         try {
@@ -130,6 +131,9 @@
           num: sceneNum,
           isObj: isObj.value,
         };
+        if(splitType.value){
+          param.splitType = splitType.value;
+        }
         downloadInfo.timer = setInterval(async () => {
           const res = await getE57DownloadProcessApi(param);
           console.log('res', res);

src/views/scenes/list.vue

@@ -17,15 +17,15 @@
         :rowSelection="{ type: 'checkbox', getCheckboxProps: getCheckboxProps }"
         @fetch-success="handleFetchSuccess"
       >
-        <template #tableTitle>
+        <!-- <template #tableTitle>
           <div class="fileName">root</div>
-        </template>
+        </template> -->
         <template #toolbar>
           <a-button v-if="isPatchAuth" type="primary" @click="handlePatchSelect">
             {{ t('routes.archive.patchArchive') }}</a-button
           >
           <!-- <a-button type="primary" color="warning" @click="() => {}"> 编辑</a-button>-->
-        <a-button type="primary" color="error" @click="() => {}"> 新建文件夹</a-button> 
+        <!-- <a-button type="primary" color="error" @click="() => {}"> 新建文件夹</a-button>  -->
         </template>
         <template #mapShow="{ record }">
           <Switch
@@ -38,8 +38,8 @@
         </template>
         <template #cover="{ record }">
           <div class="cover">
-            <img src="/resource/img/file.png" style="margin: 0 auto;" alt="" v-if="record.companyName == '哈哈哈哈'" />
-            <TableImg v-else
+            <!-- <img src="/resource/img/file.png" style="margin: 0 auto;" alt="" v-if="record.companyName == '哈哈哈哈'" /> v-else-->
+            <TableImg
               :size="120"
               :simpleShow="true"
               :imgList="[record.thumb || '/resource/img/header.jpg']"
@@ -147,6 +147,20 @@
                   confirm: handleDownloadSceneE57.bind(null, record),
                 },
               },
+              {
+                tooltip: t('routes.scenes.downloadSceneGmdE57'),
+                disabled: record.status != -2,
+                ifShow:
+                  (tableType === 2 || tableType === 5) &&
+                  record.location === 4 &&
+                  !record.isCopy && !dayjs(record.createTime).isBefore(dayjs('2025-01-01')),
+                icon: 'streamline-ultimate:laptop-download',
+                popConfirm: {
+                  placement: 'left',
+                  title: t('routes.scenes.downloadSceneGmdConfirmE57'),
+                  confirm: handleDownloadSceneGmdE57.bind(null, record),
+                },
+              },
             ]"
           />
         </template>
@@ -347,7 +361,7 @@
           title: t('common.operation'),
           dataIndex: '',
           slots: { customRender: 'action' },
-          width: 300,
+          width: 320,
           ellipsis: false,
           fixed: 'right',
         },
@@ -637,7 +651,24 @@
           });
         }
       }
-
+      async function handleDownloadSceneGmdE57(record: Recordable) {
+        let param = {
+          num: record.num,
+          splitType: 'SPLIT_V32'
+        };
+        const checker = await checkDownloadE57Api(param);
+        console.log('checker', checker);
+        if (checker.downloadStatus < 3) {
+          const res = await downloadSceneDataE57APi(param);
+          console.log('res', res);
+          openDownloadE57Modal(true, { ...record, splitType: 'SPLIT_V32' });
+        } else {
+          downloadByUrl({
+            url: checker.downloadUrl,
+            target: '_self',
+          });
+        }
+      }
       return {
         reload,
         registerTable,
@@ -646,6 +677,7 @@
         handleGenerate,
         openSceneEditor,
         handleDownloadScene,
+        handleDownloadSceneGmdE57,
         handleDelete,
         handleLivestream,
         handleUpgrade,