Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/spectrumAnalysis/beta-gamma-analysis.vue

@@ -464,6 +464,7 @@ export default {
         if (res.success) {
           // this.isReAnalyed_beta = true
           this.analyseCurrentSpectrum = res.result
+          if (res.result.XeData && res.result.XeData.length > 0) {
             res.result.XeData.forEach((item) => {
               item.conc = parseFloat(item.conc.toPrecision(6))
               item.concErr = parseFloat(item.concErr.toPrecision(6))
@@ -471,6 +472,7 @@ export default {
               item.mdc = parseFloat(item.mdc.toPrecision(6))
             })
             this.$emit('reAnalyCurr', true, res.result.XeData)
+          }
         } else {
           this.$message.warning(res.message)
         }

src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue

@@ -913,6 +913,8 @@ export default {
               this.resetChartOpts()
 
               this.selectedKeys = []
+
+              this.selectedTableItem = null
             } else {
               this.$message.error(message)
             }

src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue

@@ -114,7 +114,7 @@ export default {
     return {
       queryParam: {
         menuTypes: 'G,B',
-        sampleType: 'P',
+        sampleType: '',
         startDate: moment().add(-7, 'd').format('YYYY-MM-DD'),
         endDate: moment().format('YYYY-MM-DD'),
         dbName: 'auto',
@@ -326,13 +326,19 @@ export default {
               ]
               if (event == 'B') {
                 this.sampleTypeOption = arr_B
+                this.$nextTick(() => {
                   this.queryParam.sampleType = 'B'
+                })
               } else if (event == 'G') {
                 this.sampleTypeOption = arr_G
+                this.$nextTick(() => {
                   this.queryParam.sampleType = 'P'
+                })
               } else {
                 this.sampleTypeOption = arr_A
-                this.queryParam.sampleType = 'P'
+                this.$nextTick(() => {
+                  this.queryParam.sampleType = ''
+                })
               }
               this.getStationAndDetectorList(event)
             },