Merge remote-tracking branch 'origin/master'

src/assets/styles/btn.scss

@@ -114,7 +114,7 @@
     border: 1px solid #5BB647!important;
     color: #FFFFFF!important;
   }
-  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+  &.is-disabled.el-button.el-button--default,&.is-disabled.el-button.el-button--default:hover,&.is-disabled.el-button.el-button--default:focus,&.permi-disabled.el-button.el-button--default,&.permi-disabled.el-button.el-button--default:hover,&.permi-disabled.el-button.el-button--default:focus{
     background: #83C374!important;
     color: #FFFFFF!important;
     border: 1px solid #83C374!important;
@@ -197,7 +197,7 @@
     color: #FFFFFF!important;
     border: 1px solid #55A343!important;
   }
-  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+  &.is-disabled.el-button.el-button--default,&.is-disabled.el-button.el-button--default:hover,&.is-disabled.el-button.el-button--default:focus,&.permi-disabled.el-button.el-button--default,&.permi-disabled.el-button.el-button--default:hover,&.permi-disabled.el-button.el-button--default:focus{
     background: #83C374!important;
     color: #FFFFFF!important;
     border: 1px solid #83C374!important;

src/components/FileUpload/index.vue

@@ -194,11 +194,15 @@ export default {
     },
     // 获取展示文件名称
     getShowFileName(name) {
-      if (name.lastIndexOf('-') > -1) {
-        return name.substring(name.lastIndexOf('-') + 1)
+      const keyword = '-'
+      const index = name.indexOf(keyword, name.indexOf(keyword) + 1)
+      let result = ''
+      if (index !== -1) {
+        result = name.substring(index + keyword.length)
       } else {
-        return ''
+        result = 'aa.pdf'
       }
+      return result
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {

src/plugins/download.js

@@ -26,7 +26,7 @@ export default {
     })
   },
   resource(resource) {
-    var url = baseURL + '/common/download/resource?resource=' + encodeURIComponent(resource)
+    var url = baseURL + 'business/common/downloadMinio?url=' + encodeURIComponent(resource)
     axios({
       method: 'get',
       url: url,
@@ -36,7 +36,16 @@ export default {
       const isBlob = blobValidate(res.data)
       if (isBlob) {
         const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+        const url = res.config['url']
+        const keyword = '-'
+        const index = url.indexOf(keyword, url.indexOf(keyword, url.indexOf(keyword) + 1) + 1)
+        let result = ''
+        if (index !== -1) {
+          result = url.substring(index + keyword.length)
+        } else {
+          result = 'aa.pdf'
+        }
+        this.saveAs(blob, decodeURIComponent(result))
       } else {
         this.printErrMsg(res.data)
       }