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

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

@@ -289,7 +289,7 @@ export default {
         }
       }
 
-      this.changeChartByType(this.spectraType)
+      this.changeChartByType(this.spectraType, result.XeData)
     },
 
     handleGetFlag(val, obj) {
@@ -401,7 +401,7 @@ export default {
       return cancelToken
     },
 
-    changeChartByType(val) {
+    changeChartByType(val, data) {
       if (val === 'qc' && !this.sampleDetail.qc) {
         this.$message.warning('No qc spectrum file!')
       } else {
@@ -452,7 +452,7 @@ export default {
 
         console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
 
-        this.resultDisplay = XeData
+        this.resultDisplay = data ? data : XeData
         this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@@ -548,16 +548,21 @@ 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))
             item.lc = parseFloat(item.lc.toPrecision(6))
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
-            this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, 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/AnalyzeInteractiveToolModal/index.vue

@@ -1562,14 +1562,16 @@ export default {
         try {
           this.$set(this.selectedTableItem, '_deleting', true)
           const { inputFileName: fileName } = this.sampleData
-          const { success, message } = await postAction('/gamma/deleteNuclide', {
+          const { success, result, message } = await postAction('/gamma/deleteNuclide', {
             curRow: this.curRow,
             nuclideName: this.model.identifiedNuclide,
             fileName,
             list_identify: nuclides,
           })
           if (success) {
-            nuclides.splice(findIndex, 1)
+            const { identify, table } = result
+            this.selectedTableItem.nuclides = identify
+            this.list = table
           } else {
             this.$message.error(message)
           }

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

@@ -153,11 +153,15 @@ export default {
             item.mdc = parseFloat(item.mdc.toPrecision(6))
           })
           this.$emit('sendXeData', res.result.XeData)
-          this.$emit('reAnalyCurr', true, res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, 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

@@ -499,7 +499,7 @@ export default {
   methods: {
     getReAnalyCurr(flag, val) {
       this.isReAnalyed_beta = flag
-      this.params_toDB.savedAnalysisResult = true
+      this.params_toDB.savedAnalysisResult = flag
       this.resultDisplayFlag = val
     },
     getReAnalyAll(val) {
@@ -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,13 +1824,13 @@ export default {
 <style lang="less">
 .spectrum-analysis-operators-dropdown-overlay {
   background-color: #03353f;
+  z-index: 999;
+
   .ant-menu {
     background: transparent;
     padding: 0;
     position: relative;
     border-right: 0;
-    max-height: calc(100vh - 506px);
-    overflow: hidden auto;
 
     &-submenu {
       &-active {