From de42c8e66e2303b46741fa66dc72f4b4183f8084 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 12:00:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 9 +--------
Source/UBCS-WEB/src/components/file/main.vue | 9 +--------
Source/UBCS-WEB/src/util/func.js | 13 ++++++++++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 1 +
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index 3525361..267b33b 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -135,14 +135,7 @@
exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':ids,...exportArr}).then(res=>{
// console.log('res',res)
if(res){
- const fileNames = res.headers['content-disposition'].split(";");
- let characterSet = fileNames[2].split("filename*=")[1];
- let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); // 涓嬭浇鐨勬枃浠跺悕
- let blob = new Blob([res.data], {
- type: res.data.type + ";charset=utf-8",
- });
- func.downloadFileByBlob(blob,fileName);
- window.URL.revokeObjectURL(src); //閲婃斁鎺塨lob瀵硅薄
+ func.downloadFileByBlob(res);
}
})
diff --git a/Source/UBCS-WEB/src/components/file/main.vue b/Source/UBCS-WEB/src/components/file/main.vue
index 1aa1f8b..abf9230 100644
--- a/Source/UBCS-WEB/src/components/file/main.vue
+++ b/Source/UBCS-WEB/src/components/file/main.vue
@@ -395,14 +395,7 @@
download(data).then(res=>{
// console.log(res);
if(res){
- const fileNames = res.headers['content-disposition'].split(";");
- let characterSet = fileNames[2].split("filename*=")[1];
- let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); // 涓嬭浇鐨勬枃浠跺悕
- let blob = new Blob([res.data], {
- type: res.data.type + ";charset=utf-8",
- });
- func.downloadFileByBlob(blob,fileName);
- window.URL.revokeObjectURL(src); //閲婃斁鎺塨lob瀵硅薄
+ func.downloadFileByBlob(res);
}
});
},
diff --git a/Source/UBCS-WEB/src/util/func.js b/Source/UBCS-WEB/src/util/func.js
index 1a95b3b..eb37dd5 100644
--- a/Source/UBCS-WEB/src/util/func.js
+++ b/Source/UBCS-WEB/src/util/func.js
@@ -115,13 +115,20 @@
* @param value
* @returns {Boolean}
*/
- static downloadFileByBlob(blobData, name) {
- const url = URL.createObjectURL(blobData); // 鐢熸垚涓嬭浇閾炬帴
+ static downloadFileByBlob(res) {
+ const fileNames = res.headers['content-disposition'].split(";");
+ let characterSet = fileNames[2].split("filename*=")[1];
+ let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet); // 涓嬭浇鐨勬枃浠跺悕
+ let blob = new Blob([res.data], {
+ type: res.data.type + ";charset=utf-8",
+ });
+ const url = URL.createObjectURL(blob); // 鐢熸垚涓嬭浇閾炬帴
const link = document.createElement("a");
link.href = url;
- link.download = name; // 鎸囧畾鏂囦欢鍚嶅拰鏍煎紡
+ link.download = fileName; // 鎸囧畾鏂囦欢鍚嶅拰鏍煎紡
document.body.appendChild(link); // 娣诲姞涓嬭浇閾炬帴鍒伴〉闈�
link.click(); // 瑙﹀彂涓嬭浇
document.body.removeChild(link); //鍒犻櫎涓嬭浇
+ window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 998564e..0de9edd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -853,6 +853,7 @@
if(pageHelper.getLimit() != -1){
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
+ query.setDescs("versionValue");
}
// List<CodeClstemplateVO> doList = codeClstemplateMapper.selectPlCodeClstemplatePage(Condition.getPage(query), codeClstemplateVO);
--
Gitblit v1.9.3