scorpio 2 rokov pred
rodič
commit
ea40c2ac25

+ 0 - 1
src/api/fetch.js

@@ -92,7 +92,6 @@ function fetch(
     axios(requestParams)
       .then(success)
       .catch(err => {
-        console.log(err)
         if (
           /502|503|504/.test(err.message) ||
           (err + '').indexOf('timeout') > -1

+ 7 - 5
src/views/resource/component/archives.vue

@@ -359,12 +359,14 @@ export default {
         if (valid) {
           this.from.folderId = this.folderId
           this.$api.resource.fileArchives(this.from).then(res => {
-            if (Object.hasOwn(res, 'code')) {
-              this.$message.error(res.msg)
-              return
+            console.log(res)
+            console.log(typeof res === 'object')
+            if (res.type === 'application/json') {
+              this.$message.error('该文件夹下无文件或者文件夹,无法归档')
+            } else {
+              this.$emit('refresh')
+              this.download(res)
             }
-            this.$emit('refresh')
-            this.download(res)
           })
         }
       })

+ 1 - 0
src/views/resource/component/move.vue

@@ -157,6 +157,7 @@ export default {
       this.loading = true
       this.topFolder = true
       const data = {
+        projectId: this.projectId,
         stageId: this.stageId,
         dictKey: 1,
         current: this.page.current,

+ 1 - 1
src/views/resource/component/search.vue

@@ -145,7 +145,7 @@ export default {
     },
     closeDialog() {
       this.searchForm.keyword = ''
-      this.resultList = []
+      this.resultList.length = 0
       this.total = 0
     }
   }