From 08ca6c154d254c65170c0c7ecffd8ac7420c8ee0 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Sep 2023 17:18:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0sampleFileName=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  |  2 +-
 .../BetaGammaCommentsModal.vue                | 28 +++++++++++--------
 .../BetaGammaExtrapolationModal.vue           | 12 ++++----
 .../StatisticsParamerHistoryModal.vue         | 26 ++++++++---------
 ...tatisticsParamerHistoryModalForQCFlags.vue |  7 ++---
 src/views/spectrumAnalysis/index.vue          |  4 +--
 6 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 6feec6c..6932644 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -122,7 +122,7 @@
       <!-- 主体部分结束 -->
     </a-spin>
 
-    <statistics-paramer-history-modal-for-qc-flags v-model="statisticModalVisible" :sampleId="sample.sampleId" :statisticsType="statisticsType" />
+    <statistics-paramer-history-modal-for-qc-flags v-model="statisticModalVisible" :statisticsType="statisticsType" />
   </div>
 </template>
 
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
index 589519b..d6592ed 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
+++ b/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">
-        <a-textarea v-model="comments.spectrumCommentInfo" :rows="8" :disabled="true"></a-textarea>
-      </title-over-border>
-      <title-over-border title="Other Analyser's Comment">
-        <a-textarea v-model="comments.spectrumOtherCommentInfo" :rows="8" :disabled="true"></a-textarea>
-      </title-over-border>
-      <title-over-border title="Spectrum Analysis Comment">
-        <a-textarea v-model="comments.spectrumAnalysisCommentInfo" :rows="8" :disabled="!isAdd"></a-textarea>
-      </title-over-border>
+      <div class="comment">
+        <title-over-border title="Spectrum Comment">
+          <a-textarea v-model="comments.spectrumCommentInfo" :rows="8" :disabled="true"></a-textarea>
+        </title-over-border>
+        <title-over-border title="Other Analyser's Comment">
+          <a-textarea v-model="comments.spectrumOtherCommentInfo" :rows="8" :disabled="true"></a-textarea>
+        </title-over-border>
+        <title-over-border title="Spectrum Analysis Comment">
+          <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;
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
index 521e77c..819f7eb 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue
+++ b/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
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 8694917..94d2a35 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/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],
-  props: {
-    sampleId: {
-      type: Number
-    }
-  },
+  mixins: [ModalMixin, SampleDataMixin],
   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 => ({
-        label: item,
-        value: item
+      this.detectorList = detectorList.map(({ detectorCode }) => ({
+        label: detectorCode,
+        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 => ({
-        label: item,
-        value: item
+      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
+        label: detectorCode,
+        value: detectorCode
       }))
     },
 
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
index 68bc346..809d73c 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
@@ -142,9 +142,6 @@ export default {
   components: { TitleOverBorder, CustomChart },
   mixins: [ModalMixin],
   props: {
-    sampleId: {
-      type: Number
-    },
     statisticsType: {
       type: String
     }
@@ -162,8 +159,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)
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index bc657ed..094c9c3 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -167,7 +167,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 弹窗 -->
@@ -192,7 +192,6 @@
     <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 -->
     <statistics-paramer-history-modal
       v-model="statisticsParamerHistoryModalVisible"
-      :sampleId="this.sampleData.sampleId"
     />
     <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 结束 -->
   </div>
@@ -941,6 +940,7 @@ export default {
                 {
                   type: 'a-menu-item',
                   title: 'Color Config',
+                  show: this.isGamma,
                   handler: () => (this.colorConfigModalVisible = true)
                 }
               ]