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

@@ -183,15 +183,15 @@ export default {
     sampleInfo: {
       type: Object,
     },
-    analyseCurrentSpectrum: {
-      type: Object,
-    },
+    // analyseCurrentSpectrum: {
+    //   type: Object,
+    // },
   },
   data() {
     this.SampleType = SampleType
 
     return {
-      // analyseCurrentSpectrum: {},
+      analyseCurrentSpectrum: {},
       qcFlags: {},
 
       spectraVisible: false,
@@ -539,9 +539,9 @@ export default {
         }
 
         const minX = left - 10,
-              maxX = right + 10,
-              minY = bottom - 10,
-              maxY = top + 10
+          maxX = right + 10,
+          minY = bottom - 10,
+          maxY = top + 10
 
         this.$refs.betaGammaChartRef.setRange(minX, maxX, 'x')
         this.$refs.betaGammaChartRef.setRange(minY, maxY, 'y')
@@ -590,7 +590,7 @@ export default {
           data: newVal.XeData,
         })
       },
-      immediate: true,
+      // immediate: true,
       deep: true,
     },
     sampleInfo: {

src/views/spectrumAnalysis/index.vue

@@ -53,8 +53,8 @@
         @reAnalyAll="getReAnalyAll"
         :sampleInfo="sampleInfo"
         :sample="sampleData"
-        :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
+        <!-- :analyseCurrentSpectrum="analyseCurrentSpectrumData" -->
       <!-- Beta-Gamma 分析 -->
       <div v-else class="empty">Please Select a Sample</div>
       <resize-observer @notify="handleResize" />
@@ -375,7 +375,7 @@ export default {
       betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
       statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
       bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗
-      analyseCurrentSpectrumData: {},
+      // analyseCurrentSpectrumData: {},
       resultDisplayFlag: [],
       params_toDB: {
         comment: '',
@@ -466,7 +466,7 @@ export default {
       this.params_toDB.checkDet = val.checkDet
     },
     getXeData(val) {
-      this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
+      // this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
       this.resultDisplayFlag = val
     },
     // formDB 来源 吧接口返回的文件名称添加到sampleData