From 4e8da8dd72eb0da20790a24585be429dca470e48 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: Thu, 11 Jan 2024 10:11:13 +0800
Subject: [PATCH] =?UTF-8?q?Load=20From=20Database=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96stations=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20sampleType=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/LoadFromDBModal.vue                 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
index fcd58b1..e8f25a4 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
@@ -122,6 +122,7 @@ export default {
     this.columns = columns
     this.disableMixinCreated = true
     return {
+      searchSampleType: 'All',
       visible: false,
       queryParam: {
         menuTypes: 'G,B',
@@ -246,6 +247,7 @@ export default {
 
         const { success, result, message } = await getAction('/spectrumAnalysis/getDBSearchList', {
           AllUsers: this.allUsersValue,
+          sampleType: this.searchSampleType,
         })
         if (success) {
           this.stationList = result.stationCode.map((item) => ({ label: item, value: item }))
@@ -334,16 +336,22 @@ export default {
                 },
               ]
               if (event == 'B') {
+                this.searchSampleType = 'Beta'
+                this.getStationAndDetectorList()
                 this.sampleTypeOption = arr_B
                 this.$nextTick(() => {
                   this.queryParam.sampleType = 'B'
                 })
               } else if (event == 'G') {
+                this.searchSampleType = 'Gamma'
+                this.getStationAndDetectorList()
                 this.sampleTypeOption = arr_G
                 this.$nextTick(() => {
                   this.queryParam.sampleType = 'P'
                 })
               } else {
+                this.searchSampleType = 'All'
+                this.getStationAndDetectorList()
                 this.sampleTypeOption = arr_A
                 this.$nextTick(() => {
                   this.queryParam.sampleType = ''