From acb93dd817155dd7af8072b0888bbfe396e5a8cf Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Wed, 20 Sep 2023 18:58:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E6=8E=A5=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/file.js | 33 ++++++++++++++++ .../AutomaticAnalysisLogModal.vue | 6 ++- .../Modals/ConfigUserLibraryModal.vue | 39 +++++++++++++++++-- .../Modals/EfficiencyCalibrationModal.vue | 35 +++++++++++++++-- .../Modals/EnergyCalibrationModal.vue | 33 ++++++++++++++-- .../Modals/ResolutionCalibrationModal.vue | 31 +++++++++++++-- 6 files changed, 162 insertions(+), 15 deletions(-) create mode 100644 src/utils/file.js diff --git a/src/utils/file.js b/src/utils/file.js new file mode 100644 index 0000000..60c4ac9 --- /dev/null +++ b/src/utils/file.js @@ -0,0 +1,33 @@ +import { Modal } from 'ant-design-vue' +import { saveAs } from 'file-saver' + +/** + * 弹窗填入文件名保存文件 + * @param {Blob} data 数据 + * @param {string} ext 扩展名,不带. + */ +export const showSaveFileModal = (data, ext) => { + let fileName = '' + const handleClick = event => { + fileName = event.target.value + } + + Modal.confirm({ + title: 'Please enter file name', + content: h => , + okText: 'Cancle', + cancelText: 'Save', + okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } }, + cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } }, + onOk() { + console.log('Cancel') + }, + onCancel() { + if (fileName) { + saveAs(data, `${fileName}.${ext}`) + } else { + throw new Error() + } + } + }) +} diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue index a53d2d0..739bb2b 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue @@ -41,7 +41,11 @@ export default { const res = await getAction(this.type == 1 ? '/gamma/viewAutomaticAnalysisLog' : '/gamma/viewAutomaticAnalysisLog', { // 自动分析日志接口暂用都是gammam,beta暂时没有 sampleId }) - this.content = "" + if(typeof res == 'string') { + this.content = res + } else if(typeof res == 'object') { + this.$message.error(res.message) + } } catch (error) { console.error(error) } finally { diff --git a/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue b/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue index e2ca10b..62c74fe 100644 --- a/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue @@ -18,11 +18,11 @@
- Default + Default Load
- Save + Save Apply
@@ -33,14 +33,17 @@