Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy

# Conflicts:
#	src/views/spectrumAnalysis/beta-gamma-analysis.vue
#	src/views/spectrumAnalysis/index.vue

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

@@ -115,11 +115,7 @@
       <!-- 主体部分结束 -->
     </a-spin>
 
-    <statistics-paramer-history-modal-for-qc-flags
+    <statistics-paramer-history-modal-for-qc-flags v-model="statisticModalVisible" :statisticsType="statisticsType" />
-      v-model="statisticModalVisible"
-      :sampleId="sample.sampleId"
-      :statisticsType="statisticsType"
-    />
   </div>
 </template>
 

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue

@@ -1,15 +1,17 @@
 <template>
   <custom-modal v-model="visible" :width="800" title="Comments">
     <a-spin :spinning="isLoading">
-      <title-over-border title="Spectrum Comment">
+      <div class="comment">
-        <a-textarea v-model="comments.spectrumCommentInfo" :rows="8" :disabled="true"></a-textarea>
+        <title-over-border title="Spectrum Comment">
-      </title-over-border>
+          <a-textarea v-model="comments.spectrumCommentInfo" :rows="8" :disabled="true"></a-textarea>
-      <title-over-border title="Other Analyser's Comment">
+        </title-over-border>
-        <a-textarea v-model="comments.spectrumOtherCommentInfo" :rows="8" :disabled="true"></a-textarea>
+        <title-over-border title="Other Analyser's Comment">
-      </title-over-border>
+          <a-textarea v-model="comments.spectrumOtherCommentInfo" :rows="8" :disabled="true"></a-textarea>
-      <title-over-border title="Spectrum Analysis Comment">
+        </title-over-border>
-        <a-textarea v-model="comments.spectrumAnalysisCommentInfo" :rows="8" :disabled="!isAdd"></a-textarea>
+        <title-over-border title="Spectrum Analysis Comment">
-      </title-over-border>
+          <a-textarea v-model="comments.spectrumAnalysisCommentInfo" :rows="8" :disabled="!isAdd"></a-textarea>
+        </title-over-border>
+      </div>
     </a-spin>
     <a-space slot="custom-footer" :size="20">
       <a-button v-if="isAdd" type="primary" @click="handleOk">Commit Comment Indormations</a-button>
@@ -47,10 +49,10 @@ export default {
     async getCommets() {
       try {
         this.isLoading = true
-        const { sampleId, inputFileName: fileName } = this.sampleData
+        const { sampleId, inputFileName: sampleFileName } = this.sampleData
         const res = await getAction('/spectrumAnalysis/viewComment', {
           sampleId,
-          fileName
+          sampleFileName
         })
         if (res.success) {
           this.comments = res.result
@@ -76,6 +78,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.comment {
+  margin-top: 5px;
+}
+
 .title-over-border {
   &:not(:first-child) {
     margin-top: 10px;

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue

@@ -173,6 +173,7 @@ import { exportEchartImg, getXAxisAndYAxisByPosition, splitAxis } from '@/utils/
 import { getAction } from '@/api/manage'
 import { useBaseChartSetting } from '../../../useChart'
 import TitleOverBorder from '../../TitleOverBorder.vue'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 
 const initialGammaChartOption = {
   grid: {
@@ -417,16 +418,11 @@ const columns = [
 ]
 
 export default {
-  mixins: [ModalMixin],
+  mixins: [ModalMixin, SampleDataMixin],
   components: {
     CustomChart,
     TitleOverBorder
   },
-  props: {
-    sampleId: {
-      type: Number
-    }
-  },
   data() {
     this.columns = columns
 
@@ -461,8 +457,10 @@ export default {
     async getDetail() {
       try {
         this.isLoading = true
+        const { sampleId, inputFileName: sampleFileName } = this.sampleData
         const { success, result, message } = await getAction('/spectrumAnalysis/viewExtrapolation', {
-          sampleId: this.sampleId
+          sampleId,
+          sampleFileName
         })
         if (success) {
           this.detail = result

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue

@@ -149,6 +149,7 @@ import { getAction, postAction } from '@/api/manage'
 import moment from 'moment'
 import { exportEchartImg } from '@/utils/chartHelper'
 import { cloneDeep } from 'lodash'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 
 // 右侧图表配置
 const initialOption = {
@@ -247,12 +248,7 @@ const initialFilterOption = {
 }
 export default {
   components: { TitleOverBorder, CustomChart },
-  mixins: [ModalMixin],
+  mixins: [ModalMixin, SampleDataMixin],
-  props: {
-    sampleId: {
-      type: Number
-    }
-  },
   data() {
     return {
       option: cloneDeep(initialOption),
@@ -266,8 +262,10 @@ export default {
     // 打开弹窗时初始化左上角Station和Detector信息
     async getMDCInitialInfo() {
       try {
+        const { sampleId, inputFileName: sampleFileName } = this.sampleData
         const { success, message, result } = await getAction('/spectrumAnalysis/viewMDC', {
-          sampleId: this.sampleId
+          sampleId,
+          sampleFileName
         })
         if (success) {
           this.setStationAndDetector(result)
@@ -303,20 +301,20 @@ export default {
     // 设置左上角台站和探测器列表
     setStationAndDetector({ detectorList, stationName, stationId }) {
       this.queryParams.stationName = stationName
-      this.detectorList = detectorList.map(item => ({
+      this.detectorList = detectorList.map(({ detectorCode }) => ({
-        label: item,
+        label: detectorCode,
-        value: item
+        value: detectorCode
       }))
-      this.queryParams.detectorName = detectorList[0]
+      this.queryParams.detectorName = detectorList[0].detectorCode
       this.queryParams.stationId = stationId
     },
 
     // 重置左上角查询信息
     handleReset() {
       this.queryParams.stationName = this.initialMDC.stationName
-      this.detectorList = this.initialMDC.detectorList.map(item => ({
+      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
-        label: item,
+        label: detectorCode,
-        value: item
+        value: detectorCode
       }))
     },
 

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue

@@ -65,6 +65,7 @@ import { getAction } from '@/api/manage'
 import moment from 'moment'
 import { exportEchartImg } from '@/utils/chartHelper'
 import { cloneDeep } from 'lodash'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
 
 // 右侧图表配置
 const initialOption = {
@@ -72,61 +73,66 @@ const initialOption = {
     right: 10,
     left: 40,
     top: 20,
-    bottom: 60
+    bottom: 60,
   },
   xAxis: {
     type: 'category',
     axisLine: {
       lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
+        color: 'rgba(119, 181, 213, .3)',
-      }
+      },
     },
     axisLabel: {
       color: '#ade6ee',
       fontSize: 12,
       rotate: 45,
       margin: 10,
-      formatter: value => {
+      formatter: (value) => {
         return moment(value).format('YYYY/MM/DD')
       },
-      interval: 0
+      interval: 0,
     },
     splitLine: {
       show: true,
       lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
+        color: 'rgba(119, 181, 213, .3)',
-      }
+      },
     },
     axisTick: {
-      show: false
+      show: false,
     },
-    data: new Array(5).fill(0).map((_, index) => {
+    data: new Array(5)
-      return moment().add(-8 * index, 'hour').format('YYYY-MM-DD HH:mm:ss')
+      .fill(0)
-    }).reverse()
+      .map((_, index) => {
+        return moment()
+          .add(-8 * index, 'hour')
+          .format('YYYY-MM-DD HH:mm:ss')
+      })
+      .reverse(),
   },
   yAxis: {
     axisLine: {
       lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
+        color: 'rgba(119, 181, 213, .3)',
-      }
+      },
     },
     axisLabel: {
       color: '#ade6ee',
-      fontSize: 12
+      fontSize: 12,
     },
     splitLine: {
       show: true,
       lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
+        color: 'rgba(119, 181, 213, .3)',
-      }
+      },
     },
     axisTick: {
-      show: false
+      show: false,
     },
     min: 0,
-    max: 100
+    max: 100,
   },
-  series: []
+  series: [],
 }
 
 // 左侧配置
@@ -136,18 +142,15 @@ const initialFilterOption = {
   stationName: '',
   statisticsType: '',
   startTime: null,
-  endTime: null
+  endTime: null,
 }
 export default {
   components: { TitleOverBorder, CustomChart },
-  mixins: [ModalMixin],
+  mixins: [ModalMixin, SampleDataMixin],
   props: {
-    sampleId: {
-      type: Number
-    },
     statisticsType: {
-      type: String
+      type: String,
-    }
+    },
   },
   data() {
     return {
@@ -155,15 +158,17 @@ export default {
       initialMDC: {}, // 初始化的信息，用于重置
 
       queryParams: {},
-      detectorList: [] // 探测器列表
+      detectorList: [], // 探测器列表
     }
   },
   methods: {
     // 打开弹窗时初始化左上角Station和Detector信息
     async getMDCInitialInfo() {
       try {
+        const { sampleId, inputFileName: sampleFileName } = this.sampleData
         const { success, message, result } = await getAction('/spectrumAnalysis/viewMDC', {
-          sampleId: this.sampleId
+          sampleId,
+          sampleFileName,
         })
         if (success) {
           this.setStationAndDetector(result)
@@ -199,9 +204,9 @@ export default {
     // 设置左上角台站和探测器列表
     setStationAndDetector({ detectorList, stationName, stationId }) {
       this.queryParams.stationName = stationName
-      this.detectorList = detectorList.map(item => ({
+      this.detectorList = detectorList.map((item) => ({
         label: item,
-        value: item
+        value: item,
       }))
       this.queryParams.detectorName = detectorList[0]
       this.queryParams.stationId = stationId
@@ -210,9 +215,9 @@ export default {
     // 重置左上角查询信息
     handleReset() {
       this.queryParams.stationName = this.initialMDC.stationName
-      this.detectorList = this.initialMDC.detectorList.map(item => ({
+      this.detectorList = this.initialMDC.detectorList.map((item) => ({
         label: item,
-        value: item
+        value: item,
       }))
     },
 
@@ -236,12 +241,12 @@ export default {
               type: 'line',
               data,
               itemStyle: {
-                color: result.m_GraphPen
+                color: result.m_GraphPen,
               },
               lineStyle: {
-                color: result.m_GraphPen
+                color: result.m_GraphPen,
               },
-              symbol: 'circle'
+              symbol: 'circle',
             }
           } else {
             this.option.series = []
@@ -266,12 +271,12 @@ export default {
         ...initialFilterOption,
         statisticsType: this.statisticsType,
         startTime: moment().format('YYYY-MM-DD'),
-        endTime: moment().format('YYYY-MM-DD')
+        endTime: moment().format('YYYY-MM-DD'),
       }
 
       this.option = cloneDeep(initialOption)
-    }
+    },
-  }
+  },
 }
 </script>
 

src/views/spectrumAnalysis/index.vue

@@ -162,7 +162,7 @@
     <!-- Beta-Gamma 的Energy Calibration结束 -->
 
     <!-- Beta-Gamma 的 Extrapolation 弹窗开始 -->
-    <beta-gamma-extrapolation-modal v-model="betaGammaExtrapolationModalVisible" :sampleId="sampleData.sampleId" />
+    <beta-gamma-extrapolation-modal v-model="betaGammaExtrapolationModalVisible" />
     <!-- Beta-Gamma 的 Extrapolation 弹窗结束 -->
 
     <!-- Beta-Gamma 的 Spectrum 弹窗 -->
@@ -185,10 +185,7 @@
     <!-- Beta-Gamma 的 RLR 弹窗 结束 -->
 
     <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 -->
-    <statistics-paramer-history-modal
+    <statistics-paramer-history-modal v-model="statisticsParamerHistoryModalVisible" />
-      v-model="statisticsParamerHistoryModalVisible"
-      :sampleId="this.sampleData.sampleId"
-    />
     <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 结束 -->
   </div>
 </template>
@@ -993,6 +990,7 @@ export default {
                 {
                   type: 'a-menu-item',
                   title: 'Color Config',
+                  show: this.isGamma,
                   handler: () => (this.colorConfigModalVisible = true),
                 },
               ],