From aa4e56655cb20caaeefb308d4a1237b0e309d6c5 Mon Sep 17 00:00:00 2001 From: tdg930622 <51816549+tdg930622@users.noreply.github.com> Date: Thu, 26 Dec 2024 10:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .npmrc | 2 ++ package-lock.json | 19 ++++++++-- package.json | 1 + src/main.js | 2 ++ .../components/caseMaterial.vue | 9 +++-- .../components/caseMaterialLeft.vue | 35 ++++++++++--------- 6 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..8d464fe --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@trydo:registry=http://139.155.124.81:8081/nexus/repository/trydo-npm/ +registry=https://registry.npmmirror.com diff --git a/package-lock.json b/package-lock.json index 852d57d..e87a546 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1418,6 +1418,15 @@ "integrity": "sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==", "dev": true }, + "@trydo/files-utils": { + "version": "0.1.19-alpha", + "resolved": "http://139.155.124.81:8081/nexus/repository/trydo-npm/@trydo/files-utils/-/files-utils-0.1.19-alpha.tgz", + "integrity": "sha512-E+yMt6C37g4WRGRdWNbFXYN2a5KgtfLVvLMf6mKXfoObtHWXbokoeudYoD4Q5Vq7gngxO1yqrgo4u/I6Fy7AOQ==", + "dev": true, + "requires": { + "spark-md5": "^3.0.2" + } + }, "@types/glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", @@ -15424,7 +15433,6 @@ "optional": true, "requires": { "bindings": "^1.5.0", - "nan": "^2.12.1", "node-pre-gyp": "*" }, "dependencies": { @@ -17026,8 +17034,7 @@ "nan": { "version": "2.5.1", "resolved": "https://registry.npmmirror.com/nan/-/nan-2.5.1.tgz", - "integrity": "sha512-Mvo2RwemW12NRql4qU21+Sdtu8CAfn2RaCp8+p6N+4oQQvAM1DfO9R/ZyJOJaLdsMLHw84WJEo2AKZar4KANXA==", - "optional": true + "integrity": "sha512-Mvo2RwemW12NRql4qU21+Sdtu8CAfn2RaCp8+p6N+4oQQvAM1DfO9R/ZyJOJaLdsMLHw84WJEo2AKZar4KANXA==" }, "natural-compare": { "version": "1.4.0", @@ -19285,6 +19292,12 @@ "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", "dev": true }, + "spark-md5": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/spark-md5/-/spark-md5-3.0.2.tgz", + "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==", + "dev": true + }, "spdx-correct": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", diff --git a/package.json b/package.json index bc2c85d..35e596f 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "vuex-persistedstate": "^4.0.0-beta.3" }, "devDependencies": { + "@trydo/files-utils": "^0.1.19-alpha", "@vue/cli-plugin-babel": "~4.3.0", "@vue/cli-plugin-eslint": "~4.3.0", "@vue/cli-service": "~4.3.0", diff --git a/src/main.js b/src/main.js index 44a8b5d..b5ab6ff 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,7 @@ import ElementUI from 'element-ui'; import './assets/style/element-ui-variable.scss' // import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/icon.css' +import {TrydoFiles} from "@trydo/files-utils" Vue.use(ElementUI); @@ -29,6 +30,7 @@ Vue.prototype.$util = util; Vue.prototype.$verify = verify; Vue.prototype.$clickThrottle = clickThrottle; Vue.prototype.$echarts = echarts; +Vue.prototype.$TrydoFiles = TrydoFiles; // vue使用vue-meta-info来动态设置标题 Vue.use(MetaInfo) diff --git a/src/pages/mediation-page/components/caseMaterial.vue b/src/pages/mediation-page/components/caseMaterial.vue index 5b06ee2..e59aca3 100644 --- a/src/pages/mediation-page/components/caseMaterial.vue +++ b/src/pages/mediation-page/components/caseMaterial.vue @@ -126,9 +126,12 @@ export default { }).catch(() => {}); }, handleDownload(item) { - let url = item.fullUrl + `&response-content-disposition=attachment;filename="${item.name}"` - console.log(url, '---url') - this.$util.downloadFileByUrl(url, item.name) + const downloadTask = this.$TrydoFiles.download(item.fullUrl, item.name) + .build() + .start(); + // let url = item.fullUrl + `&response-content-disposition=attachment;filename="${item.name}"` + // console.log(url, '---url') + // this.$util.downloadFileByUrl(url, item.name) // fetchApi.downFile({ // path: item.url, // fileName: item.name diff --git a/src/pages/mediation-page/components/caseMaterialLeft.vue b/src/pages/mediation-page/components/caseMaterialLeft.vue index 68268d7..7712c55 100644 --- a/src/pages/mediation-page/components/caseMaterialLeft.vue +++ b/src/pages/mediation-page/components/caseMaterialLeft.vue @@ -9,7 +9,7 @@
- +
{{item.materialType}} {{item.createBy + ' ' + item.createAt}} @@ -72,27 +72,27 @@ export default { await this.getList(); }, methods:{ - reg_img(fileUrl) { - if(fileUrl==null||fileUrl=='') { - return fileUrl + reg_img(item) { + if(item.url==null||item.url=='') { + return item.fullUrl } // console.log(/.(xls|xlsx)$/.test(fileUrl.toLowerCase()),'111') - if(/.(pdf)$/.test(fileUrl.toLowerCase())) { + if(/.(pdf)$/.test(item.url.toLowerCase())) { return require('@/assets/image/util/pdf_img.jpg') } - else if(/.(xls|xlsx)$/.test(fileUrl.toLowerCase())) { + else if(/.(xls|xlsx)$/.test(item.url.toLowerCase())) { return require('@/assets/image/util/excel_img.jpg') } - else if(/.(doc|docx)$/.test(fileUrl.toLowerCase())) { + else if(/.(doc|docx)$/.test(item.url.toLowerCase())) { return require('@/assets/image/util/word_img.jpg') } - else if(/.(zip|rar)$/.test(fileUrl.toLowerCase())) { + else if(/.(zip|rar)$/.test(item.url.toLowerCase())) { return require('@/assets/image/util/yswj.jpg') } else { // let previewUrl = `/mediate/minio/preview/${fileUrl}` // return service.service.serviceurl+fileUrl - return fileUrl + return item.fullUrl } }, // 列表数据 @@ -142,13 +142,16 @@ export default { }).catch(() => {}); }, handleDownload(item) { - fetchApi.downFile({ - path: item.url, - fileName: item.name - }).then(res => { - console.log(res) - this.$util.downloadFileByBlob(res, item.name) - }) + const downloadTask = this.$TrydoFiles.download(item.fullUrl, item.name) + .build() + .start(); + // fetchApi.downFile({ + // path: item.url, + // fileName: item.name + // }).then(res => { + // console.log(res) + // this.$util.downloadFileByBlob(res, item.name) + // }) } } }