From aa6ac23fd50524a882a92629309a24d44b73f69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <renpy@yuanian.com>
Date: Mon, 16 Oct 2023 16:12:04 +0800
Subject: [PATCH] =?UTF-8?q?gamma=20=20=E7=9A=84=20save=20to=20file?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88Save=20as=20Txt=20=EF=BC=8CSave=20as?=
 =?UTF-8?q?=20Excel=EF=BC=89=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=20gamma=20=E7=9A=84=20Save=20PHD=20to=20File=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=EF=BC=8C?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/SaveSettingModal.vue    | 20 +++----
 src/views/spectrumAnalysis/gamma-analysis.vue |  3 -
 src/views/spectrumAnalysis/index.vue          | 57 ++++++++++++-------
 3 files changed, 46 insertions(+), 34 deletions(-)

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 @@
   <custom-modal v-model="visible" title="Save Setting" :width="380" :okHandler="handleOk">
     <div class="save-setting">
       <div class="save-setting-all">
-        <a-checkbox v-model="saveAll">
-          Save All
-        </a-checkbox>
+        <a-checkbox v-model="saveAll"> Save All </a-checkbox>
       </div>
       <div>
         <title-over-border title="Format">
           <a-radio-group v-model="saveFormat" class="format-radio-group">
             <a-radio value="txt">Save as Txt</a-radio>
             <a-radio value="xls">Save as Excel</a-radio>
-            <a-radio value="html">Save as Html</a-radio>
+            <!-- <a-radio value="html">Save as Html</a-radio> -->
           </a-radio-group>
         </title-over-border>
       </div>
@@ -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
-      }
-    }
-  }
+      },
+    },
+  },
 }
 </script>
 
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 }) => {