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

@@ -180,6 +180,9 @@ export default {
     sample: {
       type: Object,
     },
+    sampleInfo: {
+      type: Object,
+    },
     // analyseCurrentSpectrum: {
     //   type: Object,
     // },
@@ -542,6 +545,14 @@ export default {
       immediate: true,
       deep: true,
     },
+    sampleInfo: {
+      handler(newVal, oldVal) {
+        this.spectrumData.sampleId = newVal.sampleId
+        this.spectrumData.status = newVal.status
+      },
+      immediate: true,
+      deep: true,
+    },
   },
 }
 </script>

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

@@ -66,6 +66,7 @@
             :scroll="{ y: 180 }"
             :customRow="customRow"
             :pagination="false"
+            size="small"
           >
             <template slot="keyLine" slot-scope="text">
               <span v-if="text == 1" class="green-check-mark"> </span>

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

@@ -106,14 +106,14 @@ const columns = [
     title: 'Conc (uBq/m3)',
     dataIndex: 'conc',
     customRender: (text) => {
-      return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
+      return text && text !== 'null' ? Number(text).toPrecision(6) : text
     },
   },
   {
     title: 'MDC (uBq/m3)',
     dataIndex: 'mdc',
     customRender: (text) => {
-      return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
+      return text && text !== 'null' ? Number(text).toPrecision(6) : text
     },
   },
 ]

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -1382,7 +1382,7 @@ export default {
 
     // 分析工具Accept时刷新部分数据
     handleAccept(data) {
-      const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
+      const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
 
       const result = {
         DetailedInformation: this.detailedInfomation,
@@ -1392,7 +1392,7 @@ export default {
         shadowEnergyChart,
         shapeChannelData,
         shapeEnergyData,
-        peak: peakSet,
+        peak,
         BaseCtrls: this.baseCtrls,
         bAnalyed: this.bAnalyed,
         barChart

src/views/spectrumAnalysis/index.vue

@@ -51,6 +51,7 @@
         @sendInfo="getStationName"
         @reAnalyCurr="getReAnalyCurr"
         @reAnalyAll="getReAnalyAll"
+        :sampleInfo="sampleInfo"
         :sample="sampleData"
         :analyseCurrentSpectrum="analyseCurrentSpectrumData"
       />
@@ -406,6 +407,7 @@ export default {
       isSaving: false,
 
       colorConfig: {}, // 颜色配置
+      sampleInfo:{}
     }
   },
   created() {
@@ -644,6 +646,7 @@ export default {
             if (res.success) {
               this.$message.success('Save Successfully!')
               this.isSaving = false
+              this.sampleInfo = res.result.sample
             } else {
               this.isSaving = false
               this.$message.warning(`${res.message}`)