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

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

@@ -224,10 +224,24 @@ export default {
       currSample: {},
     }
   },
+  created() {
+    this.$bus.$on('ReAnalyse', this.redrawRect)
+  },
   destroyed() {
     this.cancelLastRequest()
+    this.$bus.$off('ReAnalyse', this.redrawRect)
   },
   methods: {
+    // 重新绘制矩形框
+    redrawRect(result) {
+      const keys = ['SampleBoundary', 'GasBoundary', 'DetBoundary', 'QCBoundary']
+      SampleType.forEach((item, index) => {
+        const value = result[keys[index]]
+        this.sampleDetail[item.value].Boundary = value || []
+        this.changeChartByType(this.spectraType)
+      })
+    },
+
     handleGetFlag(val, obj) {
       this.resultDisplay.forEach((item) => {
         if (item.nuclideName === obj.nuclideName) {

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

@@ -151,6 +151,7 @@ export default {
           this.$message.success('Analyse Success!')
           this.isReanlyze = true
           this.handleExit()
+          this.$bus.$emit('ReAnalyse', res.result)
         } else {
           this.$message.warning(res.message)
         }

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

@@ -346,6 +346,8 @@ export default {
     },
 
     beforeModalOpen() {
+      this.model.energy = null
+      this.model.efficiency = null
       this.selectedRowKeys = []
       this.funcId = 1
       this.getData()

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

@@ -310,6 +310,8 @@ export default {
     beforeModalOpen() {
       this.selectedRowKeys = []
       this.getData()
+      this.model.channel = null
+      this.model.energy = null
     },
 
     // 表格单行点击

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

@@ -309,6 +309,8 @@ export default {
     beforeModalOpen() {
       this.selectedRowKeys = []
       this.getData()
+      this.model.energy = null
+      this.model.fwhm = null
     },
 
     // 表格单行点击