From 1a849ec33694d5bbfe7447904026ee6247a88ffb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Mon, 30 Oct 2023 19:53:55 +0800
Subject: [PATCH] =?UTF-8?q?gamma=20=E7=9A=84=20Save=20Results=20to=20File?=
 =?UTF-8?q?=20save=20All=20=20=E5=8A=9F=E8=83=BD=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/SaveSettingModal.vue    |  2 +-
 src/views/spectrumAnalysis/gamma-analysis.vue |  1 -
 src/views/spectrumAnalysis/index.vue          | 47 ++++++++++++-------
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue
index ea6ed2a..70cc35d 100644
--- a/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue
@@ -39,7 +39,7 @@ export default {
     },
 
     handleOk() {
-      this.$emit('save', this.saveFormat)
+      this.$emit('save', this.saveFormat, this.saveAll)
     },
   },
   computed: {
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 91d6c94..8e5c698 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -413,7 +413,6 @@ export default {
     },
 
     initWebSocket: function () {
-      console.log('qweqwerq')
       // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
       var userId = store.getters.userInfo.id
       var url =
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 05014d0..e25da83 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -419,7 +419,6 @@ export default {
       this.isReAnalyed_gamma = val
     },
     getUpdateFlag(val) {
-      console.log('qerq', val)
       this.updateFlag = val
     },
     getcommentsInfo(val) {
@@ -502,19 +501,38 @@ export default {
     },
 
     // 保存结果到文件， 服务端生成文件，前端下载
-    async handleSaveResultsToFile(saveFormat) {
+    async handleSaveResultsToFile(saveFormat, isSaveAll = false) {
       this.isSaving = true
       if (this.isGamma) {
-        const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
-        let params = {
-          fileName: this.newSampleData.inputFileName,
-        }
-        try {
-          await fetchAndDownload(url, params, 'get')
-        } catch (error) {
-          console.error(error)
-        } finally {
-          this.isSaving = false
+        if (!isSaveAll) {
+          const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
+          let params = {
+            fileName: this.newSampleData.inputFileName,
+          }
+          try {
+            await fetchAndDownload(url, params, 'get')
+          } catch (error) {
+            console.error(error)
+          } finally {
+            this.isSaving = false
+          }
+        } else {
+          let list = this.sampleList.filter((item) => item.sampleType !== 'B')
+          if (list.length > 0) {
+            list.forEach(async (item) => {
+              const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
+              let params = {
+                fileName: item.inputFileName,
+              }
+              try {
+                await fetchAndDownload(url, params, 'get')
+              } catch (error) {
+                console.error(error)
+              } finally {
+                this.isSaving = false
+              }
+            })
+          }
         }
       }
       if (this.isBetaGamma) {
@@ -722,7 +740,6 @@ export default {
       }
       postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
         if (res.success) {
-          console.log(res)
           this.analyseCurrentSpectrumData = res.result
           this.resultDisplayFlag = res.result.XeData
           this.resultDisplayFlag.forEach((item) => {
@@ -886,14 +903,11 @@ export default {
               },
               on: {
                 menuClick: () => {
-                  console.log(this.isBetaGamma, this.isGamma)
                   if (this.isGamma) {
                     this.saveSettingModalVisible = true
                   }
                 },
                 submenuClick: ({ item, child }) => {
-                  console.log('item, child', item, child)
-                  debugger
                   if (item.key == 'resultsToDB') {
                     this.handleSaveResultsToDB(child.key)
                   } else if (item.key == 'phdToFile') {
@@ -1099,7 +1113,6 @@ export default {
                   type: 'a-menu-item',
                   title: 'ARR',
                   handler: () => {
-                    console.log(this.newSampleData)
                     if (this.newSampleData.sampleId) {
                       this.arrOrRRRModalVisible = true
                       this.arrOrRRRModalExtraData = {}