merge fix

src/api/params/index.js

@@ -1,40 +1,40 @@
 import fetch from '../fetch.js'
 
 export default {
-    /**
+  /**
      * @param params
      * @returns {Promise | Promise<unknown>}
      */
-    getListByKey(params) {
-        return fetch('/wutong-parse-file/excel-dict/parent-list', {
-            clientId: 'project_web',
-            size: 999,
-            current: 1,
-            ...params
-        })
-    },
-    /**
+  getListByKey (params) {
+    return fetch('/wutong-parse-file/excel-dict/parent-list', {
+      clientId: 'project_web',
+      size: 999,
+      current: 1,
+      ...params
+    })
+  },
+  /**
      * 项目导出
      */
-    exportResult(params) {
-        return fetch('/blade-project-manage-v2/project/v2/projectExport', params, 'post', 'json', {}, 'blob')
-    },
-    /**
+  exportResult (params) {
+    return fetch('/blade-project-manage-v2/project/v2/projectExport', params, 'post', 'json', {}, 'blob')
+  },
+  /**
      * 汇总数据导出
      */
-    summaryExport(params) {
-        return fetch('/blade-project-manage-v2/project/v2/aggregateDataExport', params, 'post', 'json')
-    },
-    /**
+  summaryExport (params) {
+    return fetch('/blade-project-manage-v2/project/v2/aggregateDataExport', params, 'post', 'json')
+  },
+  /**
      * 字段搜索
      */
-    getParamByName(params) {
-        return fetch('/wutong-parse-file/excel-dict/parent-list', {
-            clientId: 'project_web',
-            size: 999,
-            current: 1,
-            ...params
-        })
-    }
+  getParamByName (params) {
+    return fetch('/wutong-parse-file/excel-dict/parent-list', {
+      clientId: 'project_web',
+      size: 999,
+      current: 1,
+      ...params
+    })
+  }
 
 }

src/views/home/component/dash.vue

@@ -436,7 +436,6 @@ export default {
     exportExcel (res) {
       const data = Object.assign(this.queryData, { columnName: res, projectIds: this.selectList.join(',') })
       this.$api.params.exportResult(data).then(res => {
-        console.log(res)
         if (res.hasOwnProperty('code')) {
           this.$message.error(res.msg)
           return
@@ -451,7 +450,6 @@ export default {
           this.$message.error(res.msg)
           return
         }
-        console.log(res)
         this.download(res)
       })
     },