Merge branch 'master-dev' into feature-Beta-dev-renpy

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

@@ -629,6 +629,10 @@ export default {
     this.$bus.$on('betaRefresh', this.getData)
     this.getData()
   },
+  destroyed() {
+    this.$bus.$off('betaRefresh', this.handleReset)
+    this.$bus.$off('betaRefresh', this.getData)
+  },
   watch: {
     isFirstFitting: {
       handler() {
@@ -702,18 +706,10 @@ export default {
            * 对人工交互的返回数据单独处理
            */
           if (this.sampleData.dbName == 'man') {
+            const result = res.result
+            result.EToC = newEToC || []
+            result.CToE = newCToE
             this.setFirringResult(res.result)
-            if (newCToE) {
-              const [paramA, paramB, paramC] = newCToE
-              this.newCalibrationFuncModel = {
-                paramA: Number(paramA).toPrecision(6),
-                paramB: Number(paramB).toPrecision(6),
-                paramC: Number(paramC).toPrecision(6),
-              }
-            }
-            if (newEToC) {
-              this.newE2C = newEToC
-            }
           }
         } else {
           this.$message.error(res.message)
@@ -1009,7 +1005,7 @@ export default {
           paramC: Number(paramC).toPrecision(6),
         }
       }
-
+      if (newLineSeries) {
         const energyValues = newLineSeries.map((item) => item.y)
 
         const { max: prevMax, min: prevMin } = this.oldChartOption.yAxis
@@ -1024,6 +1020,8 @@ export default {
         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 {

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

@@ -554,18 +554,10 @@ export default {
            * 对人工交互的返回数据单独处理
            */
           if (this.sampleData.dbName == 'man') {
-            this.setFirringResult(res.result)
+            const result = res.result
-            if (newCToE) {
+            result.EToC = newEToC || []
-              const [paramA, paramB, paramC] = newCToE
+            result.CToE = newCToE
-              this.newCalibrationFuncModel = {
+            this.setFirringResult(result)
-                paramA: Number(paramA).toPrecision(6),
-                paramB: Number(paramB).toPrecision(6),
-                paramC: Number(paramC).toPrecision(6),
-              }
-            }
-            if (newEToC) {
-              this.newE2C = newEToC
-            }
           }
         } else {
           this.$message.error(res.message)
@@ -768,6 +760,8 @@ export default {
           paramC: Number(paramC).toPrecision(6),
         }
       }
+
+      if (newLineSeries) {
         const energyValues = newLineSeries.map((item) => item.y)
 
         const { max: prevMax, min: prevMin } = this.oldChartOption.yAxis
@@ -782,6 +776,8 @@ export default {
         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,

src/views/stationOperation/components/MapPane.vue

@@ -697,6 +697,7 @@ export default {
             this.$message.success('Save Success')
             await this.getDataRecieveSettings()
             this.startGetDataReceiveStatusList()
+            this.$emit('focusStationChange')
           } else {
             this.$message.error(message)
           }

src/views/stationOperation/index.vue

@@ -156,6 +156,7 @@
           @filterMarker="onFilterMarker"
           @drawCircle="onDrawCircle"
           @mapSourceChange="handleMapSourceChange"
+          @focusStationChange="getFollowedStationList"
         />
       </Map>
     </div>
@@ -200,6 +201,9 @@ export default {
     clearInterval(this.timer)
     this.timer = null
   },
+  activated() {
+    this.getFollowedStationList()
+  },
   data() {
     return {
       activeKey: '1',
@@ -240,7 +244,6 @@ export default {
   },
   created() {
     this.getStationList()
-    this.getFollowedStationList()
     this.getStationTypeList()
     this.getStationTree()
   },