From bcaaf9d2806e5d6e19ed020e21371ef9a61e30ea 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: Tue, 16 Apr 2024 17:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=20View=20Spectrum=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=AD=E4=B8=8B=E8=BD=BD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?tab=E9=A1=B5=E4=B8=AD=E7=9A=84=E6=96=87=E6=A1=A3=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaSpectrumModal.vue                | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
index 990600c..c9576b5 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" :width="1000" title="View Spectrum" destroyOnClose>
+  <custom-modal v-model="visible" :width="1000" title="View Spectrum" destroyOnClose @cancel="handleCancel">
     <a-spin :spinning="isLoading">
       <a-tabs :animated="false" @change="handleTabChange">
         <a-tab-pane tab="Sample Spectrum" :key="1">
@@ -19,7 +19,7 @@
     <div slot="custom-footer">
       <a-space :size="20">
         <a-button type="primary" @click="handleOk">Save Text</a-button>
-        <a-button @click="visible = false">Cancel</a-button>
+        <a-button @click="handleCancel">Cancel</a-button>
       </a-space>
     </div>
   </custom-modal>
@@ -89,7 +89,6 @@ export default {
       this.currTab = key
     },
     handleOk() {
-      console.log(this.sampleData)
       this.fileName = ''
       let text = ''
       if (this.currTab == 1) {
@@ -104,7 +103,6 @@ export default {
       if (text) {
         let name = this.newSampleData.inputFileName.split('.')[0]
         let strData = new Blob([text], { type: 'text/plain;charset=utf-8' })
-        // saveAs(strData, `GammaViewer Log.txt`)
         if (this.currTab == 1) {
           saveAs(strData, `${name}_Sample Spectrum.txt`)
         } else if (this.currTab == 2) {
@@ -114,27 +112,14 @@ export default {
         } else if (this.currTab == 4) {
           saveAs(strData, `${name}_QC Spectrum.txt`)
         }
-        // let _this = this
-        // this.$confirm({
-        //   title: 'Please enter file name',
-        //   content: (h) => <a-input v-model={_this.fileName} />,
-        //   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 (_this.fileName) {
-        //       saveAs(strData, `${_this.fileName}.txt`)
-        //     }
-        //   },
-        // })
       } else {
         this.$message.warning('No data can be saved!')
       }
     },
+    handleCancel() {
+      this.currTab = 1
+      this.visible = false
+    },
   },
 }
 </script>