From bc8e3fc5095cfc7cd60b928875b84cdbb14b54ed Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 18 十二月 2024 15:23:32 +0800
Subject: [PATCH] 1
---
src/views/mdc/processParam/index.vue | 6 +-
src/views/console/basic-data/tpmComp1.vue | 6 +-
src/views/master/person/main/personPost.vue | 4 +-
src/utils/tool.js | 17 +++++++-
src/views/mdc/output-statistics.vue | 4 +-
src/layout/components/importTable.vue | 2
src/views/console/basic-data/work-process.vue | 4 +-
src/views/console/basic-data/product.vue | 4 +-
src/views/master/person/main/personDepartment.vue | 4 +-
src/views/console/workstation/index.vue | 2
src/views/mdc/status-record.vue | 4 +-
src/views/master/person/main/personPerson.vue | 4 +-
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue | 6 +-
src/views/console/basic-data/tpmComp2.vue | 6 +-
src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue | 6 +-
src/views/mdc/alarm-statistics.vue | 4 +-
src/views/console/basic-data/tpm-data-header.vue | 6 +-
src/views/mdc/efficiency-analysis.vue | 4 +-
src/views/mdc/time-analysis.vue | 6 +-
19 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/src/layout/components/importTable.vue b/src/layout/components/importTable.vue
index 791d1a5..241c70b 100644
--- a/src/layout/components/importTable.vue
+++ b/src/layout/components/importTable.vue
@@ -54,7 +54,7 @@
exportBtn() {
this.$HTTP.get(this.exportUrl).then(res=> {
if(res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/utils/tool.js b/src/utils/tool.js
index c552091..233d20d 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -2,7 +2,7 @@
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-12 20:33:31
+ * @LastEditTime: 2024-12-18 15:11:50
*/
import CryptoJS from 'crypto-js';
@@ -271,5 +271,18 @@
return `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`;
}).join('&');
}
-
+// 涓嬭浇鏂囦欢
+tool.downFile = function(link,fileName) {
+ const x = new XMLHttpRequest();
+ x.open('GET', link, true);
+ x.responseType = 'blob';
+ x.onload = function () {
+ const url = window.URL.createObjectURL(x.response);
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = fileName;
+ a.click();
+ }
+ x.send();
+}
export default tool
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
index 15a456b..b4b305e 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-08 21:29:53
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-16 14:41:35
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:22:31
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
-->
<template>
@@ -256,7 +256,7 @@
getExport() {
this.$HTTP.post(`/api/smis/material/export-material`, { ...this.params }).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
}).catch(() => { })
},
diff --git a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
index 2b604f4..1a036f4 100644
--- a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
+++ b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-07 22:51:22
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-16 16:17:19
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:21:11
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
-->
<template>
@@ -275,7 +275,7 @@
getExport() {
this.$HTTP.post(`/api/smis/warehouse-station/export-station`, { ...this.params }).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
}).catch(() => { })
},
diff --git a/src/views/console/basic-data/product.vue b/src/views/console/basic-data/product.vue
index 3dc9972..4ad8fd7 100644
--- a/src/views/console/basic-data/product.vue
+++ b/src/views/console/basic-data/product.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-02 17:48:31
+ * @LastEditTime: 2024-12-18 15:21:16
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -362,7 +362,7 @@
getExport() {
this.$HTTP.post(`/api/smis/product/export-product`,this.searchData).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/console/basic-data/tpm-data-header.vue b/src/views/console/basic-data/tpm-data-header.vue
index 646a164..47a6024 100644
--- a/src/views/console/basic-data/tpm-data-header.vue
+++ b/src/views/console/basic-data/tpm-data-header.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-06-16 19:51:01
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-23 19:53:09
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:15:52
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/tpm-data-header.vue
-->
<template>
@@ -142,7 +142,7 @@
exportData() {
this.$HTTP.post(this.exportUrl, this.params).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
}
diff --git a/src/views/console/basic-data/tpmComp1.vue b/src/views/console/basic-data/tpmComp1.vue
index dac37fb..f3b5978 100644
--- a/src/views/console/basic-data/tpmComp1.vue
+++ b/src/views/console/basic-data/tpmComp1.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-06-23 19:58:50
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-23 21:07:31
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:16:47
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/tpmComp1.vue
-->
<template>
@@ -266,7 +266,7 @@
exportData() {
this.$HTTP.post(`/api/smis/check-project/excel/export`, {}, { params: this.params }).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/console/basic-data/tpmComp2.vue b/src/views/console/basic-data/tpmComp2.vue
index e525b0b..3890934 100644
--- a/src/views/console/basic-data/tpmComp2.vue
+++ b/src/views/console/basic-data/tpmComp2.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-06-23 21:32:05
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-23 23:47:43
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:17:16
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/tpmComp2.vue
-->
<template>
@@ -360,7 +360,7 @@
exportData() {
this.$HTTP.post(`/api/smis/device-types/excel/export`, {}, { params: this.params }).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/console/basic-data/work-process.vue b/src/views/console/basic-data/work-process.vue
index d159fba..e8553f7 100644
--- a/src/views/console/basic-data/work-process.vue
+++ b/src/views/console/basic-data/work-process.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-24 18:18:17
+ * @LastEditTime: 2024-12-18 15:21:23
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -304,7 +304,7 @@
getExport() {
this.$HTTP.get(`/api/smis/process/export-process?keyword=&status=1`).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index e41d64a..93f98e2 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -478,7 +478,7 @@
workstationId: this.previewData.id
})).then(res => {
if (res.code == 200) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/master/person/main/personDepartment.vue b/src/views/master/person/main/personDepartment.vue
index 8292672..08e8a89 100644
--- a/src/views/master/person/main/personDepartment.vue
+++ b/src/views/master/person/main/personDepartment.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-24 18:37:07
+ * @LastEditTime: 2024-12-18 15:13:46
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -115,7 +115,7 @@
getExport() {
this.$HTTP.get(`/api/smis/organization/export-organization?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
if(res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index 7b84259..f2ce62d 100644
--- a/src/views/master/person/main/personPerson.vue
+++ b/src/views/master/person/main/personPerson.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-04 11:02:26
+ * @LastEditTime: 2024-12-18 15:11:30
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/master/person/main/personPerson.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -247,7 +247,7 @@
getExport() {
this.$HTTP.get(`/api/smis/employee/export-employee?` + this.$TOOL.qsStringify(this.searchData)).then(res => {
if (res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/master/person/main/personPost.vue b/src/views/master/person/main/personPost.vue
index 98dad44..e58e445 100644
--- a/src/views/master/person/main/personPost.vue
+++ b/src/views/master/person/main/personPost.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-10 15:44:08
+ * @LastEditTime: 2024-12-18 15:13:20
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -110,7 +110,7 @@
getExport() {
this.$HTTP.get(`/api/blade-system/post/export-post?`+this.$TOOL.qsStringify(this.postSearchData)).then(res=> {
if(res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/mdc/alarm-statistics.vue b/src/views/mdc/alarm-statistics.vue
index f07bb57..c7640ce 100644
--- a/src/views/mdc/alarm-statistics.vue
+++ b/src/views/mdc/alarm-statistics.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-04 13:39:09
+ * @LastEditTime: 2024-12-18 15:20:51
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/alarm-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -138,7 +138,7 @@
workstationId: this.treeChecked.toString()
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index aa82aff..d916657 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-04 12:23:49
+ * @LastEditTime: 2024-12-18 15:21:29
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -222,7 +222,7 @@
workStationIdList: this.treeChecked
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 64fbd66..7cadf64 100644
--- a/src/views/mdc/output-statistics.vue
+++ b/src/views/mdc/output-statistics.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-04 12:24:06
+ * @LastEditTime: 2024-12-18 15:20:45
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/output-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -214,7 +214,7 @@
workStationIdList: this.treeChecked
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index d0d7983..1308f40 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-11-13 20:20:54
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-12-18 15:20:37
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -165,7 +165,7 @@
workstationName: ''
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 07fb412..03f6f9d 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-08 16:34:22
+ * @LastEditTime: 2024-12-18 15:21:51
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -228,7 +228,7 @@
}
this.$HTTP.post(`/api/mdc/status-record/excel/export`,obj).then(res=> {
if(res.code == 200) {
- window.open(res.data.link);
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
}
})
},
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 6cc39f7..444e1ba 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-08 18:13:17
+ * @LastEditTime: 2024-12-18 15:21:44
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -385,7 +385,7 @@
ids
}).then(res => {
if (res.success) {
- window.open(res.data.link)
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
} else {
this.$message.error(res.msg)
}
@@ -663,7 +663,7 @@
// }
// this.$HTTP.post(`/api/mdc/time-used-analysis/excel/export`,obj).then(res=> {
// if(res.code == 200) {
- // window.open(res.data.link);
+ //
// }
// })
},
--
Gitblit v1.9.3