fix: 自建台站加载来自DB的谱时，调用PeakInfomation未传参问题

fix: 自建台站从DB加载时，对是否已分析判断不正确问题
fix: 自建台站Load From File重新加载谱时报错问题
2025-02-20 15:55:48 +08:00 · 2025-02-20 15:55:17 +08:00 · 2025-02-20 14:54:51 +08:00 · 2025-02-20 14:54:01 +08:00 · 2025-02-20 09:38:33 +08:00
8 changed files with 268 additions and 26 deletions
--- a/src/views/spectrumAnalysis/beta-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-analysis.vue
@ -322,7 +322,7 @@ export default {

      updateSampleData({
        inputFileName,
-        key: 'isReprocessed',
+        key: 'savedAnalysisResult',
        data: true,
      })
    },
--- a/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/BetaModal.vue
@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" title="Beta" width="800px" destroy-on-close>
+  <custom-modal v-model="visible" title="Beta" width="800px" destroy-on-close enable-full-screen>
    <div class="beta-modal">
      <div class="beta-modal__header">
        <span class="count">Channel: {{ axisInfo.channel }}</span>
@ -7,15 +7,31 @@
        <span class="energy">Energy: {{ axisInfo.energy }}</span>
      </div>
      <div class="beta-modal__content">
-        <custom-chart :option="option" autoresize />
+        <CustomChart
+          ref="chartRef"
+          :option="option"
+          :opts="opts"
+          autoresize
+          @zr:mousedown="handleMouseDown"
+          @zr:mouseup="handleMouseUp"
+          @brushEnd="handleBrushEnd"
+        />
      </div>
    </div>
+    <template slot="custom-footer">
+      <div style="text-align: center">
+        <a-space>
+          <a-button type="success" @click="handleUnzoom">Unzoom</a-button>
+          <a-button type="warn" @click="visible = false">Cancel</a-button>
+        </a-space>
+      </div>
+    </template>
  </custom-modal>
 </template>

 <script>
 import CustomChart from '@/components/CustomChart/index.vue'
-import { buildLineSeries } from '@/utils/chartHelper'
+import { buildLineSeries, getAxisMax, rangeNumber } from '@/utils/chartHelper'
 import { cloneDeep } from 'lodash'

 const initialOption = {
@ -96,6 +112,7 @@ const initialOption = {
    max: 'dataMax',
  },
  series: buildLineSeries('Line', [], 'yellow'),
+  brush: {},
 }

 const initialAxisInfo = {
@ -113,6 +130,10 @@ export default {
      visible: false,
      option: cloneDeep(initialOption),
      axisInfo: cloneDeep(initialAxisInfo),
+
+      opts: {
+        notMerge: false,
+      },
    }
  },
  created() {
@ -124,6 +145,17 @@ export default {
      this.energys = energys || []
      this.axisInfo = cloneDeep(initialAxisInfo)
      this.visible = true
+      this.$nextTick(() => {
+        this.option.brush = { toolbox: [] }
+        this.handleUnzoom()
+      })
+    },
+
+    handleUnzoom() {
+      this.option.xAxis.min = 0
+      this.option.xAxis.max = 512
+      this.option.yAxis.min = 1
+      this.option.yAxis.max = 'dataMax'
    },

    handleTooltipFormat(params) {
@ -134,6 +166,81 @@ export default {
        energy: (this.energys[channel] || 0).toFixed(3),
      }
    },
+
+    getChart() {
+      return this.$refs.chartRef.getChartInstance()
+    },
+
+    // 鼠标按下时开启可刷选状态
+    handleMouseDown() {
+      const chart = this.getChart()
+      chart.dispatchAction({
+        type: 'takeGlobalCursor',
+        // 如果想变为“可刷选状态”，必须设置。不设置则会关闭“可刷选状态”。
+        key: 'brush',
+        brushOption: {
+          // 参见 brush 组件的 brushType。如果设置为 false 则关闭“可刷选状态”。
+          brushType: 'rect',
+        },
+      })
+    },
+
+    handleMouseUp() {
+      this.$nextTick(() => {
+        this.clearBrush()
+      })
+    },
+
+    clearBrush() {
+      const chart = this.getChart()
+      // 清理刷选的范围
+      chart.dispatchAction({
+        type: 'brush',
+        areas: [],
+      })
+
+      // 改为不可刷选状态
+      chart.dispatchAction({
+        type: 'takeGlobalCursor',
+      })
+    },
+
+    // 刷选完毕时
+    handleBrushEnd(param) {
+      const chart = this.getChart()
+      const areas = param.areas[0]
+      if (areas) {
+        const range = areas.range
+        const [[minX, maxX], [minY, maxY]] = range
+
+        const point1 = chart.convertFromPixel({ seriesIndex: 0 }, [minX, minY]).map((num) => parseInt(num.toFixed()))
+        const point2 = chart.convertFromPixel({ seriesIndex: 0 }, [maxX, maxY]).map((num) => parseInt(num.toFixed()))
+
+        // 拿到之前的最大值
+        const xAxisMax = getAxisMax(chart, 'xAxis')
+        const yAxisMax = getAxisMax(chart, 'yAxis')
+
+        // 拿到之前的最小值
+        const xAxisMin = this.option.xAxis.min
+        const yAxisMin = this.option.yAxis.min
+
+        let [x1, y2, x2, y1] = [...point1, ...point2] // 根据解析出的数据确定真实的范围
+
+        const xAxisLimit = rangeNumber(xAxisMin, xAxisMax)
+        const yAxisLimit = rangeNumber(yAxisMin, yAxisMax)
+
+        x1 = xAxisLimit(x1)
+        x2 = xAxisLimit(x2)
+
+        y1 = yAxisLimit(y1)
+        y2 = yAxisLimit(y2)
+
+        this.option.xAxis.min = x1
+        this.option.xAxis.max = x2
+        this.option.yAxis.min = y1
+        this.option.yAxis.max = y2
+      }
+    },
  },
 }
 </script>
@ -169,4 +276,16 @@ export default {
    overflow: hidden;
  }
 }
+
+.fullscreen {
+  ::v-deep {
+    .ant-modal-body {
+      height: calc(100% - 93px);
+
+      .beta-modal {
+        height: 100%;
+      }
+    }
+  }
+}
 </style>
--- a/src/views/spectrumAnalysis/components/Modals/SelfStation/CalibrationModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/CalibrationModal/index.vue
@ -80,11 +80,10 @@ export default {
      console.log('gammaEnergyValid>>>' + this.gammaEnergyValid)
    },
    async handleReAnalyse() {
-      const {
-        data: { isReprocessed },
-      } = getSampleData(this.newSampleData.inputFileName)
+      const { data } = getSampleData(this.newSampleData.inputFileName)
+      const { savedAnalysisResult } = data

-      if (!isReprocessed) {
+      if (!savedAnalysisResult) {
        this.$message.warning('Please analyze the spectrum first')
        return
      }
--- a/src/views/spectrumAnalysis/components/Modals/SelfStation/GammaModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/GammaModal.vue
@ -1,5 +1,5 @@
 <template>
-  <custom-modal v-model="visible" title="Gamma" width="800px" destroy-on-close>
+  <custom-modal v-model="visible" title="Gamma" width="800px" destroy-on-close enable-full-screen>
    <div class="gamma-modal">
      <div class="gamma-modal__header">
        <span class="count">Channel: {{ axisInfo.channel }}</span>
@ -7,15 +7,31 @@
        <span class="energy">Energy: {{ axisInfo.energy }}</span>
      </div>
      <div class="gamma-modal__content">
-        <custom-chart :option="option" autoresize />
+        <CustomChart
+          ref="chartRef"
+          :option="option"
+          :opts="opts"
+          autoresize
+          @zr:mousedown="handleMouseDown"
+          @zr:mouseup="handleMouseUp"
+          @brushEnd="handleBrushEnd"
+        />
      </div>
    </div>
+    <template slot="custom-footer">
+      <div style="text-align: center">
+        <a-space>
+          <a-button type="success" @click="handleUnzoom">Unzoom</a-button>
+          <a-button type="warn" @click="visible = false">Cancel</a-button>
+        </a-space>
+      </div>
+    </template>
  </custom-modal>
 </template>

 <script>
 import CustomChart from '@/components/CustomChart/index.vue'
-import { buildLineSeries } from '@/utils/chartHelper'
+import { buildLineSeries, getAxisMax, rangeNumber } from '@/utils/chartHelper'
 import { cloneDeep } from 'lodash'

 const initialOption = {
@ -96,6 +112,7 @@ const initialOption = {
    max: 'dataMax',
  },
  series: buildLineSeries('Line', [], 'yellow'),
+  brush: {},
 }

 const initialAxisInfo = {
@ -113,6 +130,10 @@ export default {
      visible: false,
      option: cloneDeep(initialOption),
      axisInfo: cloneDeep(initialAxisInfo),
+
+      opts: {
+        notMerge: false,
+      },
    }
  },
  created() {
@ -124,6 +145,17 @@ export default {
      this.energys = energys || []
      this.axisInfo = cloneDeep(initialAxisInfo)
      this.visible = true
+      this.$nextTick(() => {
+        this.option.brush = { toolbox: [] }
+        this.handleUnzoom()
+      })
+    },
+
+    handleUnzoom() {
+      this.option.xAxis.min = 0
+      this.option.xAxis.max = 4096
+      this.option.yAxis.min = 1
+      this.option.yAxis.max = 'dataMax'
    },

    handleTooltipFormat(params) {
@ -134,6 +166,81 @@ export default {
        energy: (this.energys[channel] || 0).toFixed(3),
      }
    },
+
+    getChart() {
+      return this.$refs.chartRef.getChartInstance()
+    },
+
+    // 鼠标按下时开启可刷选状态
+    handleMouseDown() {
+      const chart = this.getChart()
+      chart.dispatchAction({
+        type: 'takeGlobalCursor',
+        // 如果想变为“可刷选状态”，必须设置。不设置则会关闭“可刷选状态”。
+        key: 'brush',
+        brushOption: {
+          // 参见 brush 组件的 brushType。如果设置为 false 则关闭“可刷选状态”。
+          brushType: 'rect',
+        },
+      })
+    },
+
+    handleMouseUp() {
+      this.$nextTick(() => {
+        this.clearBrush()
+      })
+    },
+
+    clearBrush() {
+      const chart = this.getChart()
+      // 清理刷选的范围
+      chart.dispatchAction({
+        type: 'brush',
+        areas: [],
+      })
+
+      // 改为不可刷选状态
+      chart.dispatchAction({
+        type: 'takeGlobalCursor',
+      })
+    },
+
+    // 刷选完毕时
+    handleBrushEnd(param) {
+      const chart = this.getChart()
+      const areas = param.areas[0]
+      if (areas) {
+        const range = areas.range
+        const [[minX, maxX], [minY, maxY]] = range
+
+        const point1 = chart.convertFromPixel({ seriesIndex: 0 }, [minX, minY]).map((num) => parseInt(num.toFixed()))
+        const point2 = chart.convertFromPixel({ seriesIndex: 0 }, [maxX, maxY]).map((num) => parseInt(num.toFixed()))
+
+        // 拿到之前的最大值
+        const xAxisMax = getAxisMax(chart, 'xAxis')
+        const yAxisMax = getAxisMax(chart, 'yAxis')
+
+        // 拿到之前的最小值
+        const xAxisMin = this.option.xAxis.min
+        const yAxisMin = this.option.yAxis.min
+
+        let [x1, y2, x2, y1] = [...point1, ...point2] // 根据解析出的数据确定真实的范围
+
+        const xAxisLimit = rangeNumber(xAxisMin, xAxisMax)
+        const yAxisLimit = rangeNumber(yAxisMin, yAxisMax)
+
+        x1 = xAxisLimit(x1)
+        x2 = xAxisLimit(x2)
+
+        y1 = yAxisLimit(y1)
+        y2 = yAxisLimit(y2)
+
+        this.option.xAxis.min = x1
+        this.option.xAxis.max = x2
+        this.option.yAxis.min = y1
+        this.option.yAxis.max = y2
+      }
+    },
  },
 }
 </script>
@ -169,4 +276,16 @@ export default {
    overflow: hidden;
  }
 }
+
+.fullscreen {
+  ::v-deep {
+    .ant-modal-body {
+      height: calc(100% - 93px);
+
+      .gamma-modal {
+        height: 100%;
+      }
+    }
+  }
+}
 </style>
--- a/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationPeakInfomation.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationPeakInfomation.vue
@ -96,7 +96,7 @@ export default {
    async getInfo() {
      try {
        this.isLoading = true
-        const { sampleFileName } = this.sampleData
+        const { inputFileName: sampleFileName } = this.sampleData
        const { success, result, message } = await getAction('/selfStation/peakInformation', {
          sampleFileName,
        })
--- a/src/views/spectrumAnalysis/components/RoiLimits/RoiLimits.vue
+++ b/src/views/spectrumAnalysis/components/RoiLimits/RoiLimits.vue
@ -1,9 +1,9 @@
 <template>
  <div class="beta-gamma-spectrum" :class="{ 'has-max': isMax }">
    <roi-limit-item
-      v-for="(_, index) in 4"
+      v-for="(item, index) in RoiTitleNames"
      :key="index"
-      :title="`ROI${index + 1}`"
+      :title="`ROI${index + 1}: ${item}`"
      :title-color="RoiTitleColors[index]"
      :roi-list="ROILists[index]"
      :analyze-result="ROIAnalyzeLists[index]"
@ -18,6 +18,8 @@ import CustomChart from '@/components/CustomChart/index.vue'
 import RoiLimitItem from './components/RoiLimitItem.vue'
 const RoiTitleColors = ['#0CB4C1', '#1B88E5', '#43960C', '#D09324']

+const RoiTitleNames = ['XE-131m', 'XE-133m', 'XE-133', 'XE-135']
+
 // 折线图配置
 export default {
  components: {
@ -39,6 +41,7 @@ export default {

    return {
      isMax: false,
+      RoiTitleNames,
    }
  },
  methods: {
--- a/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue
+++ b/src/views/spectrumAnalysis/components/RoiLimits/components/RoiLimitItem.vue
@ -515,10 +515,10 @@ export default {
    align-items: center;

    &-title {
-      width: 46px;
+      width: 100px;
      height: 100%;
      line-height: 18px;
-      text-align: center;
+      padding-left: 5px;
      font-family: ArialMT;
      font-size: 12px;
      cursor: pointer;
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@ -657,7 +657,9 @@ export default {
              dbName,
              analyst: analyst ? analyst : null,
              sampleFileName,
+              gasFileName,
              detFileName,
+              qcFileName,
            }
            getAction('/selfStation/initValue', params)
          }
@ -1110,20 +1112,20 @@ export default {
    // 查看软件操作帮助文档
    handleHelp() {
      let docPath = null
-      let apiBaseUrl = window._CONFIG['onlinePreviewDomainURL'] || "/jeecg-boot";
-      if(this.isGamma) {
-        docPath =  `/armd-help/Gamma.pdf`;
+      let apiBaseUrl = window._CONFIG['onlinePreviewDomainURL'] || '/jeecg-boot'
+      if (this.isGamma) {
+        docPath = `/armd-help/Gamma.pdf`
      } else if (this.isBeta) {
-        docPath =  `/armd-help/Self-Beta-Gamma.pdf`;
-      } else if(this.isBetaGamma) {
-        docPath =  `/armd-help/Beta-Gamma.pdf`;
+        docPath = `/armd-help/Self-Beta-Gamma.pdf`
+      } else if (this.isBetaGamma) {
+        docPath = `/armd-help/Beta-Gamma.pdf`
      }
-      
-      if(!docPath) {
+
+      if (!docPath) {
        this.$message.warning('Please load an spectrum first!')
-        return ;
+        return
      }
-      window.open(apiBaseUrl + docPath, '_blank');
+      window.open(apiBaseUrl + docPath, '_blank')

      console.log('%c [ handleHelp ]-221', 'font-size:13px; background:pink; color:#bf2c9f;')
    },
Author	SHA1	Message	Date
Xu Zhimeng	417d900cd5	fix: 自建台站加载来自DB的谱时，调用PeakInfomation未传参问题	2025-02-20 15:55:48 +08:00
Xu Zhimeng	6747b99e1c	fix: 自建台站从DB加载时，对是否已分析判断不正确问题	2025-02-20 15:55:17 +08:00
Xu Zhimeng	5662395265	fix: 自建台站Load From File重新加载谱时报错问题	2025-02-20 14:54:51 +08:00
Xu Zhimeng	4e90224756	feat: 自建台站gamma和beta弹窗增加最大化按钮，里面的图表增加缩放功能	2025-02-20 14:54:01 +08:00
Xu Zhimeng	a858b4df7f	feat: 增加标题名字	2025-02-20 09:38:33 +08:00