diff --git a/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue index b8d03a1..ea6ed2a 100644 --- a/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue @@ -2,16 +2,14 @@
- - Save All - + Save All
Save as Txt Save as Excel - Save as Html +
@@ -25,13 +23,13 @@ export default { components: { TitleOverBorder }, props: { value: { - type: Boolean - } + type: Boolean, + }, }, data() { return { saveAll: false, - saveFormat: 'txt' + saveFormat: 'txt', } }, methods: { @@ -42,7 +40,7 @@ export default { handleOk() { this.$emit('save', this.saveFormat) - } + }, }, computed: { visible: { @@ -55,9 +53,9 @@ export default { } return this.value - } - } - } + }, + }, + }, } diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index 8076147..b423f07 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -1193,7 +1193,6 @@ export default { this.channelData.baseLineCP = shapeChannelData this.energyData.baseLineCP = shapeEnergyData this.redrawCtrlPointBySeriesName() - }, // 显示比较弹窗 @@ -1475,7 +1474,6 @@ export default { watch: { currStep: { handler(val) { - console.log('dfad', val) if (val && val == '0') { this.abc = true this.reprocessingModalVisible = true @@ -1496,7 +1494,6 @@ export default { }, updateFlag: { handler(val) { - console.log('dfad', val) this.newCheckBox_updateCal = val }, immediate: true, diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 17e0fa0..029423d 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -481,30 +481,39 @@ export default { // 保存结果到文件, 服务端生成文件,前端下载 async handleSaveResultsToFile(saveFormat) { - const url = - saveFormat == 'xls' - ? '/spectrumAnalysis/saveToExcel' - : saveFormat == 'txt' - ? '/spectrumAnalysis/saveToTxt' - : saveFormat == 'html' - ? '/spectrumAnalysis/saveToHTML' - : '' - if (!this.resultDisplayFlag) { - this.$message.warn('Please Analyse Spectrum First') - return + if (this.isGamma) { + const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : '' + let params = { + fileName: this.newSampleData.inputFileName, + } + downloadFile(url, `result.${saveFormat}`, params, 'get') } + if (this.isBetaGamma) { + const url = + saveFormat == 'xls' + ? '/spectrumAnalysis/saveToExcel' + : saveFormat == 'txt' + ? '/spectrumAnalysis/saveToTxt' + : saveFormat == 'html' + ? '/spectrumAnalysis/saveToHTML' + : '' + if (!this.resultDisplayFlag) { + this.$message.warn('Please Analyse Spectrum First') + return + } - this.resultDisplayFlag.forEach((item) => { - this.params_toDB[`${item.nuclideName.toLowerCase()}Flag`] = item.nidFlag - }) + this.resultDisplayFlag.forEach((item) => { + this.params_toDB[`${item.nuclideName.toLowerCase()}Flag`] = item.nidFlag + }) - this.params_toDB.sampleFileName = this.newSampleData.inputFileName - this.params_toDB.gasFileName = this.newSampleData.gasFileName - this.params_toDB.detFileName = this.newSampleData.detFileName - this.params_toDB.qcFileName = this.newSampleData.qcFileName - this.params_toDB.dbName = this.newSampleData.dbName + this.params_toDB.sampleFileName = this.newSampleData.inputFileName + this.params_toDB.gasFileName = this.newSampleData.gasFileName + this.params_toDB.detFileName = this.newSampleData.detFileName + this.params_toDB.qcFileName = this.newSampleData.qcFileName + this.params_toDB.dbName = this.newSampleData.dbName - downloadFile(url, `result.${saveFormat}`, this.params_toDB, 'post') + downloadFile(url, `result.${saveFormat}`, this.params_toDB, 'post') + } }, /** @@ -572,6 +581,13 @@ export default { */ handleSavePHDToFile(type) { console.log('%c [ savePHDToFile ]-162', 'font-size:13px; background:pink; color:#bf2c9f;', type) + if (this.isGamma) { + const url = '/gamma/saveToPHD' + let params = { + fileName: this.newSampleData.inputFileName, + } + downloadFile(url, `result.PHD`, params, 'get') + } }, handleReprocessAll() { @@ -797,6 +813,7 @@ export default { }, on: { menuClick: () => { + console.log(this.isBetaGamma, this.isGamma) this.saveSettingModalVisible = true }, submenuClick: ({ item, child }) => {