修改虚拟展和博物馆文件上传逻辑

src/views/culturalRelic/components/InfoEditDialog.vue

@@ -250,7 +250,6 @@
 <script>
 import { getLiteratureList } from "@/api/literature";
 import { addCulturalRelic, editCulturalRelic } from "@/api/culturalRelic";
-import AutoUploader from "@/components/Uploader/AutoUploader.vue";
 import ManualUploader from "@/components/Uploader/ManualUploader.vue";
 import { mapGetters } from "vuex";
 import { uploadV1 } from "@/utils/file";
@@ -258,7 +257,6 @@ import { deleteFiles } from "@/api/file";
 export default {
   name: "InfoEditDialog",
   components: {
-    AutoUploader,
     ManualUploader,
   },
   props: {

src/views/museum/components/InfoEditDialog.vue

@@ -68,8 +68,8 @@
           <el-switch v-model="status"> </el-switch>
         </el-form-item>
         <el-form-item label="博物馆封面" :label-width="formLabelWidth">
-          <AutoUploader
-            v-model="faceImage"
+          <ManualUploader
+            :files="faceImage"
             :fileLimit="1"
             :fileSize="50"
             listType="picture-card"
@@ -100,12 +100,14 @@
 
 <script>
 import { addMuseum, editMuseum } from "@/api/org";
-import AutoUploader from "@/components/Uploader/AutoUploader.vue";
+import ManualUploader from "@/components/Uploader/ManualUploader.vue";
 import { mapGetters } from "vuex";
+import { uploadV1 } from "@/utils/file";
+import { deleteFiles } from "@/api/file";
 export default {
   name: "InfoEditDialog",
   components: {
-    AutoUploader,
+    ManualUploader,
   },
   props: {
     visible: {
@@ -157,7 +159,9 @@ export default {
             that.faceImage = [
               {
                 name: this.dialogForm.name + "封面.png",
-                url: this.dialogForm.faceImageUrl,
+                url:
+                  this.dialogForm.faceImagePressUrl ||
+                  this.dialogForm.faceImageUrl,
                 fileId: this.dialogForm.faceImage,
               },
             ];
@@ -204,6 +208,7 @@ export default {
       pidModalKey: 0,
       regionCodeModalKey: 0,
       faceImage: [],
+      parentPid: null, //博物馆根节点id
     };
   },
   methods: {
@@ -238,42 +243,46 @@ export default {
       });
     },
     async handleSubmit() {
-      if (this.dialogForm.id) {
-        let params = { ...this.dialogForm };
-        // 回填图片
-        if (this.faceImage.length > 0) {
-          params.faceImage = this.faceImage[0].fileId;
-        }
-        // return;
-        // 处理行政区划
-        if (params.regionCode instanceof Array) {
-          params.regionCode = params.regionCode[params.regionCode.length - 1];
+      let params = { ...this.dialogForm };
+      let deleteFileArr = [];
+      // 回填图片
+      let file = this.$refs.museumFaceImage.getFiles();
+      if (file.length > 0) {
+        let formData = new FormData();
+        switch (file[0].status) {
+          case "ready":
+            formData.append("faceImage", file[0].raw);
+            let upLoadRes = await uploadV1(formData);
+            if (upLoadRes.code == 0) {
+              params.faceImage = upLoadRes.data[0].fileId;
+            } else {
+              this.$message.error("上传失败！:" + upLoadRes.data.msg);
+            }
+            deleteFileArr.push(this.dialogForm.faceImage);
+            break;
+          case "success":
+            params.faceImage = file[0].fileId;
+            break;
         }
-        // // 处理所属部门
-        // if (params.pid instanceof Array) {
-        //   params.pid = params.pid[params.pid.length - 1];
-        // }
-        // 处理状态
-        // debugger
-        params.status = this.status ? 1 : 0;
+      } else {
+        params.faceImage = "";
+      }
+      // 处理行政区划
+      if (params.regionCode instanceof Array) {
+        params.regionCode = params.regionCode[params.regionCode.length - 1];
+      }
+      // 处理所属部门
+      params.pid = this.regionTree[0].regionId;
+      // 处理状态
+      params.status = this.status ? 1 : 0;
+      if (this.dialogForm.id) {
         let res = await editMuseum(params);
+        deleteFiles(deleteFileArr);
         if (res.code == 0) {
           this.$message.success("修改成功！");
           this.reload();
         }
       } else {
-        let params = { ...this.dialogForm };
-        // 回填图片
-        if (this.faceImage.length > 0) {
-          params.faceImage = this.faceImage[0].fileId;
-        }
-        // 处理行政区划
-        params.regionCode = params.regionCode[params.regionCode.length - 1];
-        // 处理所属部门
-        // params.pid = params.pid[params.pid.length - 1];
-        // 处理状态
-        params.status = this.status ? 1 : 0;
-        // return
         let res = await addMuseum(params);
         if (res.code == 0) {
           this.$message.success("添加成功！");

src/views/role/index.vue

@@ -59,7 +59,7 @@
 import TablePage from "@/components/Table/TablePage.vue";
 import TableOperation from "@/components/Table/TableOperation.vue";
 import { title, operates, operations } from "./config";
-import { getRoleList } from "@/api/roles";
+import { getRoleList } from "@/api/user";
 import InfoEditDialog from "./components/InfoEditDialog";
 import SearchBar from "@/components/SearchBar";
 import { downloadFile, previewFile, downloadBlob } from "@/utils/file";

src/views/virtual/components/InfoEditDialog.vue

@@ -68,13 +68,13 @@
         </el-form-item>
 
         <el-form-item label="展览封面" :label-width="formLabelWidth">
-          <AutoUploader
-            v-model="faceImage"
+          <ManualUploader
+            :files="faceImage"
             :fileLimit="1"
             :fileSize="50"
             listType="picture-card"
             :fileType="['png', 'jpeg', 'jpg']"
-            ref="museumFaceImage"
+            ref="faceImage"
           />
         </el-form-item>
       </el-form>
@@ -90,12 +90,13 @@
 
 <script>
 import { addVirtual, editVirtual } from "@/api/vitual";
-import AutoUploader from "@/components/Uploader/AutoUploader.vue";
+import ManualUploader from "@/components/Uploader/ManualUploader.vue";
 import { mapGetters } from "vuex";
+import { uploadV1 } from "@/utils/file";
 export default {
   name: "InfoEditDialog",
   components: {
-    AutoUploader,
+    ManualUploader,
   },
   props: {
     visible: {
@@ -232,41 +233,65 @@ export default {
       });
     },
     async handleSubmit() {
-      if (this.dialogForm.bvId) {
-        let params = { ...this.dialogForm };
-        // 回填图片
-        if (this.faceImage.length > 0) {
-          params.faceImage = this.faceImage[0].fileId;
-        }
-        // return;
-        // 处理行政区划
-        if (params.regionCode instanceof Array) {
-          params.regionCode = params.regionCode[params.regionCode.length - 1];
-        }
-        // 处理所属部门
-        if (params.deptId instanceof Array) {
-          params.deptId = params.deptId[params.deptId.length - 1];
+      let params = { ...this.dialogForm };
+      // // 回填图片
+      // if (this.faceImage.length > 0) {
+      //   params.faceImage = this.faceImage[0].fileId;
+      // }
+      // return;
+      let deleteFileArr = [];
+      let file = this.$refs.faceImage.getFiles();
+      if (file.length > 0) {
+        let formData = new FormData();
+        switch (file[0].status) {
+          case "ready":
+            formData.append("faceImage", file[0].raw);
+            let upLoadRes = await uploadV1(formData);
+            if (upLoadRes.code == 0) {
+              params.faceImage = upLoadRes.data[0].fileId;
+            } else {
+              this.$message.error("上传失败！:" + upLoadRes.data.msg);
+            }
+            deleteFileArr.push(this.dialogForm.faceImage);
+            break;
+          case "success":
+            params.faceImage = file[0].fileId;
+            break;
         }
-        // 处理状态
-        // debugger
-        params.status = this.status ? 1 : 0;
+      } else {
+        params.faceImage = "";
+      }
+
+      // 处理行政区划
+      if (params.regionCode instanceof Array) {
+        params.regionCode = params.regionCode[params.regionCode.length - 1];
+      }
+
+      // 处理所属部门
+      if (params.deptId instanceof Array) {
+        params.deptId = params.deptId[params.deptId.length - 1];
+      }
+
+      // 处理状态
+      params.status = this.status ? 1 : 0;
+      if (this.dialogForm.bvId) {
         let res = await editVirtual(params);
         if (res.code == 0) {
           this.$message.success("修改成功！");
           this.reload();
         }
       } else {
-        let params = { ...this.dialogForm };
-        // 回填图片
-        if (this.faceImage.length > 0) {
-          params.faceImage = this.faceImage[0].fileId;
-        }
-        // 处理行政区划
-        params.regionCode = params.regionCode[params.regionCode.length - 1];
-        // 处理所属部门
-        params.deptId = params.deptId[params.deptId.length - 1];
-        // 处理状态
-        params.status = this.status ? 1 : 0;
+        // let params = { ...this.dialogForm };
+        // // // 回填图片
+        // // if (this.faceImage.length > 0) {
+        // //   params.faceImage = this.faceImage[0].fileId;
+        // // }
+        // // 处理行政区划
+        // params.regionCode = params.regionCode[params.regionCode.length - 1];
+        // // 处理所属部门
+        // params.deptId = params.deptId[params.deptId.length - 1];
+        // // 处理状态
+        // params.status = this.status ? 1 : 0;
         // return
         let res = await addVirtual(params);
         if (res.code == 0) {