wansfa il y a 1 an
Parent
commit
23b3f21ba4
2 fichiers modifiés avec 22 ajouts et 18 suppressions
  1. 5 2
      src/api/store/material.js
  2. 17 16
      src/components/Material/index.vue

+ 5 - 2
src/api/store/material.js

@@ -20,9 +20,12 @@ export function getMaterial(id) {
 // 新增素材库
 export function addMaterial(data) {
   return request({
-    url: '/qw/material/add',
+    url: '/qw/material',
     method: 'post',
-    data: data
+    data: data,
+    Headers:{
+      'Content-Type': 'multipart/form-data'
+    }
   })
 }
 

+ 17 - 16
src/components/Material/index.vue

@@ -74,7 +74,7 @@
                     :on-progress="handleProgress"
                     :before-upload="beforeUpload"
                     :on-success="handleSuccess"
-                    :data="{type: 1}"
+                    :data="multipartFile"
                     multiple
                   >
                     <el-button size="small" type="primary">批量上传</el-button>
@@ -178,7 +178,8 @@ export default {
   },
   data() {
     return {
-      uploadUrl:process.env.VUE_APP_BASE_API+"/qw/material/add",
+      multipartFile:{deviceId:"4eea1292408044beb49c02d3197871b0"},
+      uploadUrl:process.env.VUE_APP_BASE_API+"/common/qwUploadOSS",
       dialogVisible: false,
       url: '',
       listDialogVisible: false,
@@ -314,7 +315,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        delMaterial(item.materialId)
+        delMaterial(item.id)
           .then(function() {
             that.queryParams.pageNum=0;
             that.getMaterialList();
@@ -324,19 +325,19 @@ export default {
     handleProgress(event, file, fileList) {
     },
     handleSuccess(response, file, fileList) {
-      // const that = this
-      // addMaterial({
-      //   type: '1',
-      //   groupId: this.queryParams.groupId,
-      //   name: file.name,
-      //   url: response.url
-      // }).then(() => {
-      //   this.resultNumber++
-      //   if (fileList.length === this.resultNumber) {
-      //     that.getMaterialList()
-      //     this.resultNumber = 0
-      //   }
-      // })
+      const that = this
+      addMaterial({
+        groupId: this.queryParams.groupId,
+        fileName: file.name,
+        url: response.url,
+        data:response.data
+      }).then(() => {
+        this.resultNumber++
+        if (fileList.length === this.resultNumber) {
+          that.getMaterialList()
+          this.resultNumber = 0
+        }
+      })
     },
     beforeUpload(file) {
       const isPic =