Merge branch 'master-dev' into feature-Beta-dev-renpy

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

@@ -548,7 +548,7 @@ export default {
           // this.isReAnalyed_beta = true
           // this.analyseCurrentSpectrum = res.result
           this.$emit('sendXeData', res.result.XeData)
-          if (res.result.XeData && res.result.XeData.length > 0) {
+          // 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))
@@ -557,7 +557,12 @@ export default {
           })
           this.$emit('reAnalyCurr', true, res.result.XeData)
           this.handleReAnalyse(res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
           }
+          // }
         } else {
           this.$message.warning(res.message)
         }

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue

@@ -154,10 +154,14 @@ export default {
           })
           this.$emit('sendXeData', res.result.XeData)
           this.$emit('reAnalyCurr', true, res.result.XeData)
-          this.$message.success('Analyse Success!')
           this.isReanlyze = true
           this.handleExit()
           this.$bus.$emit('ReAnalyses', res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
+          }
 
           if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
             let sameStation = matchedSampleList.filter(

src/views/spectrumAnalysis/index.vue

@@ -533,10 +533,10 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      if (val && val.length) {
+      // if (val && val.length) {
       this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
       this.resultDisplayFlag = val
-      }
+      // }
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData
     getFiles(val) {
@@ -1824,6 +1824,8 @@ export default {
 <style lang="less">
 .spectrum-analysis-operators-dropdown-overlay {
   background-color: #03353f;
+  z-index: 999;
+
   .ant-menu {
     background: transparent;
     padding: 0;