fix: 1

.env.development

@@ -1,6 +1,6 @@
 VITE_APP_APP="fire"
-VITE_SEVER_URL="http://192.168.9.27:1800/"
-# VITE_SEVER_URL="https://xj-mix3d.4dkankan.com"
+# VITE_SEVER_URL="http://192.168.9.27:1800/"
+VITE_SEVER_URL="https://hccj.xjxf.com:18008"
 VITE_DEVCODE_URL="https://192.168.0.25/code"
 VITE_SWKK_URL="https://test.4dkankan.com"
 VITE_SERVICE_URL="https://test.4dkankan.com"

src/components/chunk-upload/index.vue

@@ -109,11 +109,17 @@ const chunksUpload = async (
 
   const setPercentage = () => {
     let p = 1 - chunkLen / chunkCount;
-    p += chunkProgress.reduce((t, c) => t + c / chunkLen, 0);
+    console.log("上传完成部分为", p);
+    console.log(
+      "正在上传片段进度为",
+      chunkProgress.reduce((t, c) => t + c / chunkCount, 0)
+    );
+    p += chunkProgress.reduce((t, c) => t + c / chunkCount, 0);
     p += merge ? 0 : -0.01;
     p = Math.min(1, Math.max(0.01, p));
     onPercentage(Math.ceil(p * 100));
     uploadIngs[init.id] = p;
+    console.log("所有片段进度为:", chunkProgress);
   };
 
   setPercentage();
@@ -149,8 +155,10 @@ const chunksUpload = async (
     );
     try {
       await Promise.all(uploadChunks(chunkGroup, i * parallelCount));
+      console.log(`还剩余${groupSize}个片段,当前在${i}片段成功`);
     } catch (e) {
       i--;
+      console.log(`还剩余${groupSize}个片段,当前在${i}片段失败`);
     }
   }
 

src/constant/scene.ts

@@ -51,7 +51,7 @@ export const QuoteSceneStatusDesc: { [key in QuoteSceneStatus]: string } = {
   [QuoteSceneStatus.ERR]: "计算失败",
   [QuoteSceneStatus.SUCCESS]: "计算成功",
   [QuoteSceneStatus.ARCHIVE]: "封存",
-  [QuoteSceneStatus.RERUN]: "重新计算中",
+  [QuoteSceneStatus.RERUN]: "计算中",
 };
 
 export const ModelSceneStatusDesc: { [key in ModelSceneStatus]: string } = {

src/view/vrmodel/sceneContent.vue

@@ -108,7 +108,11 @@
 
       <span
         v-if="
-          ![QuoteSceneStatus.RUN, QuoteSceneStatus.QUEUE].includes(row.status) &&
+          ![
+            QuoteSceneStatus.RUN,
+            QuoteSceneStatus.QUEUE,
+            QuoteSceneStatus.RERUN,
+          ].includes(row.status) &&
           ![SceneType.SWSSMX, SceneType.SWYDMX].includes(row.type)
         "
         class="oper-span delBtn"