Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev

4 years ago · 9bdd9ba3b6
3 changed files with 2 additions and 19714 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,4 +15,5 @@ hs_err_pid*
 node_modules
 dist
 epmet-oper
+package-lock.json
 .idea/
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@ -463,7 +463,7 @@ export default {
        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
        method: 'post',
        data: formData,
-        timeout: '300000',
+        timeout: '900000',
        responseType: 'blob'
      })
        .then((res) => {