Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue

@@ -876,12 +876,18 @@ export default {
     },
 
     // 点击Reset Button 重置
-    handleReset() {
+    async handleReset() {
       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)

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue

@@ -656,12 +656,18 @@ export default {
     },
 
     // 点击Reset Button 重置
-    handleReset() {
+    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.figureChartOption = cloneDeep(this.oldChartOption)
       this.isFirstFitting = false
       this.isInverse = false
@@ -687,10 +693,11 @@ export default {
             // ? 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.isFirstFitting = true 
-          this.gammaIsFitting = false
+          this.gammaIsFitting = true
           this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao
 
           this.setCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao

src/views/spectrumAnalysis/gamma-analysis.vue

@@ -1433,13 +1433,17 @@ export default {
     },
 
     // 显示比较弹窗
-    showCompareModal(isStrip) {
+    showCompareModal(isStrip, isOperating) {
       if (this.isLoading) {
         this.$message.warn('Sample is Loading')
         return
       }
       this.handleResetChart()
       this.clearCompareLine()
+      if(isOperating) {
+        return
+      }
+
       this.isStrip = isStrip
       if (FilePicker.canUse()) {
         this.chooseFileFromFS()
@@ -1512,6 +1516,8 @@ export default {
           this.$nextTick(() => {
             this.thumbnailOption.yAxis.max = getAxisMax(this.getChart(), 'yAxis')
           })
+
+          this.$emit('compareSuccess', this.isStrip)
         } else {
           this.$message.error(message)
         }

src/views/spectrumAnalysis/index.vue

@@ -18,7 +18,13 @@
             <template v-for="(child, index) in operation.children">
               <component v-if="child.show !== false" :is="child.type" :key="index" v-bind="child.attrs" v-on="child.on">
                 <template v-for="item in child.children">
-                  <component v-if="item.show !== false" :is="item.type" :key="item.title" @click="item.handler">
+                  <component
+                    v-if="item.show !== false"
+                    :is="item.type"
+                    :key="item.title"
+                    v-bind="item.attrs"
+                    @click="item.handler"
+                  >
                     {{ item.title }}
                   </component>
                 </template>
@@ -40,6 +46,7 @@
         :currSampleDet="currSampleDet"
         :updateFlag="updateFlag"
         @reAnalyed="handleReAnalyed"
+        @compareSuccess="handleCompareSuccess"
       />
       <!-- Gamma 分析 -->
 
@@ -430,6 +437,9 @@ export default {
       analysedFileName: '', //分析完成的文件名称
       currSampleDet: [], // DetailedInformation
       allSampleDet: {}, // DetailedInformation all
+
+      isComparing: false,
+      isStriping: false,
     }
   },
   created() {
@@ -963,6 +973,16 @@ export default {
       this.colorConfig = colorConfig
       this.$refs.gammaAnalysisRef.handleColorChange(colorConfig)
     },
+
+    // Compare 或 Strip 了
+    handleCompareSuccess(isStrip) {
+      console.log('%c [ isStrip ]-973', 'font-size:13px; background:pink; color:#bf2c9f;', isStrip)
+      if (isStrip) {
+        this.isStriping = true
+      } else {
+        this.isComparing = true
+      }
+    },
   },
   computed: {
     // 顶部菜单栏配置
@@ -988,13 +1008,35 @@ export default {
                   type: 'a-menu-item',
                   title: 'Compare',
                   show: this.isGamma,
-                  handler: () => this.$refs.gammaAnalysisRef.showCompareModal(false),
+                  handler: () => {
+                    this.isStriping = false
+                    this.$refs.gammaAnalysisRef.showCompareModal(false, this.isComparing)
+                    if (this.isComparing) {
+                      this.isComparing = false
+                    }
+                  },
+                  attrs: {
+                    style: {
+                      color: this.isComparing ? 'red' : '#fff',
+                    },
+                  },
                 },
                 {
                   type: 'a-menu-item',
                   title: 'Strip',
                   show: this.isGamma,
-                  handler: () => this.$refs.gammaAnalysisRef.showCompareModal(true),
+                  handler: () => {
+                    this.isComparing = false
+                    this.$refs.gammaAnalysisRef.showCompareModal(true, this.isStriping)
+                    if (this.isStriping) {
+                      this.isStriping = false
+                    }
+                  },
+                  attrs: {
+                    style: {
+                      color: this.isStriping ? 'red' : '#fff',
+                    },
+                  },
                 },
                 {
                   type: 'a-menu-item',