From 7a6d13b471c71d2162844b182fdb9697bd699cf1 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Wed, 9 Aug 2023 19:22:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C/=E6=88=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BetaGammaCommentsModal.vue                |  1 -
 .../components/BetaDetectorCalibration.vue    |  2 +-
 .../components/GammaDetectorCalibration.vue   |  2 +-
 .../BetaGammaQCResultsModal.vue               | 16 ++----------
 .../BetaGammaRLRModal/components/Notes.vue    | 25 +------------------
 .../StatisticsParamerHistoryModal.vue         |  8 +++---
 ...tatisticsParamerHistoryModalForQCFlags.vue | 23 ++++++++++-------
 7 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
index 37e29fa..7f18453 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue
@@ -51,7 +51,6 @@ export default {
         const res = await getAction('/spectrumAnalysis/viewComment', {
           sampleId: this.sampleId
         })
-        console.log('%c [ res ]-44', 'font-size:13px; background:pink; color:#bf2c9f;', res)
         if (res.success) {
           this.comments = res.result
         } else {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
index d730398..19dfe2a 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue
@@ -945,7 +945,7 @@ export default {
 
 <style lang="less" scoped>
 p {
-  margin-bottom: 5px;
+  margin-bottom: 2px;
 }
 
 .content {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
index cacc0eb..2a2e1b9 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
@@ -736,7 +736,7 @@ export default {
 
 <style lang="less" scoped>
 p {
-  margin-bottom: 5px;
+  margin-bottom: 2px;
 }
 
 .content {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
index 4cad7a0..5129322 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
@@ -56,20 +56,8 @@ export default {
   data() {
     this.columns = columns
     return {
-      list: [
-        {
-          qcFlags: 'qcFlags',
-          evaluationMetrics: 'evaluationMetrics',
-          value: 'value',
-          status: 0
-        },
-        {
-          qcFlags: 'qcFlags',
-          evaluationMetrics: 'evaluationMetrics',
-          value: 'value',
-          status: 1
-        }
-      ]
+      list: [],
+      isLoading: false
     }
   },
   methods: {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Notes.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Notes.vue
index 3397cc1..83bc871 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Notes.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Notes.vue
@@ -10,30 +10,7 @@
 export default {
   data() {
     return {
-      content: `--------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-      --------------------------    SampleAnalyse Beginning at 2023-07-10 11:44:56    --------------------------
-       `,
+      content: '',
       isLoading: true
     }
   }
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 1b43949..12b0708 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
@@ -172,9 +172,6 @@ const initialOption = {
     borderWidth: 1,
     itemWidth: 50
   },
-  tooltip: {
-    trigger: 'axis'
-  },
   xAxis: {
     type: 'category',
     axisLine: {
@@ -189,7 +186,8 @@ const initialOption = {
       margin: 10,
       formatter: value => {
         return moment(value).format('YYYY/MM/DD')
-      }
+      },
+      interval: 4
     },
     splitLine: {
       show: true,
@@ -230,6 +228,7 @@ const initialFilterOption = {
   dbName: 'RNAUTO',
   detectorName: '',
   stationId: '',
+  stationName: '',
   statisticsType: 'Nuclides',
   mdc: false,
   activity: false,
@@ -294,6 +293,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
+          this.queryParams.detectorName = undefined
         }
       } catch (error) {
         console.error(error)
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
index 072de08..5a9a9de 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
@@ -48,7 +48,6 @@
           <a-button type="primary" @click="handleSnapshot($refs.chartRef)">Snapshot</a-button>
         </div>
         <!-- 左侧中间俩按钮结束 -->
-        <a-divider></a-divider>
       </title-over-border>
       <!-- 右侧图表 -->
       <div class="statistics-paramer-history-chart">
@@ -75,9 +74,6 @@ const initialOption = {
     top: 20,
     bottom: 60
   },
-  tooltip: {
-    trigger: 'axis'
-  },
   xAxis: {
     type: 'category',
     axisLine: {
@@ -92,7 +88,8 @@ const initialOption = {
       margin: 10,
       formatter: value => {
         return moment(value).format('YYYY/MM/DD')
-      }
+      },
+      interval: 0
     },
     splitLine: {
       show: true,
@@ -103,7 +100,9 @@ const initialOption = {
     axisTick: {
       show: false
     },
-    data: []
+    data: new Array(5).fill(0).map((_, index) => {
+      return moment().add(-8 * index, 'hour').format('YYYY-MM-DD HH:mm:ss')
+    }).reverse()
   },
   yAxis: {
     axisLine: {
@@ -125,7 +124,7 @@ const initialOption = {
       show: false
     },
     min: 0,
-    max: 0
+    max: 100
   },
   series: []
 }
@@ -134,6 +133,7 @@ const initialOption = {
 const initialFilterOption = {
   detectorName: '',
   stationId: '',
+  stationName: '',
   statisticsType: '',
   startTime: null,
   endTime: null
@@ -189,6 +189,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
+          this.queryParams.detectorName = undefined
         }
       } catch (error) {
         console.error(error)
@@ -224,9 +225,12 @@ export default {
             const data = result.m_Values
 
             this.option.xAxis.data = result.m_Keys
+            const max = Math.max(...data)
+            const min = Math.min(...data)
 
-            this.option.yAxis.max = (Math.max(...data) * 1.1).toFixed(2)
-            this.option.yAxis.min = (Math.min(...data) / 1.1).toFixed(2)
+            this.option.yAxis.max = (max > 0 ? max * 1.1 : max / 1.1).toFixed(2)
+            this.option.yAxis.min = (min > 0 ? min / 1.1 : min * 1.1).toFixed(2)
+            this.option.xAxis.axisLabel.interval = Math.ceil(result.m_Keys.length / 5)
 
             this.option.series = {
               type: 'line',
@@ -284,6 +288,7 @@ export default {
 
     .time-setting {
       padding-left: 40px;
+      margin-top: 15px;
     }
 
     .center-btns {