bill преди 8 месеца
родител
ревизия
b729a73381
променени са 3 файла, в които са добавени 24 реда и са изтрити 14 реда
  1. 10 1
      src/store/scene.ts
  2. 8 4
      src/view/vrmodel/sceneContent.vue
  3. 6 9
      src/view/vrmodel/upload.vue

+ 10 - 1
src/store/scene.ts

@@ -41,6 +41,15 @@ export enum ZipType {
   m_cot = 5,
   m_qx = 6,
 }
+export const ZipTypeDesc = {
+  [ZipType.f_e57]: "法如e57",
+  [ZipType.f_e57_s]: "法如e57加全景图",
+  [ZipType.n_e57]: "标准e57",
+  [ZipType.a_az]: "AZ系列数据包",
+  [ZipType.m_obj]: "模型",
+  [ZipType.m_cot]: "点云",
+  [ZipType.m_qx]: "倾斜模型",
+};
 
 // 只有当location 为4 时,才能生成obj
 export enum LocationEnum {
@@ -114,8 +123,8 @@ export enum SceneType {
   SWYDSS,
   SWYDMX,
 
-  C_SWKK,
   C_SWSS,
+  C_SWKK,
 }
 
 // 模型场景状态

+ 8 - 4
src/view/vrmodel/sceneContent.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="body-head">
     <h3 style="visibility: hidden">场景管理</h3>
-    
+
     <el-button @click="uploadHandler" v-pdpath="'sync'" type="primary" v-if="custom">
       <el-icon><Upload /></el-icon>{{ "上传数据" }}
     </el-button>
@@ -22,9 +22,11 @@
     <el-table-column label="场景标题" prop="name"></el-table-column>
 
     <template v-if="custom">
-      <el-table-column label="原始数据格式" prop="name"></el-table-column>
-      <el-table-column label="大小" prop="name"></el-table-column>
-      <el-table-column label="上传时间" prop="name"></el-table-column>
+      <el-table-column label="原始数据格式" prop="name" v-slot:default="{ row }">
+        {{ ZipTypeDesc[row.fileType] }}
+      </el-table-column>
+      <el-table-column label="大小" prop="fileSize"></el-table-column>
+      <el-table-column label="上传时间" prop="createTime"></el-table-column>
       <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
         {{
           row.uploadStatus !== UploadStatus.SUCCESS
@@ -135,6 +137,8 @@ import {
   downQuoteSceneHash,
   UploadStatus,
   UploadStatusDesc,
+  ZipType,
+  ZipTypeDesc,
 } from "@/store/scene";
 import { ScenePagging } from "./pagging";
 import { QuoteSceneStatusDesc } from "@/constant/scene";

+ 6 - 9
src/view/vrmodel/upload.vue

@@ -35,7 +35,7 @@
 
 <script setup lang="ts">
 import { QuiskExpose } from "@/helper/mount";
-import { SceneType, ZipType } from "@/store/scene";
+import { SceneType, ZipType, ZipTypeDesc } from "@/store/scene";
 import ChunkUpload from "@/components/chunk-upload/index.vue";
 import {
   ModelMaxSize,
@@ -54,11 +54,10 @@ const props = defineProps<{
   fileType?: ZipType;
 }>();
 
-const zipTypeOptions = computed(() => {
+const zipTypeOptionsRaw = computed(() => {
   if (props.type === SceneType.C_SWKK) {
     return [
       {
-        label: "AZ系列数据包",
         value: ZipType.a_az,
         desc:
           "请上传AZ系列设备导出的原始数据包文件夹使用英文或数字命名。打包成zip格式并上传。",
@@ -67,18 +66,15 @@ const zipTypeOptions = computed(() => {
   } else if (props.type === SceneType.C_SWSS) {
     return [
       {
-        label: "法如e57",
         value: ZipType.f_e57,
         desc: "请从Faro Scene导出含全景图的e57数据,打包至zip格式并上传。",
       },
       {
-        label: "法如e57加全景图",
         value: ZipType.f_e57_s,
         desc:
           "请从Faro Scene分别导出e57数据及全景图放在同一文件夹,文件夹使用英文或数字命名。打包成zip格式并上传。",
       },
       {
-        label: "标准e57",
         value: ZipType.n_e57,
         desc:
           "请将标准e57数据打包文件夹,文件夹使用英文或数字命名,打包.zip格式上传。<a>查看标准e57数据样例</a>",
@@ -87,24 +83,25 @@ const zipTypeOptions = computed(() => {
   } else if (props.type === SceneType.SWMX) {
     return [
       {
-        label: "模型",
         value: ZipType.m_obj,
         desc:
           "请将obj、mtl、贴图文件放在同一文件夹,文件夹使用英文或数字命名,打包成zip格式上传。建议大小在100M内。",
       },
       {
-        label: "点云",
         value: ZipType.m_cot,
         desc: "请将ply/las/laz点云文件,打包成zip格式上传。大小在50GB以内。",
       },
       {
-        label: "倾斜模型",
         value: ZipType.m_qx,
         desc: "请将b3dm文件,打包成zip格式上传。大小在50GB以内。",
       },
     ];
   }
 });
+const zipTypeOptions = computed(() =>
+  zipTypeOptionsRaw.value?.map((item) => ({ ...item, label: ZipTypeDesc[item.value] }))
+);
+
 const current = computed(
   () =>
     zipTypeOptions.value &&