1
0
tangning 22 часов назад
Родитель
Сommit
b0f0d0d1e8

+ 1 - 1
src/assets/style/public.scss

@@ -466,7 +466,7 @@ body {
   justify-content: center;
 }
 .el-message-box__content {
-  padding: 40px 0;
+  padding: 40px 20px;
   border-top: 1px solid #f5f5f5;
   border-bottom: 1px solid #f5f5f5;
 }

+ 1 - 1
src/request/urls.ts

@@ -186,7 +186,7 @@ export const updateCaseFile = "/fusion/caseFiles/updateTitle";
 export const newFileupload = "/service/manage/common/upload/fileNew";
 export const newupload = "/service/manage/common/upload/files";
 export const uploadSceneCheck = '/service/manage/scene/uploadSceneCheck'
-export const uploadSceneOrig = '/service/manage/scene/uploadSceneOrig'
+export const uploadSceneOrig = '/service/manage/scene/uploadScene'
 
 //勘验笔录信息
 export const caseInquestInfoOld = "/fusion/caseInquestCriminal/info";

+ 3 - 2
src/view/vrmodel/addCaseFile.vue

@@ -141,8 +141,9 @@ defineExpose<QuiskExpose>({
     }else{
       filePath = file?.response?.data
     }
-    console.log('caseFile', caseFile.value);
-    const resCheck = await SceneCheck({ filePath, sourceType: caseFile.value.sourceType });
+    const {data} = await SceneCheck({ filePath, sourceType: caseFile.value.sourceType });
+    let resCheck = data;
+    console.log('caseFile', caseFile.value, resCheck);
     if (
      resCheck.code == 60042 && await ElMessageBox.confirm(`此场景原属于${resCheck.data},继续上传将重新计算并覆盖原场景:\n归属权转移至当前账号;\n清除原所有者的权限设置;\n清空场景内由用户手动添加的空间模型。\n确定继续吗?`, '提示')
     ) {

+ 2 - 2
src/view/vrmodel/list.vue

@@ -31,10 +31,10 @@ import { SceneType } from "@/store/scene";
 import { SceneTypeDesc } from "@/constant/scene";
 import { useScenePaggingParams } from "./pagging";
 import { addModelScene } from "./quisk" 
-defineProps<{ params: ReturnType<typeof useScenePaggingParams>, upload: boolean }>();
+const props = defineProps<{ params: ReturnType<typeof useScenePaggingParams>, upload: boolean }>();
 const addUploadSecen = async () => {
   await addModelScene();
-  params.pagging.refresh();
+  props.params.pagging.refresh();
 }
 const headOptions = [
   // { value: SceneType.SWKK, name: SceneTypeDesc[SceneType.SWKK] },