From 85eb54bc6c427d34c8567b1d6e3b71c60bcc1b1f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Tue, 12 Dec 2023 15:13:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/ColorConfigModal.vue    |   6 +-
 .../components/Modals/StripModal.vue          |   6 +-
 src/views/spectrumAnalysis/gamma-analysis.vue | 219 ++++++++++++------
 src/views/spectrumAnalysis/seriesBuilder.js   |   7 +-
 src/views/spectrumAnalysis/settings.js        |   4 +-
 5 files changed, 168 insertions(+), 74 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/ColorConfigModal.vue b/src/views/spectrumAnalysis/components/Modals/ColorConfigModal.vue
index b270b95..6752e41 100644
--- a/src/views/spectrumAnalysis/components/Modals/ColorConfigModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ColorConfigModal.vue
@@ -122,10 +122,10 @@ export default {
         colorBase: Color_Base,
         colorScac: Color_Scac,
         colorCompare: Color_Compare,
-        ColorReference: Color_Reference,
+        colorReference: Color_Reference,
         colorFitbase: Color_Fitbase,
-        ColorSpecSum: Color_SpecSum,
-        ColorSpecCut: Color_SpecCut,
+        colorSpecSum: Color_SpecSum,
+        colorSpecCut: Color_SpecCut,
       })
       if (success) {
         this.$emit('colorChange', this.config)
diff --git a/src/views/spectrumAnalysis/components/Modals/StripModal.vue b/src/views/spectrumAnalysis/components/Modals/StripModal.vue
index 2cf886f..15b2e78 100644
--- a/src/views/spectrumAnalysis/components/Modals/StripModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/StripModal.vue
@@ -10,6 +10,7 @@
 </template>
 
 <script>
+import { isNullOrUndefined } from '@/utils/util'
 export default {
   data() {
     return {
@@ -29,12 +30,15 @@ export default {
     },
 
     handleOk() {
+      if(isNullOrUndefined(this.ratio)) {
+        return
+      }
       this.resolve(this.ratio)
       this.visible = false
     },
 
     handleCancel() {
-      this.resolve()
+      this.reject()
       this.visible = false
     },
 
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 6bee6bf..7422fdb 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -193,6 +193,10 @@ export default {
         scacLine: null,
         all: null,
         baseLineCP: [],
+
+        compareLine: null,
+        stripSumOrCutLine: null,
+        stripReferenceLine: null,
       },
       energyData: {
         peakGroup: [],
@@ -202,6 +206,10 @@ export default {
         scacLine: null,
         all: null,
         baseLineCP: [],
+
+        compareLine: null,
+        stripSumOrCutLine: null,
+        stripReferenceLine: null,
       },
       peakList: [], // Peak 列表（非点位）
       baseCtrls: {}, // BaseCtrls
@@ -710,6 +718,7 @@ export default {
       const spectrumLineSeries = findSeriesByName(this.option.series, 'Spectrum')
       const thumbnailSpectrumLineSeries = findSeriesByName(this.thumbnailOption.series, 'Spectrum')
       const compareLineSeries = findSeriesByName(this.option.series, 'Compare')
+      const StripSumOrCutLineSeries = findSeriesByName(this.option.series, 'StripSumOrCut')
       const stripReferenceLineSeries = findSeriesByName(this.option.series, 'StripReference')
 
       switch (key) {
@@ -794,12 +803,24 @@ export default {
 
           this.redrawThumbnailChart()
 
-          if (this.channelCompareLine) {
-            this.redrawLineBySeriesName('Compare', this.energyCompareLine, this.channelCompareLine)
+          if (this.channelData.compareLine) {
+            this.redrawLineBySeriesName('Compare', this.energyData.compareLine, this.channelData.compareLine)
           }
 
-          if (this.channelStripReferenceLine) {
-            this.redrawLineBySeriesName('StripReference', this.energyStripReferenceLine, this.channelStripReferenceLine)
+          if (this.channelData.stripSumOrCutLine) {
+            this.redrawLineBySeriesName(
+              'StripSumOrCut',
+              this.energyData.stripSumOrCutLine,
+              this.channelData.stripSumOrCutLine
+            )
+          }
+
+          if (this.channelData.stripReferenceLine) {
+            this.redrawLineBySeriesName(
+              'StripReference',
+              this.energyData.stripReferenceLine,
+              this.channelData.stripReferenceLine
+            )
           }
 
           break
@@ -816,20 +837,31 @@ export default {
             compareLineSeries.type = 'line'
             compareLineSeries.symbol = 'none'
 
+            StripSumOrCutLineSeries.type = 'line'
+            StripSumOrCutLineSeries.symbol = 'none'
+
             stripReferenceLineSeries.type = 'line'
             stripReferenceLineSeries.symbol = 'none'
 
             this.redrawLineBySeriesName('Spectrum', this.energyData.spectrumLine, this.channelData.spectrumLine)
 
-            if (this.channelCompareLine) {
-              this.redrawLineBySeriesName('Compare', this.energyCompareLine, this.channelCompareLine)
+            if (this.channelData.compareLine) {
+              this.redrawLineBySeriesName('Compare', this.energyData.compareLine, this.channelData.compareLine)
             }
 
-            if (this.channelStripReferenceLine) {
+            if (this.channelData.stripSumOrCutLine) {
+              this.redrawLineBySeriesName(
+                'StripSumOrCut',
+                this.energyData.stripSumOrCutLine,
+                this.channelData.stripSumOrCutLine
+              )
+            }
+
+            if (this.channelData.stripReferenceLine) {
               this.redrawLineBySeriesName(
                 'StripReference',
-                this.energyStripReferenceLine,
-                this.channelStripReferenceLine
+                this.energyData.stripReferenceLine,
+                this.channelData.stripReferenceLine
               )
             }
           } else {
@@ -842,6 +874,9 @@ export default {
             compareLineSeries.type = 'scatterGL'
             compareLineSeries.symbol = 'circle'
 
+            StripSumOrCutLineSeries.type = 'scatterGL'
+            StripSumOrCutLineSeries.symbol = 'circle'
+
             stripReferenceLineSeries.type = 'scatterGL'
             stripReferenceLineSeries.symbol = 'circle'
 
@@ -892,7 +927,7 @@ export default {
 
     clearPeakLine() {
       this.opts.notMerge = true
-      this.option.series.splice(7)
+      this.option.series.splice(8)
       this.$nextTick(() => {
         this.resetChartOpts()
       })
@@ -1276,42 +1311,63 @@ export default {
       }
       this.redrawLineBySeriesName('Spectrum', energySpectrumData, channelSpectrumData)
 
-      if (this.channelCompareLine) {
+      if (this.channelData.compareLine) {
         const channelCompareLine = {
-          ...this.channelCompareLine,
+          ...this.channelData.compareLine,
           pointlist: isReset
-            ? this.pointlistLimitY(this.channelCompareLine.pointlist)
-            : this.pointlistLimit(this.channelCompareLine.pointlist, x1, x2, y1, y2),
+            ? this.pointlistLimitY(this.channelData.compareLine.pointlist)
+            : this.pointlistLimit(this.channelData.compareLine.pointlist, x1, x2, y1, y2),
         }
 
         let energyCompareLine = []
-        if (this.energyCompareLine) {
+        if (this.energyData.compareLine) {
           energyCompareLine = {
-            ...this.energyCompareLine,
+            ...this.energyData.compareLine,
             pointlist: isReset
-              ? this.pointlistLimitY(this.energyCompareLine.pointlist)
-              : this.pointlistLimit(this.energyCompareLine.pointlist, x1, x2, y1, y2),
+              ? this.pointlistLimitY(this.energyData.compareLine.pointlist)
+              : this.pointlistLimit(this.energyData.compareLine.pointlist, x1, x2, y1, y2),
           }
         }
 
         this.redrawLineBySeriesName('Compare', energyCompareLine, channelCompareLine)
       }
 
-      if (this.channelStripReferenceLine) {
+      if (this.channelData.stripReferenceLine) {
         const channelStripReferenceLine = {
-          ...this.channelStripReferenceLine,
+          ...this.channelData.stripReferenceLine,
           pointlist: isReset
-            ? this.pointlistLimitY(this.channelStripReferenceLine.pointlist)
-            : this.pointlistLimit(this.channelStripReferenceLine.pointlist, x1, x2, y1, y2),
+            ? this.pointlistLimitY(this.channelData.stripReferenceLine.pointlist)
+            : this.pointlistLimit(this.channelData.stripReferenceLine.pointlist, x1, x2, y1, y2),
+        }
+
+        if (this.channelData.stripSumOrCutLine) {
+          const channelStripSumOrCutLine = {
+            ...this.channelData.stripSumOrCutLine,
+            pointlist: isReset
+              ? this.pointlistLimitY(this.channelData.stripSumOrCutLine.pointlist)
+              : this.pointlistLimit(this.channelData.stripSumOrCutLine.pointlist, x1, x2, y1, y2),
+          }
+
+          let energyStripSumOrCutLine = []
+          if (this.energyData.stripSumOrCutLine) {
+            energyStripSumOrCutLine = {
+              ...this.energyData.stripSumOrCutLine,
+              pointlist: isReset
+                ? this.pointlistLimitY(this.energyData.stripSumOrCutLine.pointlist)
+                : this.pointlistLimit(this.energyData.stripSumOrCutLine.pointlist, x1, x2, y1, y2),
+            }
+          }
+
+          this.redrawLineBySeriesName('StripSumOrCut', energyStripSumOrCutLine, channelStripSumOrCutLine)
         }
 
         let energyStripReferenceLine = []
-        if (this.energyStripReferenceLine) {
+        if (this.energyData.stripReferenceLine) {
           energyStripReferenceLine = {
-            ...this.energyStripReferenceLine,
+            ...this.energyData.stripReferenceLine,
             pointlist: isReset
-              ? this.pointlistLimitY(this.energyStripReferenceLine.pointlist)
-              : this.pointlistLimit(this.energyStripReferenceLine.pointlist, x1, x2, y1, y2),
+              ? this.pointlistLimitY(this.energyData.stripReferenceLine.pointlist)
+              : this.pointlistLimit(this.energyData.stripReferenceLine.pointlist, x1, x2, y1, y2),
           }
         }
 
@@ -1541,12 +1597,12 @@ export default {
           url = '/gamma/Compare'
         // 如果是Strip
         if (this.isStrip) {
-          const ratio = await this.$refs.stripModal.getRatio()
+          this.ratio = await this.$refs.stripModal.getRatio()
 
           param = {
             fileName,
             stripFileName: selectedFileName,
-            ratioRate: ratio || 1,
+            ratioRate: this.ratio,
           }
           url = '/gamma/Strip'
         }
@@ -1556,24 +1612,25 @@ export default {
           if (this.isStrip) {
             const { reference: referenceLine, result: compareLine } = result
 
-            this.channelCompareLine = compareLine[0]
-            this.energyCompareLine = compareLine[1]
+            this.channelData.stripSumOrCutLine = compareLine[0]
+            this.energyData.stripSumOrCutLine = compareLine[1]
+
             this.redrawLineBySeriesName(
-              'Compare',
-              this.energyCompareLine,
-              this.channelCompareLine,
+              'StripSumOrCut',
+              this.energyData.stripSumOrCutLine,
+              this.channelData.stripSumOrCutLine,
               true,
-              this.channelCompareLine.color
+              this.channelData.stripSumOrCutLine.color
             )
 
-            this.channelStripReferenceLine = referenceLine[0]
-            this.energyStripReferenceLine = referenceLine[1]
+            this.channelData.stripReferenceLine = referenceLine[0]
+            this.energyData.stripReferenceLine = referenceLine[1]
             this.redrawLineBySeriesName(
               'StripReference',
-              this.energyStripReferenceLine,
-              this.channelStripReferenceLine,
+              this.energyData.stripReferenceLine,
+              this.channelData.stripReferenceLine,
               true,
-              this.channelStripReferenceLine.color
+              this.channelData.stripReferenceLine.color
             )
 
             this.$nextTick(() => {
@@ -1581,8 +1638,8 @@ export default {
             })
           } else {
             const [channelData, energyData] = result
-            this.channelCompareLine = channelData
-            this.energyCompareLine = energyData
+            this.channelData.compareLine = channelData
+            this.energyData.compareLine = energyData
             this.redrawLineBySeriesName('Compare', energyData, channelData, true, channelData.color)
 
             this.$nextTick(() => {
@@ -1613,6 +1670,8 @@ export default {
         return
       }
 
+      this.isStrip = isStrip
+
       const { inputFileName: fileName } = this.sample
 
       const hide = this.$message.loading(isStrip ? 'Stripping...' : 'Comparing...', 0)
@@ -1624,12 +1683,12 @@ export default {
           url = '/gamma/CompareDB'
         // 如果是Strip
         if (isStrip) {
-          const ratio = await this.$refs.stripModal.getRatio()
+          this.ratio = await this.$refs.stripModal.getRatio()
 
           param = {
             fileName,
             sampleId,
-            ratioRate: ratio || 1,
+            ratioRate: this.ratio,
           }
           url = '/gamma/StripDB'
         }
@@ -1639,24 +1698,25 @@ export default {
           if (isStrip) {
             const { reference: referenceLine, result: compareLine } = result
 
-            this.channelCompareLine = compareLine[0]
-            this.energyCompareLine = compareLine[1]
+            this.channelData.stripSumOrCutLine = compareLine[0]
+            this.energyData.stripSumOrCutLine = compareLine[1]
+
             this.redrawLineBySeriesName(
-              'Compare',
-              this.energyCompareLine,
-              this.channelCompareLine,
+              'StripSumOrCut',
+              this.energyData.stripSumOrCutLine,
+              this.channelData.stripSumOrCutLine,
               true,
-              this.channelCompareLine.color
+              this.channelData.stripSumOrCutLine.color
             )
 
-            this.channelStripReferenceLine = referenceLine[0]
-            this.energyStripReferenceLine = referenceLine[1]
+            this.channelData.stripReferenceLine = referenceLine[0]
+            this.energyData.stripReferenceLine = referenceLine[1]
             this.redrawLineBySeriesName(
               'StripReference',
-              this.energyStripReferenceLine,
-              this.channelStripReferenceLine,
+              this.energyData.stripReferenceLine,
+              this.channelData.stripReferenceLine,
               true,
-              this.channelStripReferenceLine.color
+              this.channelData.stripReferenceLine.color
             )
 
             this.$nextTick(() => {
@@ -1664,8 +1724,8 @@ export default {
             })
           } else {
             const [channelData, energyData] = result
-            this.channelCompareLine = channelData
-            this.energyCompareLine = energyData
+            this.channelData.compareLine = channelData
+            this.energyData.compareLine = energyData
             this.redrawLineBySeriesName('Compare', energyData, channelData, true, channelData.color)
 
             this.$nextTick(() => {
@@ -1689,18 +1749,25 @@ export default {
       const compareLine = findSeriesByName(this.option.series, 'Compare')
       if (compareLine) {
         compareLine.data = []
-        this.resetThumbnailChartDataMax()
       }
-      this.channelCompareLine = undefined
-      this.energyCompareLine = undefined
+      this.channelData.compareLine = undefined
+      this.energyData.compareLine = undefined
+
+      const stripStripSumOrCutLine = findSeriesByName(this.option.series, 'StripSumOrCut')
+      if (stripStripSumOrCutLine) {
+        stripStripSumOrCutLine.data = []
+      }
+      this.channelData.stripSumOrCutLine = undefined
+      this.energyData.stripSumOrCutLine = undefined
 
       const stripReferenceLine = findSeriesByName(this.option.series, 'StripReference')
       if (stripReferenceLine) {
         stripReferenceLine.data = []
-        this.resetThumbnailChartDataMax()
       }
-      this.channelStripReferenceLine = undefined
-      this.energyStripReferenceLine = undefined
+      this.channelData.stripReferenceLine = undefined
+      this.energyData.stripReferenceLine = undefined
+
+      this.resetThumbnailChartDataMax()
     },
 
     // 重新分析
@@ -1850,8 +1917,17 @@ export default {
 
     // 修改颜色
     changeColor(colorConfig) {
-      const { Color_Spec, Color_Peak, Color_Lc, Color_Base, Color_Scac, Color_Compare, Color_Reference, Color_SpecSum, Color_SpecCut, Color_Fitbase } =
-        colorConfig
+      const {
+        Color_Spec,
+        Color_Peak,
+        Color_Lc,
+        Color_Base,
+        Color_Scac,
+        Color_Compare,
+        Color_Reference,
+        Color_SpecSum,
+        Color_SpecCut,
+      } = colorConfig
 
       this.channelData.spectrumLine.color = Color_Spec
       this.energyData.spectrumLine.color = Color_Spec
@@ -1870,9 +1946,11 @@ export default {
       this.channelData.scacLine.color = Color_Scac
       this.energyData.scacLine.color = Color_Scac
 
-      if (this.channelCompareLine) {
-        this.channelCompareLine.color = Color_Compare
-        this.energyCompareLine.color = Color_Compare
+      if (this.channelData.compareLine) {
+        this.channelData.compareLine.color = Color_Compare
+        if (this.energyData.compareLine) {
+          this.energyData.compareLine.color = Color_Compare
+        }
       }
 
       this.changeColorBySeriesName('Spectrum', Color_Spec)
@@ -1880,7 +1958,12 @@ export default {
       this.changeColorBySeriesName('LcLine', Color_Lc)
       this.changeColorBySeriesName('BaseLine', Color_Base)
       this.changeColorBySeriesName('ScacLine', Color_Scac)
-      this.changeColorBySeriesName('Compare', Color_Compare)
+      if (this.isStrip) {
+        this.changeColorBySeriesName('StripSumOrCut', this.ratio >= 0 ? Color_SpecSum : Color_SpecCut)
+        this.changeColorBySeriesName('StripReference', Color_Reference)
+      } else {
+        this.changeColorBySeriesName('Compare', Color_Compare)
+      }
 
       const thumbnailChartSeries = findSeriesByName(this.thumbnailOption.series, 'Spectrum')
       thumbnailChartSeries.itemStyle.color = Color_Spec
diff --git a/src/views/spectrumAnalysis/seriesBuilder.js b/src/views/spectrumAnalysis/seriesBuilder.js
index 77b008c..94c3bc9 100644
--- a/src/views/spectrumAnalysis/seriesBuilder.js
+++ b/src/views/spectrumAnalysis/seriesBuilder.js
@@ -45,7 +45,12 @@ export const compareLineSeries = buildLineSeries('Compare', [], '#fff', {
   z: 7
 })
 
-export const stripReferenceLineSeries = buildLineSeries('StripReference', [], '#fff', {
+export const stripSumOrCutLineSeries = buildLineSeries('StripSumOrCut', [], '#fff', {
   symbolSize: 2,
   z: 8
 })
+
+export const stripReferenceLineSeries = buildLineSeries('StripReference', [], '#fff', {
+  symbolSize: 2,
+  z: 9
+})
diff --git a/src/views/spectrumAnalysis/settings.js b/src/views/spectrumAnalysis/settings.js
index 4d05a36..795b960 100644
--- a/src/views/spectrumAnalysis/settings.js
+++ b/src/views/spectrumAnalysis/settings.js
@@ -6,7 +6,8 @@ import {
   lcLineSeries,
   scacLineSeries,
   spectrumSeries,
-  stripReferenceLineSeries
+  stripReferenceLineSeries,
+  stripSumOrCutLineSeries
 } from './seriesBuilder'
 
 export const GammaOptions = {
@@ -111,6 +112,7 @@ export const GammaOptions = {
       scacLineSeries,
       baseLineCtrlPoint,
       compareLineSeries,
+      stripSumOrCutLineSeries,
       stripReferenceLineSeries
     ],
     brush: {}