From eb2ab9416e9a20762df299b87e86b82359d68af5 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Tue, 9 Jul 2024 17:12:57 +0800
Subject: [PATCH] =?UTF-8?q?WIP:=20=E5=A2=9E=E5=8A=A0=20calibration=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BetaDetectorCalibration.vue    | 1330 +++++++++++++++++
 .../components/GammaDetectorCalibration.vue   | 1017 +++++++++++++
 .../NewBetaModals/CalibrationModal/index.vue  |  282 ++++
 src/views/spectrumAnalysis/index.vue          |   19 +
 4 files changed, 2648 insertions(+)
 create mode 100644 src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/BetaDetectorCalibration.vue
 create mode 100644 src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/GammaDetectorCalibration.vue
 create mode 100644 src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/index.vue

diff --git a/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/BetaDetectorCalibration.vue
new file mode 100644
index 0000000..d0a4ba6
--- /dev/null
+++ b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/BetaDetectorCalibration.vue
@@ -0,0 +1,1330 @@
+<template>
+  <div class="beta-detector-calibration">
+    <a-spin :spinning="isLoading">
+      <div class="content">
+        <div class="QCs">
+          <div class="beta-gamma-spectrum">
+            <p>Beta-Gamma Spectrum: QC</p>
+            <div class="content">
+              <div class="settings">
+                <div class="channel-and-width">
+                  <div>
+                    <label>Channel:</label>
+                    <span>{{ betaGammaInfo.channel }}</span>
+                  </div>
+                  <div>
+                    Gamma Channel Width:
+                    <a-input-number :min="1" v-model="gammaChannelWidth" size="small"></a-input-number>
+                  </div>
+                </div>
+                <div class="energy">
+                  <label>Energy:</label>
+                  <span>{{ betaGammaInfo.energy }}</span>
+                </div>
+              </div>
+              <div class="beta-gamma-chart">
+                <custom-chart
+                  ref="betaGammaChartRef"
+                  :option="betaGammaChartOption"
+                  @zr:click="handleBetaGammaChartClick"
+                  @zr:mousemove="handleBetaGammaChartMouseMove"
+                />
+                <!-- 数据量太大的时候echarts会重绘，故采用自定义markLine和rect的形式 -->
+                <div v-if="markLineVisible" class="markline" :style="{ top: markLinePosition.top + 'px' }"></div>
+                <div
+                  v-if="rectVisible"
+                  class="rect"
+                  :style="{ top: rectPosition.top + 'px', height: rectHeight + 'px' }"
+                ></div>
+              </div>
+            </div>
+          </div>
+          <div class="gamma-gated-beta-spectrum">
+            <p>Gamma-gated Beta Spectrum: QC</p>
+            <div class="content">
+              <a-spin :spinning="isLoadingGammaGated">
+                <div class="gamma-gated-chart">
+                  <custom-chart
+                    ref="gammaGatedChartRef"
+                    :option="gammaGatedChartOption"
+                    @zr:click="handleGammaGatedSpectrumChartClick"
+                  />
+                  <a-button type="primary" size="small" @click="handleSnapshot($refs.gammaGatedChartRef)"
+                    >Snapshot</a-button
+                  >
+                  <!-- 自定义tooltip，用于点击图表后的tooltip显示 -->
+                  <div
+                    v-if="tooltipVisible"
+                    class="custom-tool-tip"
+                    :style="{
+                      top: tooltipPosition.top + 'px',
+                      left: tooltipPosition.left + 'px',
+                    }"
+                  >
+                    <div class="channel">Channel: {{ tooltipChannel }}</div>
+                  </div>
+                  <!-- tooltip结束 -->
+                </div>
+              </a-spin>
+            </div>
+            <div class="content channel-and-energy">
+              <a-form-model layout="inline">
+                <a-form-model-item label="Channel">
+                  <a-input-number type="number" v-model="channelAndEnergyModel.channel" size="small"></a-input-number>
+                </a-form-model-item>
+                <a-form-model-item label="Energy">
+                  <a-input-number type="number" v-model="channelAndEnergyModel.energy" size="small"></a-input-number>
+                </a-form-model-item>
+              </a-form-model>
+              <a-button type="primary" @click="handleAddChannelAndEnergy" size="small">Add</a-button>
+            </div>
+            <!-- 表格开始 -->
+            <a-table
+              size="small"
+              :columns="columns"
+              :dataSource="list"
+              :pagination="false"
+              :class="list.length ? 'has-data' : ''"
+              :scroll="{ y: 99 }"
+            >
+              <template slot="operation" slot-scope="text, record, index">
+                <a-icon type="delete" style="color: #f00" @click="handleDel(index)"></a-icon>
+              </template>
+            </a-table>
+            <!-- 表格结束 -->
+          </div>
+        </div>
+        <div class="figure">
+          <p class="title">Figure of Beta Detector Calibration</p>
+          <div class="content">
+            <div class="figure-chart">
+              <custom-chart ref="figureChartRef" :option="figureChartOption" />
+              <a-button type="primary" size="small" @click="handleSnapshot($refs.figureChartRef)">Snapshot</a-button>
+            </div>
+          </div>
+        </div>
+        <div class="calibration-parameter">
+          <p>Calibration Parameter of Beta Detector</p>
+          <div class="calibration-funcs">
+            <div class="calibration-funcs-func">
+              <title-over-border title="Old Calibration Function">
+                <p class="func">
+                  <span>C to E : </span>
+                  <span
+                    >E = {{ scientificNotationStr2Fixed(c2e[0]) }} + {{ scientificNotationStr2Fixed(c2e[1]) }} *C +
+                    {{ scientificNotationStr2Fixed(c2e[2]) }} *C <sup>2</sup>
+                  </span>
+                </p>
+                <div class="func">
+                  <span>E to C : </span>
+                  <span
+                    >C = {{ scientificNotationStr2Fixed(e2c[0]) }} + {{ scientificNotationStr2Fixed(e2c[1]) }} *E +
+                    {{ scientificNotationStr2Fixed(e2c[2]) }} *E <sup>2</sup>
+                  </span>
+                </div>
+              </title-over-border>
+              <title-over-border title="New Calibration Function">
+                <p class="func">
+                  <span>C to E : </span>
+                  <span>
+                    E =
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramA"
+                      @change="newCalibrationFuncModelChange"
+                    />
+                    +
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramB"
+                      @change="newCalibrationFuncModelChange"
+                    />
+                    *C +
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramC"
+                      @change="newCalibrationFuncModelChange"
+                    />
+                    *C <sup>2</sup>
+                  </span>
+                </p>
+                <div class="func">
+                  <span>E to C : </span>
+                  <span
+                    >C = {{ scientificNotationStr2Fixed(newE2C[0]) }} + {{ scientificNotationStr2Fixed(newE2C[1]) }} *E
+                    + {{ scientificNotationStr2Fixed(newE2C[2]) }} *E <sup>2</sup>
+                  </span>
+                </div>
+              </title-over-border>
+            </div>
+            <div class="calibration-funcs-btns">
+              <a-button type="primary" @click="handleReset">Reset Button</a-button>
+              <a-button type="primary" @click="handleFitting">Fitting</a-button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="footer">
+        <title-over-border title="New Calibration is Applied to">
+          <a-radio-group v-model="newCalibrationIsAppliedTo">
+            <p>
+              <a-radio value="1">All Spectra</a-radio>
+            </p>
+            <a-radio value="2">Current Spectrum</a-radio>
+          </a-radio-group>
+        </title-over-border>
+        <title-over-border title="Recalculate ROI Counts For">
+          <a-checkbox-group v-model="recalculateROICountsFor">
+            <p>
+              <a-checkbox value="sample">Sample Data</a-checkbox>
+              <a-checkbox value="gasBg">GasBg Data</a-checkbox>
+            </p>
+            <a-checkbox value="detBg">DetBg Data</a-checkbox>
+            <a-checkbox value="qc">QC Data</a-checkbox>
+          </a-checkbox-group>
+        </title-over-border>
+        <div class="footer-btns">
+          <a-button type="primary" @click="handleReAnalyse">Reanalyse Spectrum Using New Calibration</a-button>
+          <a-button type="primary" class="exit" @click="handleExit()">Exit</a-button>
+        </div>
+      </div> -->
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import CustomChart from '@/components/CustomChart/index.vue'
+import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder.vue'
+import { getAction, postAction } from '@/api/manage'
+import { cloneDeep } from 'lodash'
+import { exportEchartImg, getXAxisAndYAxisByPosition, splitAxis } from '@/utils/chartHelper'
+import { graphic } from 'echarts'
+import { isNullOrUndefined } from '@/utils/util'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
+import axios from 'axios'
+import { add } from 'xe-utils/methods'
+
+const initialBetaGammaChartOption = {
+  grid: {
+    top: 15,
+    left: 55,
+    right: 10,
+    bottom: 45,
+  },
+  xAxis: {
+    name: 'Beta Channel',
+    nameTextStyle: {
+      color: '#5b9cba',
+      fontSize: 16,
+    },
+    nameLocation: 'center',
+    nameGap: 30,
+    axisLine: {
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .3)',
+      },
+    },
+    axisLabel: {
+      color: '#ade6ee',
+      fontSize: 12,
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .3)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    min: 0,
+    max: 256,
+    interval: 64,
+  },
+  yAxis: {
+    name: 'Gamma Channel',
+    nameTextStyle: {
+      color: '#5b9cba',
+      fontSize: 16,
+    },
+    nameLocation: 'center',
+    nameGap: 35,
+    axisLine: {
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .3)',
+      },
+    },
+    axisLabel: {
+      color: '#ade6ee',
+      fontSize: 12,
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .3)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    min: 0,
+    max: 256,
+    interval: 64,
+  },
+  series: {
+    type: 'scatterGL',
+    symbolSize: 2,
+    data: [],
+    itemStyle: {
+      color: '#fff',
+    },
+    cursor: 'default',
+  },
+}
+
+const initialGammaGatedChartOption = {
+  grid: {
+    top: 10,
+    right: 15,
+    bottom: 50,
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      lineStyle: {
+        color: '#099D24',
+      },
+    },
+    formatter: (params) => {
+      const [channel] = params[0].value
+      return `<div class="channel">Channel: ${channel}</div>`
+    },
+    className: 'figure-chart-option-tooltip',
+  },
+  xAxis: {
+    min: 0,
+    max: 256,
+    interval: 64,
+    axisLine: {
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Channel',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 35,
+  },
+  yAxis: {
+    min: 0,
+    max: 0,
+    interval: 0,
+    axisLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Count',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 25,
+  },
+  series: {
+    type: 'line',
+    itemStyle: {
+      color: '#04ADD9',
+    },
+    areaStyle: {
+      color: new graphic.LinearGradient(0, 0, 0, 1, [
+        {
+          offset: 0,
+          color: 'rgba(4, 173, 217, 0.87)',
+        },
+        {
+          offset: 1,
+          color: 'rgba(4, 173, 217, 0.05)',
+        },
+      ]),
+    },
+    symbol: 'none',
+    data: [],
+    markLine: {
+      symbol: 'none',
+      label: {
+        show: false,
+      },
+      animation: false,
+      emphasis: {
+        disabled: true,
+      },
+      lineStyle: {
+        color: '#f00',
+      },
+      data: [],
+    },
+  },
+}
+
+const initialFigureChartOption = {
+  grid: {
+    top: 10,
+    right: 15,
+    bottom: 50,
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      lineStyle: {
+        color: '#099D24',
+      },
+    },
+    formatter: (params) => {
+      const [series1, series2] = params
+      const [channel, energy1] = series1.value
+
+      let html = `<div class="channel">Channel: ${channel}</div>
+                  <div class="energy">Energy: ${energy1.toPrecision(6)}</div>`
+
+      if (series2) {
+        const [_, energy2] = series2.value
+        html += `<div class="warning">Energy: ${energy2.toPrecision(6)}</div>`
+      }
+
+      return html
+    },
+    className: 'figure-chart-option-tooltip',
+  },
+  xAxis: {
+    min: 0,
+    max: 256,
+    interval: 64,
+    axisLine: {
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Channel',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 35,
+  },
+  yAxis: {
+    min: 0,
+    max: 0,
+    interval: 0,
+    axisLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Energy[E/kev]',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 80,
+  },
+  series: [
+    {
+      type: 'line',
+      itemStyle: {
+        color: '#04ADD9',
+      },
+      symbol: 'none',
+      data: [],
+      markPoint: {
+        symbol: 'circle',
+        symbolSize: 8,
+        data: [],
+      },
+    },
+    {
+      type: 'line',
+      itemStyle: {
+        color: 'yellow',
+      },
+      symbol: 'none',
+      data: [],
+      markPoint: {
+        symbol: 'circle',
+        symbolSize: 8,
+        data: [],
+      },
+    },
+  ],
+}
+
+const columns = [
+  {
+    title: 'Index',
+    dataIndex: 'rowCount',
+    align: 'center',
+  },
+  {
+    title: 'Channel',
+    dataIndex: 'channel',
+    align: 'center',
+  },
+  {
+    title: 'Energy/keV',
+    dataIndex: 'energy',
+    align: 'center',
+    customRender: (text) => {
+      return text.toPrecision(6)
+    },
+  },
+  {
+    title: 'FWHM/C',
+    dataIndex: 'c',
+    align: 'center',
+  },
+  {
+    title: 'FWHM/keV',
+    dataIndex: 'keV',
+    align: 'center',
+  },
+  {
+    title: 'S',
+    align: 'center',
+    scopedSlots: {
+      customRender: 'operation',
+    },
+  },
+]
+
+const newCalibrationFuncModel = {
+  paramA: undefined,
+  paramB: undefined,
+  paramC: undefined,
+}
+
+export default {
+  mixins: [SampleDataMixin],
+  components: { CustomChart, TitleOverBorder },
+  props: {
+    isFirstFitting: {
+      type: Boolean,
+      required: false,
+    },
+    isBetaReset: {
+      type: Boolean,
+      required: false,
+    },
+  },
+  data() {
+    this.columns = columns
+
+    return {
+      betaGammaChartOption: cloneDeep(initialBetaGammaChartOption),
+      gammaGatedChartOption: cloneDeep(initialGammaGatedChartOption),
+      figureChartOption: cloneDeep(initialFigureChartOption),
+
+      list: [],
+      isLoading: false,
+      isLoadingGammaGated: false,
+
+      gammaEnergy: [],
+      gammaGatedBetaSpectrum: [],
+      gammaChannelWidth: 5, // 左上角 Gamma Channel Width
+      betaGammaInfo: {}, // 左上角 鼠标悬停在散点图上时的channel和energy信息
+
+      markLineVisible: false,
+      markLinePosition: {
+        top: 0,
+      },
+
+      rectVisible: false,
+      rectPosition: {
+        top: 0,
+      },
+
+      tooltipVisible: false,
+      tooltipPosition: {
+        top: 0,
+        left: 0,
+      },
+
+      channelAndEnergyModel: {
+        channel: undefined,
+        energy: undefined,
+      },
+
+      c2e: {},
+      e2c: {},
+
+      newE2C: [],
+
+      newCalibrationFuncModel: cloneDeep(newCalibrationFuncModel),
+
+      newCalibrationIsAppliedTo: '2',
+      recalculateROICountsFor: [],
+
+      count: 0, //反算时需要传递的数值  非反算的情况下不需要传递  数值大小是  第一次调用接口时返回的tableWidgets 大小
+      isInverse: false, // 是否需要反算
+      betaIsFitting: false,
+    }
+  },
+  created() {
+    this.$bus.$on('betaRefresh', this.handleReset)
+    this.$bus.$on('betaRefresh', this.getData)
+    this.getData()
+  },
+  beforeDestroy() {
+    this.$bus.$off('betaRefresh', this.handleReset)
+    this.$bus.$off('betaRefresh', this.getData)
+  },
+  watch: {
+    isFirstFitting: {
+      handler() {
+        // this.getData()
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    handleExit() {
+      this.$emit('exit')
+    },
+
+    async getData() {
+      // 增加sampleFileName参数 20231101：xiao
+      const { sampleId = '', qcFileName, inputFileName } = this.newSampleData
+      try {
+        this.isLoading = true
+        const res = await getAction('/selfStation/viewBetaDetectorCalibration', {
+          sampleId,
+          qcFileName,
+          sampleFileName: inputFileName,
+          fittingBtn: this.isFirstFitting,
+        })
+        if (res.success) {
+          const {
+            CToE,
+            EToC,
+            betaEnergy,
+            gammaEnergy,
+            gammaGatedBetaSpectrum,
+            histogramData,
+            oldScatterSeries,
+            newCToE,
+            newEToC,
+          } = res.result
+          this.c2e = CToE
+          this.e2c = EToC
+
+          this.oldScatterSeries = oldScatterSeries
+          this.count = oldScatterSeries.length
+
+          this.betaGammaChartOption.series.data = histogramData.map(({ b, g, c }) => [b, g, c])
+          this.gammaEnergy = gammaEnergy
+          this.gammaGatedBetaSpectrum = gammaGatedBetaSpectrum
+          this.oldScatterSeries = oldScatterSeries
+
+          const gammaEnergyValue = betaEnergy.map((item) => item[0])
+          const gammaEnergyMax = Math.max(...gammaEnergyValue)
+          const gammaEnergyMin = Math.min(...gammaEnergyValue)
+
+          const { max, min, interval } = splitAxis(gammaEnergyMax, gammaEnergyMin, 4)
+
+          this.figureChartOption.yAxis.max = max
+          this.figureChartOption.yAxis.min = min
+          this.figureChartOption.yAxis.interval = interval
+
+          this.figureChartOption.series[0].data = gammaEnergyValue.map((item, index) => [index, item])
+          this.figureChartOption.series[0].markPoint.data = oldScatterSeries.map(({ x, y }) => ({ xAxis: x, yAxis: y }))
+
+          this.oldChartOption = cloneDeep(this.figureChartOption)
+
+          // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao
+          // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据
+          if (this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName)) {
+            this.setFirringResult(this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName))
+            return false
+          }
+
+          /**
+           * 对人工交互的返回数据单独处理
+           */
+          if (this.sampleData.dbName == 'man') {
+            const result = res.result
+            result.EToC = newEToC || []
+            result.CToE = newCToE
+            this.setFirringResult(res.result)
+          }
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    // 点击左上角散点图，设置红线
+    handleBetaGammaChartClick(param) {
+      const { offsetX, offsetY } = param
+      const point = getXAxisAndYAxisByPosition(this.$refs.betaGammaChartRef.getChartInstance(), offsetX, offsetY)
+      if (point) {
+        this.markLinePosition.top = offsetY
+        this.markLineVisible = true
+
+        // 设置 gamma-gated beta spectrum
+        const yAxis = parseInt(point[1].toFixed())
+
+        this.currEnergy = this.gammaEnergy[yAxis][0].toPrecision(6) // 设置当前选中位置的Energy
+        this.channelAndEnergyModel = {
+          channel: undefined,
+          energy: undefined,
+        }
+
+        this.getGammaGated(yAxis)
+      }
+    },
+
+    // 获取右侧图表数据
+    async getGammaGated(gammaChannel) {
+      try {
+        this.cancelLastRequest()
+        const cancelToken = this.createCancelToken()
+        this.isLoadingGammaGated = true
+        const { sampleId, qcFileName, inputFileName: sampleFileName } = this.newSampleData
+        const {
+          success,
+          result: { data },
+          message,
+        } = await getAction(
+          '/spectrumAnalysis/getGammaGated',
+          {
+            gammaChannel,
+            sampleId,
+            chartHeight: this.gammaEnergy.length,
+            channelWidth: this.gammaChannelWidth,
+            qcFileName,
+            sampleFileName,
+          },
+          cancelToken
+        )
+        if (success) {
+          this.isLoadingGammaGated = false
+          const max = Math.max(...data.map(({ y }) => y))
+
+          const { max: _max, interval } = splitAxis(max, 0, 4)
+
+          this.gammaGatedChartOption.yAxis.interval = interval
+          this.gammaGatedChartOption.yAxis.max = _max
+          this.gammaGatedChartOption.series.data = data.map(({ x, y }) => [x, y])
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      }
+    },
+
+    cancelLastRequest() {
+      if (this._cancelToken && typeof this._cancelToken == 'function') {
+        this._cancelToken()
+      }
+    },
+
+    createCancelToken() {
+      const cancelToken = new axios.CancelToken((c) => {
+        this._cancelToken = c
+      })
+      return cancelToken
+    },
+
+    // 绿框跟随鼠标移动
+    handleBetaGammaChartMouseMove(param) {
+      const { offsetX, offsetY } = param
+      const point = getXAxisAndYAxisByPosition(this.$refs.betaGammaChartRef.getChartInstance(), offsetX, offsetY)
+      if (point) {
+        this.rectPosition.top = offsetY
+        this.rectVisible = true
+
+        if (this.gammaEnergy && this.gammaEnergy.length) {
+          // 设置 Channel 和 Energy
+          const yAxis = parseInt(point[1].toFixed())
+          const gammaEnergy = this.gammaEnergy[yAxis]
+          if (gammaEnergy) {
+            const energy = gammaEnergy[0].toPrecision(6)
+            this.betaGammaInfo = {
+              channel: yAxis,
+              energy,
+            }
+          }
+        }
+      }
+    },
+
+    // Gamma Gated Beta Spectrum: QC 图表点击
+    handleGammaGatedSpectrumChartClick(param) {
+      const { offsetX, offsetY } = param
+      const point = getXAxisAndYAxisByPosition(this.$refs.gammaGatedChartRef.getChartInstance(), offsetX, offsetY)
+      if (point) {
+        const xAxis = parseInt(point[0].toFixed())
+        this.gammaGatedChartOption.series.markLine.data = [{ xAxis }]
+
+        this.tooltipChannel = xAxis
+        this.tooltipPosition.top = offsetY
+        if (xAxis > 187) {
+          this.tooltipPosition.left = offsetX - 125
+        } else {
+          this.tooltipPosition.left = offsetX + 20
+        }
+        this.tooltipVisible = true
+        this.channelAndEnergyModel.channel = xAxis
+        if (!isNullOrUndefined(this.currEnergy)) {
+          this.channelAndEnergyModel.energy = add(661.657, -this.currEnergy)
+        }
+      }
+    },
+
+    // 增加新的Channel 和 Energy 到表格里
+    handleAddChannelAndEnergy() {
+      const { channel, energy } = this.channelAndEnergyModel
+
+      if (isNullOrUndefined(channel) || isNullOrUndefined(energy)) {
+        return
+      }
+
+      this.list.push({
+        rowCount: this.list.length + 1,
+        channel,
+        energy,
+      })
+
+      // add之后 需要清空chart黄色的线 20231028：Xiao
+      if (this.figureChartOption.series[1].data) {
+        this.figureChartOption.series[1].data = []
+      }
+
+      this.figureChartOption.series[1].markPoint.data.push({ xAxis: channel, yAxis: energy })
+
+      const { min, max } = this.getFigureChartMaxAndMin()
+
+      const newMax = energy > max ? energy : max
+      const newMin = energy < min ? energy : min
+
+      // 如果最大/最小值范围改变，重新计算范围
+      if (newMax === energy || newMin === energy) {
+        const { max: _max, min: _min, interval } = splitAxis(newMax, newMin, 4)
+        this.figureChartOption.yAxis.max = _max
+        this.figureChartOption.yAxis.min = _min
+        this.figureChartOption.yAxis.interval = interval
+      }
+
+      this.channelAndEnergyModel = {
+        channel: undefined,
+        energy: undefined,
+      }
+
+      this.isInverse = true
+    },
+
+    // 输入框发生变化
+    newCalibrationFuncModelChange() {
+      // 输入内容的时候 需要清空table数据 20231028：Xiao
+      this.list = []
+      // 需要清空chart黄色的线 20231028：Xiao
+      if (this.figureChartOption.series[1].data) {
+        this.figureChartOption.series[1].data = []
+      }
+      if (this.figureChartOption.series[1].markPoint.data) {
+        this.figureChartOption.series[1].markPoint.data = []
+      }
+    },
+
+    // 删除表格里的单项
+    handleDel(index) {
+      const willDelItem = this.list.splice(index, 1)[0]
+
+      const findIndex = this.figureChartOption.series[1].markPoint.data.findIndex(
+        (item) => item.xAxis == willDelItem.channel && item.yAxis == willDelItem.energy
+      )
+
+      if (-1 !== findIndex) {
+        const markPointData = this.figureChartOption.series[1].markPoint.data
+
+        const { max: prevMax, min: prevMin } = this.getFigureChartMaxAndMin()
+        const deletedItem = markPointData.splice(findIndex, 1)[0] // 删除图表上相应的点
+
+        // 如果最大/最小值范围改变，重新计算范围
+        if (deletedItem.yAxis == prevMax || deletedItem.yAxis == prevMin) {
+          const { max: newMax, min: newMin } = this.getFigureChartMaxAndMin()
+          const { max: _max, min: _min, interval } = splitAxis(newMax, newMin, 4)
+          this.figureChartOption.yAxis.max = _max
+          this.figureChartOption.yAxis.min = _min
+          this.figureChartOption.yAxis.interval = interval
+        }
+      }
+
+      this.isInverse = true
+    },
+
+    // 下载图表图片
+    handleSnapshot(chartRef) {
+      const chartInstance = chartRef.getChartInstance()
+      exportEchartImg(chartInstance)
+    },
+
+    // 点击Reset Button 重置
+    async handleReset() {
+      this.$emit('isFitting', false)
+      this.removeCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao
+      this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel)
+      this.list = []
+      this.newE2C = []
+
+      // 按乔的要求增加请求reset的接口 20231211：xiao
+      const res = await postAction(
+        '/spectrumAnalysis/resetButton?tabName=beta&sampleFileName=' + this.newSampleData.inputFileName,
+        {}
+      )
+
+      this.figureChartOption = this.oldChartOption
+
+      this.figureChartOption = cloneDeep(this.oldChartOption)
+      // this.isFirstFitting = true
+
+      this.isInverse = false
+    },
+
+    // 点击Fitting按钮执行重新计算
+    async handleFitting() {
+      const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v)
+      if (hasEmpty && this.list.length < 3) {
+        return
+      }
+      try {
+        const { success, result, message } = await postAction('/spectrumAnalysis/fitting', {
+          ...(this.list.length <= 0 ? this.newCalibrationFuncModel : []), // 如果list有数据则不传 C to E 表单数据 20231101：xiao
+          sampleFileName: this.newSampleData.inputFileName,
+          tabName: 'beta',
+          // 修改逻辑，如果列表中有数据 以列表的数据优先进行分析 20231028：Xiao
+          tempPoints:
+            this.list.length > 0
+              ? this.list.map((item) => ({ x: item.channel, y: item.energy }))
+              : this.oldScatterSeries,
+          // tempPoints: this.isFirstFitting
+          //   ? this.oldScatterSeries
+          //   : this.list.map((item) => ({ x: item.channel, y: item.energy })),
+          count: this.isFirstFitting || !this.isInverse ? undefined : this.count,
+        })
+        if (success) {
+          this.betaIsFitting = true
+          this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao
+
+          this.setCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao
+
+          this.setFirringResult(result)
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      }
+    },
+
+    // 封装 fitting后数据填充方法，如果点击ReAnalyze需要回显数据 20231101：xiao
+    setFirringResult(result) {
+      const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result
+      this.newE2C = EToC
+      this.newLineSeries = newLineSeries
+
+      if (tableWidgets) {
+        this.list = tableWidgets
+      }
+      // 反算时重新设置C to E 的值
+      if (CToE) {
+        const [paramA, paramB, paramC] = CToE
+        this.newCalibrationFuncModel = {
+          paramA: Number(paramA).toPrecision(6),
+          paramB: Number(paramB).toPrecision(6),
+          paramC: Number(paramC).toPrecision(6),
+        }
+      }
+      if (newLineSeries) {
+        const energyValues = newLineSeries.map((item) => item.y)
+
+        const { max: prevMax, min: prevMin } = this.oldChartOption.yAxis
+
+        const energyMax = Math.max(Math.max(...energyValues), prevMax)
+        const energyMin = Math.min(Math.min(...energyValues), prevMin)
+
+        const { min, max, interval } = splitAxis(energyMax, energyMin, 4)
+
+        this.figureChartOption.yAxis.max = max
+        this.figureChartOption.yAxis.min = min
+        this.figureChartOption.yAxis.interval = interval
+
+        this.figureChartOption.series[1].data = newLineSeries.map(({ x, y }) => [x, y])
+      }
+
+      if (newScatterSeriesData) {
+        this.figureChartOption.series[1].markPoint.data = newScatterSeriesData.map(({ x, y }) => {
+          return {
+            xAxis: x,
+            yAxis: y,
+          }
+        })
+      }
+    },
+
+    // 获取Figure Chart 最大值 和 最小值
+    getFigureChartMaxAndMin() {
+      const [series0, series1] = this.figureChartOption.series
+      const {
+        data: data0,
+        markPoint: { data: markPointData0 },
+      } = series0
+      const {
+        data: data1,
+        markPoint: { data: markPointData1 },
+      } = series1
+      const newArr = [
+        ...data0.map((item) => item[1]),
+        ...markPointData0.map((item) => item.yAxis),
+        ...data1.map((item) => item[1]),
+        ...markPointData1.map((item) => item.yAxis),
+      ]
+
+      return {
+        max: Math.max(...newArr),
+        min: Math.min(...newArr),
+      }
+    },
+
+    // 重新分析
+    handleReAnalyse() {
+      this.$bus.$emit('reanalyse', 'beta', this.newLineSeries)
+      this.$emit('exit')
+    },
+
+    /**
+     * 返回的科学计数法的字符串处理
+     * @param {string} str
+     */
+    scientificNotationStr2Fixed(str) {
+      if (str) {
+        const arr = str.split('E')
+        const start = arr[0]
+        const end = arr[1]
+        return `${Number(start).toPrecision(6)}${end ? 'e' + end : ''}`
+      }
+      return 0
+    },
+    getCache(name) {
+      return this.$ls.get(name)
+    },
+    setCache(name, data) {
+      this.$ls.set(name, data)
+    },
+    removeCache(name) {
+      this.$ls.remove(name) // 删除fitting之后缓存的数据 20231101:xiao
+    },
+  },
+  computed: {
+    rectHeight() {
+      const { top, bottom } = initialBetaGammaChartOption.grid
+      const totalHeight = 427 - top - bottom
+      return (totalHeight / 256) * this.gammaChannelWidth
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+p {
+  margin-bottom: 2px;
+}
+
+.content {
+  border: 1px solid #0c6a66;
+  padding: 10px;
+}
+
+.QCs {
+  display: flex;
+  gap: 10px;
+
+  .beta-gamma-spectrum {
+    flex: 10;
+
+    .settings {
+      margin-left: 90px;
+    }
+
+    .channel-and-width {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .energy {
+      span {
+        color: #f00;
+      }
+    }
+
+    .channel-and-width,
+    .energy {
+      label {
+        width: 60px;
+        display: inline-block;
+      }
+    }
+
+    .beta-gamma-chart {
+      height: 353px;
+      position: relative;
+
+      .markline {
+        position: absolute;
+        left: 55px;
+        width: 442px;
+        height: 1px;
+        background-color: red;
+        pointer-events: none;
+      }
+
+      .rect {
+        position: absolute;
+        left: 55px;
+        width: 446px;
+        border: 1px solid #0f0;
+        background-color: rgba(0, 255, 0, 0.4);
+        transform: translateY(-50%);
+        pointer-events: none;
+      }
+    }
+  }
+
+  .gamma-gated-beta-spectrum {
+    flex: 11;
+
+    .gamma-gated-chart {
+      height: 200px;
+      position: relative;
+
+      .ant-btn {
+        position: absolute;
+        left: 0;
+        bottom: 0;
+      }
+    }
+
+    .channel-and-energy {
+      margin-top: 10px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .ant-input-number {
+        width: 120px;
+      }
+
+      .ant-btn {
+        width: 100px;
+      }
+    }
+
+    .ant-table-wrapper {
+      margin-top: 10px;
+
+      &.has-data {
+        ::v-deep {
+          .ant-table-body {
+            height: 99px;
+            background-color: #06282a;
+          }
+        }
+      }
+
+      ::v-deep {
+        .ant-table-placeholder {
+          height: 100px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+
+.figure {
+  margin-top: 10px;
+
+  &-chart {
+    height: 200px;
+    position: relative;
+
+    .ant-btn {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+    }
+  }
+}
+
+.calibration-parameter {
+  margin-top: 10px;
+
+  .calibration-funcs {
+    margin-top: 15px;
+    display: flex;
+    gap: 30px;
+
+    &-func {
+      display: flex;
+      flex: 1;
+      gap: 10px;
+
+      > div {
+        &:first-child {
+          flex: 10;
+        }
+
+        &:nth-child(2) {
+          flex: 11;
+        }
+      }
+
+      .ant-input {
+        width: 70px;
+      }
+
+      .func {
+        display: flex;
+
+        span {
+          &:nth-child(2) {
+            flex: 1;
+            text-align: center;
+          }
+        }
+      }
+    }
+
+    &-btns {
+      width: 130px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+  }
+}
+
+.footer {
+  margin-top: 10px;
+  display: flex;
+  gap: 10px;
+
+  .title-over-border {
+    &:first-child {
+      flex: 4;
+    }
+
+    &:nth-child(2) {
+      flex: 5;
+
+      .ant-checkbox-wrapper {
+        width: 145px;
+      }
+    }
+  }
+
+  &-btns {
+    flex: 6;
+    display: flex;
+    justify-content: flex-end;
+    gap: 20px;
+    align-items: center;
+
+    .exit {
+      width: 130px;
+    }
+  }
+}
+
+.custom-tool-tip {
+  position: absolute;
+  border-style: solid;
+  white-space: nowrap;
+  z-index: 99999;
+  box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
+  border-width: 1px;
+  border-radius: 4px;
+  padding: 10px;
+  border-color: rgb(255, 255, 255);
+  pointer-events: none;
+  background-color: #00aa7f;
+  border-color: #00aa7f;
+
+  .channel {
+    color: #fff;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/GammaDetectorCalibration.vue
new file mode 100644
index 0000000..ae529ad
--- /dev/null
+++ b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/components/GammaDetectorCalibration.vue
@@ -0,0 +1,1017 @@
+<template>
+  <div class="gamma-detector-calibration">
+    <a-spin :spinning="isLoading">
+      <div class="content">
+        <div class="gamma-spectrum-qc">
+          <p>Gamma Spectrum: QC</p>
+          <div class="content">
+            <div class="gamma-spectrum-chart">
+              <custom-chart
+                ref="gammaSpectrumChart"
+                :option="gammaSpectrumChartOption"
+                @zr:click="handleGammaSpectrumChartClick"
+              />
+              <a-button type="primary" @click="handleSnapshot($refs.gammaSpectrumChart)" size="small"
+                >Snapshot</a-button
+              >
+              <!-- 自定义tooltip，用于点击图表后的tooltip显示 -->
+              <div
+                v-if="tooltipVisible"
+                class="custom-tool-tip"
+                :style="{
+                  top: tooltipPosition.top + 'px',
+                  left: tooltipPosition.left + 'px',
+                }"
+              >
+                <div class="channel">Channel: {{ tooltipChannel }}</div>
+              </div>
+              <!-- tooltip结束 -->
+            </div>
+          </div>
+          <div class="content channel-and-energy">
+            <a-form-model layout="inline">
+              <a-form-model-item label="Channel">
+                <a-input-number v-model="channelAndEnergyModel.channel" size="small"></a-input-number>
+              </a-form-model-item>
+              <a-form-model-item label="Energy">
+                <a-input-number
+                  ref="energyInputRef"
+                  v-model="channelAndEnergyModel.energy"
+                  size="small"
+                ></a-input-number>
+              </a-form-model-item>
+            </a-form-model>
+            <a-button type="primary" @click="handleAddChannelAndEnergy" size="small">Add</a-button>
+          </div>
+          <!-- 表格开始 -->
+          <a-table
+            size="small"
+            :columns="columns"
+            :dataSource="list"
+            :pagination="false"
+            :class="list.length ? 'has-data' : ''"
+            :scroll="{ y: 99 }"
+          >
+            <template slot="operation" slot-scope="text, record, index">
+              <a-icon type="delete" style="color: #f00" @click="handleDel(index)"></a-icon>
+            </template>
+          </a-table>
+          <!-- 表格结束 -->
+        </div>
+        <div class="figure">
+          <p class="title">Figure of Gamma Detector Calibration</p>
+          <div class="content">
+            <div class="figure-chart">
+              <custom-chart ref="figureChartRef" :option="figureChartOption" />
+              <a-button type="primary" @click="handleSnapshot($refs.figureChartRef)" size="small">Snapshot</a-button>
+            </div>
+          </div>
+        </div>
+        <div class="calibration-parameter">
+          <p>Calibration Parameter of Gamma Detector</p>
+          <div class="calibration-funcs">
+            <div class="calibration-funcs-func">
+              <title-over-border title="Old Calibration Function">
+                <p class="func">
+                  <span>C to E : </span>
+                  <span>
+                    E = {{ scientificNotationStr2Fixed(c2e[0]) }} &nbsp; + &nbsp;
+                    {{ scientificNotationStr2Fixed(c2e[1]) }}&nbsp;*C&nbsp;+&nbsp;{{
+                      scientificNotationStr2Fixed(c2e[2])
+                    }}
+                    *C <sup>2</sup>
+                  </span>
+                </p>
+                <div class="func">
+                  <span>E to C : </span>
+                  <span
+                    >C = {{ scientificNotationStr2Fixed(e2c[0]) }} + {{ scientificNotationStr2Fixed(e2c[1]) }} *E +
+                    {{ scientificNotationStr2Fixed(e2c[2]) }} *E <sup>2</sup>
+                  </span>
+                </div>
+              </title-over-border>
+              <title-over-border title="New Calibration Function">
+                <p class="func">
+                  <span>C to E : </span>
+                  <span>
+                    E =
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramA"
+                      @change="newCalibrationFuncModelChange()"
+                    />
+                    +
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramB"
+                      @change="newCalibrationFuncModelChange()"
+                    />
+                    *C +
+                    <a-input-number
+                      size="small"
+                      v-model="newCalibrationFuncModel.paramC"
+                      @change="newCalibrationFuncModelChange()"
+                    />
+                    *C <sup>2</sup>
+                  </span>
+                </p>
+                <div class="func">
+                  <span>E to C : </span>
+                  <span
+                    >C = {{ scientificNotationStr2Fixed(newE2C[0]) }} + {{ scientificNotationStr2Fixed(newE2C[1]) }} *E
+                    + {{ scientificNotationStr2Fixed(newE2C[2]) }} *E <sup>2</sup>
+                  </span>
+                </div>
+              </title-over-border>
+            </div>
+            <div class="calibration-funcs-btns">
+              <a-button type="primary" @click="handleReset">Reset Button</a-button>
+              <a-button type="primary" @click="handleFitting">Fitting</a-button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="footer">
+        <title-over-border title="New Calibration is Applied to">
+          <a-radio-group v-model="newCalibrationIsAppliedTo">
+            <p>
+              <a-radio value="1">All Spectra</a-radio>
+            </p>
+            <a-radio value="2">Current Spectrum</a-radio>
+          </a-radio-group>
+        </title-over-border>
+        <title-over-border title="Recalculate ROI Counts For">
+          <a-checkbox-group v-model="recalculateROICountsFor">
+            <p>
+              <a-checkbox value="sample">Sample Data</a-checkbox>
+              <a-checkbox value="gasBg">GasBg Data</a-checkbox>
+            </p>
+            <a-checkbox value="detBg">DetBg Data</a-checkbox>
+            <a-checkbox value="qc">QC Data</a-checkbox>
+          </a-checkbox-group>
+        </title-over-border>
+        <div class="footer-btns">
+          <a-button type="primary" @click="handleReAnalyse()">Reanalyse Spectrum Using New Calibration</a-button>
+          <a-button type="primary" class="exit" @click="handleExit()">Exit</a-button>
+        </div>
+      </div> -->
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import CustomChart from '@/components/CustomChart/index.vue'
+import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder.vue'
+import { getAction, postAction } from '@/api/manage'
+import { graphic } from 'echarts'
+import { exportEchartImg, getXAxisAndYAxisByPosition, splitAxis } from '@/utils/chartHelper'
+
+import { cloneDeep } from 'lodash'
+import { isNullOrUndefined } from '@/utils/util'
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
+import { f } from 'vue-area-linkage'
+
+const initialGammaSpectrumChartOption = {
+  grid: {
+    top: 10,
+    right: 15,
+    bottom: 50,
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      lineStyle: {
+        color: '#099D24',
+      },
+    },
+    formatter: (params) => {
+      const [channel] = params[0].value
+      return `<div class="channel">Channel: ${channel}</div>`
+    },
+    className: 'figure-chart-option-tooltip',
+  },
+  xAxis: {
+    min: 0,
+    max: 256,
+    interval: 64,
+    axisLine: {
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Channel',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 35,
+  },
+  yAxis: {
+    min: 0,
+    max: 0,
+    interval: 0,
+    axisLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Count',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 60,
+  },
+  series: {
+    type: 'line',
+    itemStyle: {
+      color: '#04ADD9',
+    },
+    areaStyle: {
+      color: new graphic.LinearGradient(0, 0, 0, 1, [
+        {
+          offset: 0,
+          color: 'rgba(4, 173, 217, 0.87)',
+        },
+        {
+          offset: 1,
+          color: 'rgba(4, 173, 217, 0.05)',
+        },
+      ]),
+    },
+    symbol: 'none',
+    data: [],
+    markLine: {
+      symbol: 'none',
+      label: {
+        show: false,
+      },
+      animation: false,
+      emphasis: {
+        disabled: true,
+      },
+      lineStyle: {
+        color: '#f00',
+      },
+      data: [],
+    },
+  },
+}
+
+const initialFigureChartOption = {
+  grid: {
+    top: 10,
+    right: 15,
+    bottom: 50,
+  },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      lineStyle: {
+        color: '#099D24',
+      },
+    },
+    formatter: (params) => {
+      const [series1, series2] = params
+      const [channel, energy1] = series1.value
+
+      let html = `<div class="channel">Channel: ${channel}</div>
+                  <div class="energy">Energy: ${energy1.toPrecision(6)}</div>`
+
+      if (series2) {
+        const [_, energy2] = series2.value
+        html += `<div class="warning">Energy: ${energy2.toPrecision(6)}</div>`
+      }
+
+      return html
+    },
+    className: 'figure-chart-option-tooltip',
+  },
+  xAxis: {
+    min: 0,
+    max: 256,
+    interval: 64,
+    axisLine: {
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Channel',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 35,
+  },
+  yAxis: {
+    min: 0,
+    max: 0,
+    interval: 0,
+    axisLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgb(119, 181, 213, 0.5)',
+      },
+    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: 'rgba(119, 181, 213, .2)',
+      },
+    },
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: '#ade6ee',
+    },
+    name: 'Energy[E/kev]',
+    nameLocation: 'center',
+    nameTextStyle: {
+      fontSize: 14,
+      color: '#5b9cba',
+    },
+    nameGap: 80,
+  },
+  series: [
+    {
+      type: 'line',
+      itemStyle: {
+        color: '#04ADD9',
+      },
+      symbol: 'none',
+      data: [],
+      markPoint: {
+        symbol: 'circle',
+        symbolSize: 8,
+        data: [],
+      },
+    },
+    {
+      type: 'line',
+      itemStyle: {
+        color: 'yellow',
+      },
+      symbol: 'none',
+      data: [],
+      markPoint: {
+        symbol: 'circle',
+        symbolSize: 8,
+        data: [],
+      },
+    },
+  ],
+}
+
+const columns = [
+  {
+    title: 'Index',
+    dataIndex: 'rowCount',
+    align: 'center',
+  },
+  {
+    title: 'Channel',
+    dataIndex: 'channel',
+    align: 'center',
+  },
+  {
+    title: 'Energy/keV',
+    dataIndex: 'energy',
+    align: 'center',
+    customRender: (text) => {
+      return text.toPrecision(6)
+    },
+  },
+  {
+    title: 'FWHM/C',
+    dataIndex: 'c',
+    align: 'center',
+  },
+  {
+    title: 'FWHM/keV',
+    dataIndex: 'keV',
+    align: 'center',
+  },
+  {
+    title: 'S',
+    align: 'center',
+    scopedSlots: {
+      customRender: 'operation',
+    },
+  },
+]
+
+const newCalibrationFuncModel = {
+  paramA: undefined,
+  paramB: undefined,
+  paramC: undefined,
+}
+
+export default {
+  mixins: [SampleDataMixin],
+  components: { CustomChart, TitleOverBorder },
+  props: {
+    isFirstFitting: {
+      type: Boolean,
+      required: false,
+    },
+  },
+  data() {
+    this.columns = columns
+
+    return {
+      gammaSpectrumChartOption: cloneDeep(initialGammaSpectrumChartOption),
+      figureChartOption: cloneDeep(initialFigureChartOption),
+      list: [],
+      isLoading: false,
+      c2e: [],
+      e2c: [],
+
+      newE2C: [],
+
+      tooltipVisible: false,
+      tooltipPosition: {
+        top: 0,
+        left: 0,
+      },
+      tooltipChannel: '',
+
+      channelAndEnergyModel: {
+        channel: undefined,
+        energy: undefined,
+      },
+
+      newCalibrationFuncModel: cloneDeep(newCalibrationFuncModel),
+
+      newCalibrationIsAppliedTo: '2',
+      recalculateROICountsFor: [],
+
+      count: 0, //反算时需要传递的数值  非反算的情况下不需要传递  数值大小是  第一次调用接口时返回的tableWidgets 大小
+      isInverse: false, // 是否需要反算
+      gammaIsFitting: false,
+    }
+  },
+  created() {
+    this.getData()
+  },
+  methods: {
+    handleExit() {
+      this.$emit('exit')
+    },
+
+    async getData() {
+      // 增加sampleFileName参数 20231101：xiao
+      const { sampleId = '', qcFileName, inputFileName } = this.newSampleData
+
+      try {
+        this.isLoading = true
+        const res = await getAction('/selfStation/viewGammaDetectorCalibration', {
+          sampleId,
+          qcFileName,
+          sampleFileName: inputFileName,
+          fittingBtn: this.isFirstFitting,
+        })
+
+        if (res.success) {
+          const { CToE, EToC, gammaEnergy, gammaSpectrum, max, min, oldScatterSeries, newCToE, newEToC } = res.result
+
+          this.c2e = CToE
+          this.e2c = EToC
+          this.oldScatterSeries = oldScatterSeries
+          this.count = oldScatterSeries.length
+
+          const { max: _max, min: _min, interval: _interval } = splitAxis(max, min, 4)
+
+          this.gammaSpectrumChartOption.yAxis.max = _max
+          this.gammaSpectrumChartOption.yAxis.min = _min
+          this.gammaSpectrumChartOption.yAxis.interval = _interval
+          this.gammaSpectrumChartOption.series.data = gammaSpectrum.map(({ x, y }) => [x, y])
+
+          const gammaEnergyValue = gammaEnergy.map((item) => item[0])
+
+          const {
+            max: __max,
+            min: __min,
+            interval: __interval,
+          } = splitAxis(Math.max(...gammaEnergyValue), Math.min(...gammaEnergyValue), 4)
+
+          this.figureChartOption.yAxis.max = __max
+          this.figureChartOption.yAxis.min = __min
+          this.figureChartOption.yAxis.interval = __interval
+          this.figureChartOption.series[0].data = gammaEnergyValue.map((item, index) => [index, item])
+          this.figureChartOption.series[0].markPoint.data = oldScatterSeries.map(({ x, y }) => ({ xAxis: x, yAxis: y }))
+
+          this.oldChartOption = cloneDeep(this.figureChartOption)
+
+          // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao
+          // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据
+          if (this.getCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName)) {
+            this.setFirringResult(this.getCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName))
+            return false
+          }
+
+          /**
+           * 对人工交互的返回数据单独处理
+           */
+          if (this.sampleData.dbName == 'man') {
+            const result = res.result
+            result.EToC = newEToC || []
+            result.CToE = newCToE
+            this.setFirringResult(result)
+          }
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    // Gamma Spectrum: QC 图表点击
+    handleGammaSpectrumChartClick(param) {
+      const { offsetX, offsetY } = param
+      const point = getXAxisAndYAxisByPosition(this.$refs.gammaSpectrumChart.getChartInstance(), offsetX, offsetY)
+      if (point) {
+        const xAxis = parseInt(point[0].toFixed())
+        this.gammaSpectrumChartOption.series.markLine.data = [{ xAxis }]
+
+        this.tooltipChannel = xAxis
+        this.tooltipPosition.top = offsetY
+        if (xAxis > 225) {
+          this.tooltipPosition.left = offsetX - 125
+        } else {
+          this.tooltipPosition.left = offsetX + 20
+        }
+        this.tooltipVisible = true
+        this.channelAndEnergyModel.channel = xAxis
+        this.channelAndEnergyModel.energy = undefined
+
+        this.$refs.energyInputRef.focus()
+      }
+    },
+
+    // 下载图表图片
+    handleSnapshot(chartRef) {
+      const chartInstance = chartRef.getChartInstance()
+      exportEchartImg(chartInstance)
+    },
+
+    // 增加新的Channel 和 Energy 到表格里
+    handleAddChannelAndEnergy() {
+      const { channel, energy } = this.channelAndEnergyModel
+
+      if (isNullOrUndefined(channel) || isNullOrUndefined(energy)) {
+        return
+      }
+
+      this.list.push({
+        rowCount: this.list.length + 1,
+        channel,
+        energy,
+      })
+
+      // add之后 需要清空chart黄色的线 20231028：Xiao
+      if (this.figureChartOption.series[1].data) {
+        this.figureChartOption.series[1].data = []
+      }
+
+      this.figureChartOption.series[1].markPoint.data.push({ xAxis: channel, yAxis: energy })
+
+      const { min, max } = this.getFigureChartMaxAndMin()
+
+      const newMax = energy > max ? energy : max
+      const newMin = energy < min ? energy : min
+
+      // 如果最大/最小值范围改变，重新计算范围
+      if (newMax === energy || newMin === energy) {
+        const { max: _max, min: _min, interval } = splitAxis(newMax, newMin, 4)
+        this.figureChartOption.yAxis.max = _max
+        this.figureChartOption.yAxis.min = _min
+        this.figureChartOption.yAxis.interval = interval
+      }
+
+      this.channelAndEnergyModel = {
+        channel: undefined,
+        energy: undefined,
+      }
+
+      this.isInverse = true
+    },
+    // 输入框发生变化
+    newCalibrationFuncModelChange(val, a) {
+      // 输入内容的时候 需要清空table数据 20231028：Xiao
+      this.list = []
+      // 需要清空chart黄色的线 20231028：Xiao
+      if (this.figureChartOption.series[1].data) {
+        this.figureChartOption.series[1].data = []
+      }
+      if (this.figureChartOption.series[1].markPoint.data) {
+        this.figureChartOption.series[1].markPoint.data = []
+      }
+    },
+
+    // 删除表格里的单项
+    handleDel(index) {
+      const willDelItem = this.list.splice(index, 1)[0]
+
+      const findIndex = this.figureChartOption.series[1].markPoint.data.findIndex(
+        (item) => item.xAxis == willDelItem.channel && item.yAxis == willDelItem.energy
+      )
+      if (-1 !== findIndex) {
+        const markPointData = this.figureChartOption.series[1].markPoint.data
+
+        const { max: prevMax, min: prevMin } = this.getFigureChartMaxAndMin()
+        const deletedItem = markPointData.splice(findIndex, 1)[0] // 删除图表上相应的点
+
+        // 如果最大/最小值范围改变，重新计算范围
+        if (deletedItem.yAxis == prevMax || deletedItem.yAxis == prevMin) {
+          const { max: newMax, min: newMin } = this.getFigureChartMaxAndMin()
+          const { max: _max, min: _min, interval } = splitAxis(newMax, newMin, 4)
+          this.figureChartOption.yAxis.max = _max
+          this.figureChartOption.yAxis.min = _min
+          this.figureChartOption.yAxis.interval = interval
+        }
+      }
+
+      this.isInverse = true
+    },
+
+    // 点击Reset Button 重置
+    async handleReset() {
+      this.$ls.remove('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao
+      this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel)
+      this.list = []
+      this.newE2C = []
+
+      // 按乔的要求增加请求reset的接口 20231211：xiao
+      const res = await postAction(
+        '/spectrumAnalysis/resetButton?tabName=gamma&sampleFileName=' + this.newSampleData.inputFileName,
+        {}
+      )
+
+      this.$emit('isFitting', false)
+
+      // 通知Beta页清空数据
+      this.$bus.$emit('betaRefresh', {})
+
+      this.figureChartOption = cloneDeep(this.oldChartOption)
+      this.isInverse = false
+    },
+
+    // 点击Fitting按钮执行重新计算
+    async handleFitting() {
+      const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v)
+      if (hasEmpty && this.list.length < 3) {
+        return
+      }
+      try {
+        const { success, result, message } = await postAction('/spectrumAnalysis/fitting', {
+          ...(this.list.length <= 0 ? this.newCalibrationFuncModel : []), // 如果list有数据则不传 C to E 表单数据 20231101：xiao
+          sampleFileName: this.newSampleData.inputFileName,
+          tabName: 'gamma',
+          // 如果列表中有数据 以列表的数据优先进行分析 20231028：Xiao
+          tempPoints:
+            this.list.length > 0
+              ? this.list.map((item) => ({ x: item.channel, y: item.energy }))
+              : this.oldScatterSeries,
+
+          // tempPoints: this.isFirstFitting
+          // ? this.oldScatterSeries
+          // : this.list.map((item) => ({ x: item.channel, y: item.energy })),
+          count: this.isFirstFitting || !this.isInverse ? undefined : this.count,
+          fittingBtn: this.isFirstFitting,
+        })
+        if (success) {
+          this.gammaIsFitting = true
+          this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao
+
+          this.setCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao
+
+          this.setFirringResult(result)
+
+          // 通知Beta页清空数据
+          this.$bus.$emit('betaRefresh', {})
+          console.log('betaRefresh>>>')
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      }
+    },
+
+    // 封装 fitting后数据填充方法，如果点击ReAnalyze需要回显数据 20231101：xiao
+    setFirringResult(result) {
+      const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result
+      this.newE2C = EToC
+      this.newLineSeries = newLineSeries
+
+      if (tableWidgets) {
+        this.list = tableWidgets
+      }
+      // 反算时重新设置C to E 的值
+      if (CToE) {
+        const [paramA, paramB, paramC] = CToE
+        this.newCalibrationFuncModel = {
+          paramA: Number(paramA).toPrecision(6),
+          paramB: Number(paramB).toPrecision(6),
+          paramC: Number(paramC).toPrecision(6),
+        }
+      }
+
+      if (newLineSeries) {
+        const energyValues = newLineSeries.map((item) => item.y)
+
+        const { max: prevMax, min: prevMin } = this.oldChartOption.yAxis
+
+        const energyMax = Math.max(Math.max(...energyValues), prevMax)
+        const energyMin = Math.min(Math.min(...energyValues), prevMin)
+
+        const { min, max, interval } = splitAxis(energyMax, energyMin, 4)
+
+        this.figureChartOption.yAxis.max = max
+        this.figureChartOption.yAxis.min = min
+        this.figureChartOption.yAxis.interval = interval
+
+        this.figureChartOption.series[1].data = newLineSeries.map(({ x, y }) => [x, y])
+      }
+
+      if (newScatterSeriesData) {
+        this.figureChartOption.series[1].markPoint.data = newScatterSeriesData.map(({ x, y }) => ({
+          xAxis: x,
+          yAxis: y,
+        }))
+      }
+    },
+
+    // 获取Figure Chart 最大值 和 最小值
+    getFigureChartMaxAndMin() {
+      const [series0, series1] = this.figureChartOption.series
+      const {
+        data: data0,
+        markPoint: { data: markPointData0 },
+      } = series0
+      const {
+        data: data1,
+        markPoint: { data: markPointData1 },
+      } = series1
+      const newArr = [
+        ...data0.map((item) => item[1]),
+        ...markPointData0.map((item) => item.yAxis),
+        ...data1.map((item) => item[1]),
+        ...markPointData1.map((item) => item.yAxis),
+      ]
+
+      return {
+        max: Math.max(...newArr),
+        min: Math.min(...newArr),
+      }
+    },
+
+    // 重新分析
+    handleReAnalyse() {
+      this.$bus.$emit('reanalyse', 'gamma', this.newLineSeries)
+      this.$emit('exit')
+    },
+
+    /**
+     * 返回的科学计数法的字符串处理
+     * @param {string} str
+     */
+    scientificNotationStr2Fixed(str) {
+      if (str) {
+        const arr = str.split('E')
+        const start = arr[0]
+        const end = arr[1]
+        return `${Number(start).toPrecision(6)}${end ? 'e' + end : ''}`
+      }
+      return 0
+    },
+    getCache(name) {
+      return this.$ls.get(name)
+    },
+    setCache(name, data) {
+      this.$ls.set(name, data)
+    },
+    removeCache(name) {
+      this.$ls.remove(name) // 删除fitting之后缓存的数据 20231101:xiao
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+p {
+  margin-bottom: 2px;
+}
+
+.content {
+  border: 1px solid #0c6a66;
+  padding: 10px;
+}
+.gamma-spectrum-qc {
+  .gamma-spectrum-chart {
+    height: 200px;
+    position: relative;
+
+    .ant-btn {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+    }
+  }
+
+  .channel-and-energy {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+
+    .ant-input-number {
+      width: 150px;
+    }
+
+    .ant-btn {
+      margin-left: 30px;
+      width: 130px;
+    }
+  }
+
+  .ant-table-wrapper {
+    margin-top: 10px;
+
+    &.has-data {
+      ::v-deep {
+        .ant-table-body {
+          height: 99px;
+          background-color: #06282a;
+        }
+      }
+    }
+
+    ::v-deep {
+      .ant-table-placeholder {
+        height: 100px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
+}
+
+.figure {
+  margin-top: 10px;
+
+  &-chart {
+    height: 200px;
+    position: relative;
+
+    .ant-btn {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+    }
+  }
+}
+
+.calibration-parameter {
+  margin-top: 10px;
+
+  .calibration-funcs {
+    margin-top: 15px;
+    display: flex;
+    gap: 30px;
+
+    &-func {
+      display: flex;
+      flex: 1;
+      gap: 10px;
+
+      > div {
+        &:first-child {
+          flex: 10;
+        }
+
+        &:nth-child(2) {
+          flex: 11;
+        }
+      }
+
+      .ant-input {
+        width: 70px;
+      }
+
+      .func {
+        display: flex;
+
+        span {
+          &:nth-child(2) {
+            flex: 1;
+            text-align: center;
+          }
+        }
+      }
+    }
+
+    &-btns {
+      width: 130px;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+  }
+}
+
+.footer {
+  margin-top: 10px;
+  display: flex;
+  gap: 10px;
+
+  .title-over-border {
+    &:first-child {
+      flex: 4;
+    }
+
+    &:nth-child(2) {
+      flex: 5;
+
+      .ant-checkbox-wrapper {
+        width: 145px;
+      }
+    }
+  }
+
+  &-btns {
+    flex: 6;
+    display: flex;
+    justify-content: flex-end;
+    gap: 20px;
+    align-items: center;
+
+    .exit {
+      width: 130px;
+    }
+  }
+}
+
+.custom-tool-tip {
+  position: absolute;
+  border-style: solid;
+  white-space: nowrap;
+  z-index: 99999;
+  box-shadow: rgba(0, 0, 0, 0.2) 1px 2px 10px;
+  border-width: 1px;
+  border-radius: 4px;
+  padding: 10px;
+  border-color: rgb(255, 255, 255);
+  pointer-events: none;
+  background-color: #00aa7f;
+  border-color: #00aa7f;
+
+  .channel {
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/index.vue
new file mode 100644
index 0000000..eb911b9
--- /dev/null
+++ b/src/views/spectrumAnalysis/components/Modals/NewBetaModals/CalibrationModal/index.vue
@@ -0,0 +1,282 @@
+<template>
+  <custom-modal
+    v-model="visible"
+    :width="1200"
+    title="Tool of Calibration"
+    class="beta-gamma-tool-of-calibration"
+    :footer="null"
+    destroy-on-close
+    @cancel="handleExit"
+  >
+    <a-tabs :animated="false" v-model="currTab">
+      <a-tab-pane tab="Gamma Detector Calibration" key="gamma">
+        <gamma-detector-calibration @isFitting="getFittingFlag_gamma" :isFirstFitting="gammaEnergyValid" />
+      </a-tab-pane>
+      <a-tab-pane tab="Beta Detector Calibration" key="beta">
+        <beta-detector-calibration @isFitting="getFittingFlag_beta" :isFirstFitting="betaEnergyValid" />
+      </a-tab-pane>
+    </a-tabs>
+    <div class="footer">
+      <title-over-border title="New Calibration is Applied to">
+        <a-radio-group v-model="newCalibrationIsAppliedTo">
+          <p>
+            <a-radio value="AllSpectrum">All Spectra</a-radio>
+          </p>
+          <a-radio value="CurrentSpectrum">Current Spectrum</a-radio>
+        </a-radio-group>
+      </title-over-border>
+      <title-over-border title="Recalculate ROI Counts For">
+        <a-checkbox-group v-model="recalculateROICountsFor" @change="recalculateROICountsForChange">
+          <p>
+            <a-checkbox value="sample">Sample Data</a-checkbox>
+            <a-checkbox value="gasBg">GasBg Data</a-checkbox>
+          </p>
+          <a-checkbox value="detBg">DetBg Data</a-checkbox>
+          <a-checkbox value="qc">QC Data</a-checkbox>
+        </a-checkbox-group>
+      </title-over-border>
+      <div class="footer-btns">
+        <a-button type="primary" @click="handleReAnalyse">Reanalyse Spectrum Using New Calibration</a-button>
+        <a-button type="primary" class="exit" @click="handleExit">Exit</a-button>
+      </div>
+    </div>
+  </custom-modal>
+</template>
+
+<script>
+import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
+import { postAction } from '@/api/manage'
+import BetaDetectorCalibration from './components/BetaDetectorCalibration.vue'
+import GammaDetectorCalibration from './components/GammaDetectorCalibration.vue'
+import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder.vue'
+import { removeSampleData } from '@/utils/SampleStore'
+export default {
+  components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
+  mixins: [SampleDataMixin],
+  props: {
+    sampleList: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      visible: false,
+      currTab: 'gamma',
+      newCalibrationIsAppliedTo: 'CurrentSpectrum',
+      recalculateROICountsFor: [],
+      checkFlag: {
+        checkSample: false,
+        checkGas: false,
+        checkDet: false,
+      },
+      betaEnergyValid: false,
+      gammaEnergyValid: false,
+      isReanlyze: false,
+    }
+  },
+  methods: {
+    show() {
+      this.currTab = 'gamma'
+      this.visible = true
+    },
+
+    recalculateROICountsForChange(checkedVal) {
+      this.recalculateROICountsFor = checkedVal
+      this.checkFlag.checkSample = checkedVal.includes('sample') ? true : false
+      this.checkFlag.checkGas = checkedVal.includes('gasBg') ? true : false
+      this.checkFlag.checkDet = checkedVal.includes('detBg') ? true : false
+      this.$emit('sendInfo', this.checkFlag)
+    },
+    getFittingFlag_beta(val) {
+      this.betaEnergyValid = val
+      console.log('betaEnergyValid>>>' + this.betaEnergyValid)
+    },
+    getFittingFlag_gamma(val) {
+      this.gammaEnergyValid = val
+      // 1. Beta数据依赖于Gamma
+      // 2. 如果Gamma情况数据，beta也需要
+      // if(!this.gammaEnergyValid){
+      //   this.betaEnergyValid = val;
+      //   console.log("重置Beta>>"+this.betaEnergyValid)
+      // }
+      console.log('gammaEnergyValid>>>' + this.gammaEnergyValid)
+    },
+    handleReAnalyse() {
+      // todo 1.fitting之后才能点击; 2.isReAnalyze需要缓存
+      if (!this.gammaEnergyValid && !this.betaEnergyValid) {
+        return false
+      }
+      const regExp = /^([A-Z]{1,}\d{1,})_/
+      const regMatched = this.newSampleData.inputFileName.match(regExp)
+      const currStationName = regMatched[1]
+      const dbNames = [],
+        sampleIds = [],
+        sampleFileNames = [],
+        gasFileNames = [],
+        detFileNames = [],
+        qcFileNames = []
+
+      const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
+      matchedSampleList.forEach(
+        ({ dbName, sampleId, inputFileName, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
+          dbNames.push(dbName || '')
+          sampleIds.push(sampleId || '')
+          sampleFileNames.push(sampleFileName || inputFileName || '')
+          gasFileNames.push(gasFileName || '')
+          detFileNames.push(detFileName || '')
+          qcFileNames.push(qcFileStatus ? qcFileName : '')
+        }
+      )
+
+      let params = {
+        applyType: this.newCalibrationIsAppliedTo,
+        sampleData: this.recalculateROICountsFor.includes('sample') ? true : false,
+        gasBgData: this.recalculateROICountsFor.includes('gasBg') ? true : false,
+        detBgData: this.recalculateROICountsFor.includes('detBg') ? true : false,
+        qcData: this.recalculateROICountsFor.includes('qc') ? true : false,
+        betaEnergyValid: this.betaEnergyValid,
+        gammaEnergyValid: this.gammaEnergyValid,
+        dbNames,
+        sampleIds,
+        sampleFileNames,
+        gasFileNames,
+        detFileNames,
+        qcFileNames,
+        currentFileName: this.newSampleData.inputFileName,
+        currentQCFileName: this.newSampleData.qcFileName,
+      }
+      postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => {
+        if (res.success) {
+          res.result.XeData.forEach((item) => {
+            item.conc = parseFloat(item.conc.toPrecision(6))
+            item.concErr = parseFloat(item.concErr.toPrecision(6))
+            item.lc = parseFloat(item.lc.toPrecision(6))
+            item.mdc = parseFloat(item.mdc.toPrecision(6))
+          })
+          this.$emit('sendXeData', res.result.XeData)
+          this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
+          this.isReanlyze = true
+          this.handleExit()
+          this.$bus.$emit('ReAnalyses', res.result)
+          if (res.result.bProcessed) {
+            this.$message.success(res.result.message)
+          } else {
+            this.$message.warning(res.result.message)
+          }
+
+          if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
+            let sameStation = matchedSampleList.filter(
+              (item) => item.inputFileName !== this.newSampleData.inputFileName
+            )
+            this.clearSameStationCache(sameStation)
+            this.setSameStationCalibarationCache(sameStation)
+          }
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+
+    // 清理相同台站的缓存
+    clearSameStationCache(sampleList) {
+      sampleList.forEach(({ inputFileName }) => {
+        removeSampleData(inputFileName)
+      })
+    },
+    // 相同台站能谱缓存一样的Calibration数据 20231115：xiao
+    setSameStationCalibarationCache(sampleList) {
+      sampleList.forEach(({ inputFileName }) => {
+        console.log('inputFileName:' + inputFileName)
+        // 根据tab页缓存对应数据
+        if (this.currTab === 'gamma') {
+          this.$ls.set(
+            'CALIBRATION_GAMMA_' + inputFileName,
+            this.$ls.get('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName)
+          )
+        }
+        if (this.currTab === 'beta') {
+          this.$ls.set(
+            'CALIBRATION_BETA_' + inputFileName,
+            this.$ls.get('CALIBRATION_BETA_' + this.newSampleData.inputFileName)
+          )
+        }
+      })
+    },
+
+    handleExit() {
+      console.log('this.currTab>>>' + this.currTab)
+      this.gammaEnergyValid = this.isReanlyze
+      if (!this.isReanlyze && (!this.gammaEnergyValid || !this.gammaEnergyValid)) {
+        // 如果没有点击ReANalyze，删除fitting之后缓存的数据 20231101:xiao
+        // 1. Beta数据依赖于Gamma
+        // 2. 点击reanalyze，如果beta有数据也要缓存
+        this.$ls.remove('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName)
+        this.$ls.remove('CALIBRATION_BETA_' + this.newSampleData.inputFileName)
+      }
+      this.visible = false
+    },
+  },
+}
+</script>
+
+<style lang="less">
+.beta-gamma-tool-of-calibration {
+  .ant-modal-body {
+    padding-top: 0;
+  }
+
+  .ant-tabs-nav .ant-tabs-tab {
+    padding: 5px 10px;
+    margin: 0 !important;
+  }
+}
+</style>
+
+<style lang="less" scoped>
+::v-deep {
+  .ant-modal {
+    top: 5px;
+    padding-bottom: 15px;
+  }
+  .ant-form-item-label,
+  .ant-form-item-control {
+    line-height: 30px !important;
+  }
+
+  .title-over-border-content {
+    padding: 10px;
+  }
+}
+.footer {
+  margin-top: 10px;
+  display: flex;
+  gap: 10px;
+
+  .title-over-border {
+    &:first-child {
+      flex: 4;
+    }
+
+    &:nth-child(2) {
+      flex: 5;
+
+      .ant-checkbox-wrapper {
+        width: 145px;
+      }
+    }
+  }
+
+  &-btns {
+    flex: 6;
+    display: flex;
+    justify-content: flex-end;
+    gap: 20px;
+    align-items: center;
+
+    .exit {
+      width: 130px;
+    }
+  }
+}
+</style>
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 2c82922..4358879 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -242,6 +242,8 @@
     <statistics-paramer-history-modal v-model="statisticsParamerHistoryModalVisible" />
     <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 结束 -->
     <bg-log-viewer v-model="bgLogViewerVisible" />
+
+    <CalibrationModal :sampleList="sampleList" ref="newCalibrationModalRef" />
   </div>
 </template>
 <script>
@@ -289,6 +291,8 @@ import FtransltModal from './components/Modals/FtransltModal/index.vue'
 import BetaGammaEnergyCalibrationModal from './components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue'
 import AutomaticAnalysisLogModal from './components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue'
 import BetaGammaExtrapolationModal from './components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue'
+import CalibrationModal from './components/Modals/NewBetaModals/CalibrationModal/index.vue'
+
 import { getAction } from '@/api/manage'
 import { clearSampleCache } from './clearSampleCache'
 import { fetchAndDownload } from '@/utils/file'
@@ -352,6 +356,7 @@ export default {
     BetaGammaExtrapolationModal,
     BgLogViewer: BGLogViewer,
     CompareFromDbModal,
+    CalibrationModal,
   },
 
   provide() {
@@ -1028,6 +1033,11 @@ export default {
       }
     },
 
+    // 新的beta的
+    handleNewBetaEnergyCalib() {
+      this.$refs.newCalibrationModalRef.show()
+    },
+
     // 获取颜色配置
     async getColorConfig() {
       try {
@@ -1407,7 +1417,16 @@ export default {
                     if (this.isBeta) this.efficiencyCalibrationModalShow_beta = true
                   },
                 },
+                // 自建的那个beta
                 {
+                  type: 'a-menu-item',
+                  title: 'Energy Calibration',
+                  show: this.isBeta,
+                  handler: () => this.handleNewBetaEnergyCalib(),
+                },
+
+                {
+                  // 旧的beta
                   type: 'a-menu-item',
                   title: 'Energy Calibration',
                   show: this.isBetaGamma,