Merge branch 'xj' of http://192.168.0.115:3000/bill/public-fuse into xj

src/store/scene.ts

@@ -127,17 +127,16 @@ export const downModelSceneHash = async (scene: ModelScene) => {
   await downHash(res, scene.modelTitle);
 };
 
-export const uploadModelScene = (
+export const uploadModelScene = async (
   file: File,
   progressCallback: (progress: number) => void
-) =>
-  axios<undefined>({
+) => {
+  await axios<undefined>({
     method: "POST",
     url: uploadModel,
     data: { file },
     onUploadProgress(event: any) {
       const p = Math.round((event.loaded / event.total) * 100);
-      console.log(p);
       if (p === 100) {
         progressCallback(0);
       } else {
@@ -145,7 +144,8 @@ export const uploadModelScene = (
       }
     },
   });
-
+  progressCallback(0);
+};
 export const getModelSceneStatus = async (scene: ModelScene) => {
   const progress = (
     await axios.get<number>(getModelRunProgress, {

src/view/case/addPhotoFile.vue

@@ -79,7 +79,7 @@ const caseFile = ref<CaseImg>({
 
 const { size, fileList, upload, removeFile, previewFile, file, accept } = useUpload({
   maxSize: maxFileSize,
-  formats: DrawFormats,
+  formats: photoFormats,
 });
 
 const formatDesc = computed(() =>

src/view/case/addPhotoFileAll.vue

@@ -94,8 +94,8 @@ const upload = async (file: File) => {
       .substring(file.name.lastIndexOf("."))
       .toUpperCase();
 
-    if (!DrawFormats.some((type) => type.toUpperCase() === fileType)) {
-      ElMessage.error(`请上传${format.value}`);
+    if (!photoFormats.some((type) => type.toUpperCase() === fileType)) {
+      ElMessage.error(`请上传${photoFormatDesc}`);
       return false;
     } else if (file.size > maxFileSize) {
       ElMessage.error(`请上传${size.value}以内的文件`);