tangning 2 лет назад
Родитель
Сommit
a678aaf393

+ 1 - 0
src/api/operate/model.ts

@@ -26,6 +26,7 @@ export interface sceneMoveParams {
 }
 export interface sceneControlParams {
   num: string;
+  isObj: boolean;
 }
 export interface ResultDetail{
   content: string,

+ 10 - 5
src/views/account/product/index.vue

@@ -4,7 +4,8 @@
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
         <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
         <a-tab-pane :key="1" tab="四维看见" :disabled="loading"/>
-        <a-tab-pane :key="2" tab="四维深时" :disabled="loading"/>
+        <a-tab-pane :key="2" tab="四维深时点云" :disabled="loading"/>
+        <a-tab-pane :key="4" tab="四维深时Obj" :disabled="loading"/>
         <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/> 
         <a-tab-pane :key="4" tab="四维全景" :disabled="loading"/> 
       </a-tabs
@@ -251,12 +252,16 @@
       const canDownload = ref<boolean>(true);
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record);
-
-        checkDownLoad({ num: record.num }).then((res) => {
+        let isObj = tableType.value == 4?1:0
+        let params = {num: record.num}
+        if(tableType.value == 4 || tableType.value == 2){
+          params.isObj = isObj
+        }
+        checkDownLoad(params).then((res) => {
           console.log(res);
           if (res.downloadStatus!= 3) {
             // 未下载过,需要打包
-            sceneDownload({ num: record.num }).then((downres) => {
+            sceneDownload(params).then((downres) => {
               console.log(downres);
               openDownModal(true, {
                 ...record,
@@ -266,7 +271,7 @@
                   afterClose();
                 }
                 timer.value = setInterval(() => {
-                  downloadProcess({ num: record.num }).then((processres) => {
+                  downloadProcess(params).then((processres) => {
                     if (processres.percent >= 100) {
                       canDownload.value = false;
                       afterClose();

+ 15 - 8
src/views/productOperation/cameraScene.vue

@@ -1,12 +1,14 @@
 <template>
-  <PageWrapper contentBackground>{{ isDev }}
+  <PageWrapper contentBackground>
     <template #footer >
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
         <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
         <a-tab-pane :key="1" tab="四维看见" :disabled="loading"/>
-        <a-tab-pane :key="2" tab="四维深时" :disabled="loading"/>
-        <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/> </a-tabs
-    ></template>
+        <a-tab-pane :key="2" tab="四维深时点云" :disabled="loading"/>
+        <a-tab-pane :key="5" tab="四维深时Obj" :disabled="loading"/>
+        <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/> 
+      </a-tabs>
+    </template>
     <div class="desc-wrap-BasicTable">
       <BasicTable  @register="registerTable">
         <template #toolbar>
@@ -134,7 +136,7 @@
       const loading = ref(false);
       const isDev = window.location.hostname.includes('eur')
       console.log('isDev',isDev)
-      const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
+      const tableType = ref<Number>(0); //0看看 、1看见、2深时
       const columns: BasicColumn[] = [
         {
           title: '场景标题',
@@ -458,12 +460,17 @@
       const canDownload = ref<boolean>(true);
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record,canDownload.value);
+        let isObj = tableType.value == 4?1:0
+        let params = {num: record.num}
+        if(tableType.value == 4 || tableType.value == 2){
+          params.isObj = isObj
+        }
         canDownload.value = true;
-        checkDownLoad({ num: record.num }).then((res) => {
+        checkDownLoad(params).then((res) => {
           console.log(res);
           if (res.downloadStatus != 3) {
             // 未下载过,需要打包
-            sceneDownload({ num: record.num }).then((res) => {
+            sceneDownload(params).then((res) => {
               console.log(res);
               openDownModal(true, {
                 ...record,
@@ -473,7 +480,7 @@
                   afterClose();
                 }
                 timer.value = setInterval(() => {
-                  downloadProcess({ num: record.num }).then((res) => {
+                  downloadProcess(params).then((res) => {
                     if(res.status == '1003'){
                       createMessage.error('下载失败');
                       afterClose();