From 12656c073a886bc91cffc278fcf9f864ed3ed526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 6 Mar 2024 17:24:51 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/abnormalAlarm/emailMonitor/instances/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/abnormalAlarm/emailMonitor/instances/index.vue b/src/views/abnormalAlarm/emailMonitor/instances/index.vue
index cc8c284..32be433 100644
--- a/src/views/abnormalAlarm/emailMonitor/instances/index.vue
+++ b/src/views/abnormalAlarm/emailMonitor/instances/index.vue
@@ -111,7 +111,7 @@
               <img src="@/assets/images/abnormalAlarm/email-split.png" alt="" />
             </div>
             <div class="email-top-content-li-right">
-              <div class="email-top-content-li-right-title">An Unread Mail</div>
+              <div class="email-top-content-li-right-title">Unread Mail</div>
               <div class="email-top-content-li-right-val" style="color: #ade6ee; font-size: 26px; margin-top: 36px">
                 {{ emailSpace.unreadMsg || 0 }}
               </div>

From 794648bc56c804b84142552de5c69345826b40df Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 7 Mar 2024 09:56:43 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AF=B9Result?=
 =?UTF-8?q?=20Display=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue   | 15 ++++++++++++++-
 .../components/ResultDisplay.vue               | 18 +++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index e9dbceb..44492de 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -161,6 +161,8 @@ const SampleType = [
   },
 ]
 
+const sortList = ['Xe131m', 'Xe133', 'Xe133m', 'Xe135']
+
 export default {
   components: {
     BetaGammaChartContainer,
@@ -439,6 +441,8 @@ export default {
           : this.resultDisplay.length > 0
           ? this.resultDisplay
           : XeData
+        
+        this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
 
@@ -623,6 +627,15 @@ export default {
         this.$refs.lineChart4Ref.setRange(minX, maxX)
       }
     },
+
+    // 排序result display
+    sortResultDisplay() {
+      this.resultDisplay.sort((a, b) => {
+        const index1 = sortList.indexOf(a.nuclideName)
+        const index2 = sortList.indexOf(b.nuclideName)
+        return index1 - index2
+      })
+    },
   },
   watch: {
     sample: {
@@ -653,7 +666,7 @@ export default {
       handler(newVal, oldVal) {
         // this.currResultDisplay = newVal.XeData
         this.resultDisplay = newVal.XeData || []
-
+        this.sortResultDisplay()
         this.$store.commit('UPDATE_SAMPLE_DATA', {
           inputFileName: this.sample.inputFileName,
           key: 'XeData',
diff --git a/src/views/spectrumAnalysis/components/ResultDisplay.vue b/src/views/spectrumAnalysis/components/ResultDisplay.vue
index 7fbeb65..2d00eb7 100644
--- a/src/views/spectrumAnalysis/components/ResultDisplay.vue
+++ b/src/views/spectrumAnalysis/components/ResultDisplay.vue
@@ -46,8 +46,6 @@
 </template>
 
 <script>
-import { cloneDeep } from 'lodash'
-
 const columns = [
   {
     title: 'Flag',
@@ -96,8 +94,6 @@ const columns = [
     width: 34,
   },
 ]
-
-const sortList = ['Xe131m', 'Xe133', 'Xe133m', 'Xe135']
 export default {
   props: {
     data: {
@@ -125,8 +121,7 @@ export default {
     data: {
       handler(val) {
         if (val && Array.isArray(val)) {
-          const list = cloneDeep(val)
-          list.forEach((item) => {
+          val.forEach((item) => {
             if (item.conc < 0) {
               item.className = 'error'
             } else if (item.conc > 0 && item.conc < item.mdc) {
@@ -135,15 +130,8 @@ export default {
               item.className = 'success'
             }
           })
-
-          list.sort((a, b) => {
-            const index1 = sortList.indexOf(a.nuclideName)
-            const index2 = sortList.indexOf(b.nuclideName)
-            return index1 - index2
-          })
-
-          this.source1 = list.slice(0, 2)
-          this.source2 = list.slice(2, 4)
+          this.source1 = val.slice(0, 2)
+          this.source2 = val.slice(2, 4)
         }
       },
       immediate: true,

From b992a4e35d1224838b74825e120e09457f807e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 7 Mar 2024 14:00:10 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=20=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Scheduling.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index 67ba7f0..12ac3d1 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -656,9 +656,12 @@ export default {
   height: 100%;
   overflow: hidden;
   //display: flex;
-  /deep/.ant-spin-container {
+  ::v-deep.ant-spin-nested-loading {
     height: 100%;
-    display: flex;
+    .ant-spin-container {
+      height: 100%;
+      display: flex;
+    }
   }
   &-list {
     flex-shrink: 0;
@@ -695,7 +698,7 @@ export default {
           }
         }
         &-body {
-          height: calc(100% - 103px);
+          height: calc(100% - 52px);
           overflow: auto;
         }
       }

From 34369b0544c949baa8c99fe9bb0bedb3b54b8994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 7 Mar 2024 14:35:17 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=20=E4=BB=BB=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8Scheduling=20=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8=E7=9A=84=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Scheduling.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index 12ac3d1..70cc927 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -10,7 +10,7 @@
         </template>
         <!-- 标题结束 -->
         <!-- 内容 -->
-        <div class="scheduling-list-content">
+        <div class="scheduling-list-content" ref="listContainer">
           <div class="scheduling-list-item" v-for="item of schedulingInfo" :key="item.id">
             <h4 class="title">
               <span>
@@ -320,6 +320,9 @@ export default {
         return
       }
       this.schedulingInfo = this.scheduleList[date.format(dateFormat)]
+      this.$nextTick(() => {
+        this.$refs.listContainer.scrollTop = 0
+      })
     },
 
     // 获取详情
@@ -699,12 +702,14 @@ export default {
         }
         &-body {
           height: calc(100% - 52px);
-          overflow: auto;
+          // overflow: auto;
         }
       }
     }
     &-content {
+      height: 100%;
       padding: 0 12px;
+      overflow: auto;
     }
     &-item {
       margin-top: 15px;

From b9d8c7fb9207ad0691077bff85062c593db63404 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 7 Mar 2024 15:16:48 +0800
Subject: [PATCH 05/10] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E6=93=8D=E4=BD=9C=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spectrumAnalysis/beta-gamma-analysis.vue  | 49 +++++++++--
 .../SubOperators/BetaGammaQcFlags.vue         |  7 +-
 .../SubOperators/PopOverWithIcon.vue          | 32 ++++---
 .../components/SubOperators/QcFlags.vue       | 15 ++--
 src/views/spectrumAnalysis/gamma-analysis.vue | 84 ++++++++++++++-----
 src/views/spectrumAnalysis/index.vue          | 43 +---------
 6 files changed, 143 insertions(+), 87 deletions(-)

diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 44492de..12c1881 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -7,17 +7,17 @@
           Detailed-Information
           <beta-gamma-detailed-infomation slot="content" :data="spectrumData" />
         </pop-over-with-icon>
-        <pop-over-with-icon placement="bottomLeft">
-          QC Flags
-          <beta-gamma-qc-flags slot="content" :data="qcFlags" @click="handleQcFlagClick" />
-        </pop-over-with-icon>
         <custom-select
           v-model="spectraType"
           :options="SampleType"
           @change="changeChartByType"
-          style="width: 246px"
+          style="width: 154px"
           class="sample-select"
         ></custom-select>
+        <pop-over-with-icon placement="right" v-model="qcFlagsVisible">
+          QC Flags
+          <beta-gamma-qc-flags slot="content" :data="qcFlags" @click="handleQcFlagClick" />
+        </pop-over-with-icon>
       </div>
 
       <!-- 二级交互栏结束 -->
@@ -228,14 +228,24 @@ export default {
       statisticsType: StatisticsType['Collection Time'],
       currSample: {},
       copyXeData: null,
+      qcFlagsVisible: false,
     }
   },
   created() {
     this.$bus.$on('ReAnalyses', this.handleReAnalyse)
   },
+  mounted() {
+    this.qcFlagsTimer = setTimeout(() => {
+      this.qcFlagsVisible = true
+    }, 100)
+  },
   destroyed() {
     this.cancelLastRequest()
     this.$bus.$off('ReAnalyses', this.handleReAnalyse)
+
+    if (this.qcFlagsTimer) {
+      clearTimeout(this.qcFlagsTimer)
+    }
   },
   methods: {
     // 重新绘制矩形框
@@ -441,7 +451,7 @@ export default {
           : this.resultDisplay.length > 0
           ? this.resultDisplay
           : XeData
-        
+
         this.sortResultDisplay()
 
         this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@@ -702,6 +712,31 @@ export default {
     }
   }
 
+  // 二级操作栏开始
+  .spectrum-analysis-sub-operators {
+    flex-shrink: 0;
+    margin-bottom: 19px;
+    display: flex;
+    gap: 11px;
+    flex-wrap: nowrap;
+    overflow: auto;
+    height: 46px;
+    align-items: center;
+
+    .pop-over-with-icon {
+      height: 32px;
+
+      &:nth-child(1) {
+        width: 224px;
+      }
+
+      &:nth-child(3) {
+        width: 125px;
+      }
+    }
+  }
+  // 二级操作栏结束
+
   .sample-select {
     ::v-deep {
       .ant-select-selection {
@@ -712,7 +747,7 @@ export default {
   }
 
   &-main {
-    height: calc(100% - 51px);
+    height: calc(100% - 65px);
     display: flex;
     gap: 30px;
     overflow: auto hidden;
diff --git a/src/views/spectrumAnalysis/components/SubOperators/BetaGammaQcFlags.vue b/src/views/spectrumAnalysis/components/SubOperators/BetaGammaQcFlags.vue
index 99eed46..3a04118 100644
--- a/src/views/spectrumAnalysis/components/SubOperators/BetaGammaQcFlags.vue
+++ b/src/views/spectrumAnalysis/components/SubOperators/BetaGammaQcFlags.vue
@@ -57,20 +57,23 @@ export default {
 <style lang="less" scoped>
 .qc-flags {
   display: flex;
+  max-width: calc(100vw - 685px);
+  overflow: auto;
+
   &-item {
     background-color: #46738e;
     display: flex;
     align-items: center;
-    width: 150px;
     height: 30px;
     cursor: pointer;
+    padding: 0 10px;
+    flex-shrink: 0;
 
     &:not(:last-child) {
       margin-right: 2px;
     }
 
     span {
-      margin-left: 20px;
       margin-right: 5px;
       width: 14px;
       height: 14px;
diff --git a/src/views/spectrumAnalysis/components/SubOperators/PopOverWithIcon.vue b/src/views/spectrumAnalysis/components/SubOperators/PopOverWithIcon.vue
index ace73aa..f704bcc 100644
--- a/src/views/spectrumAnalysis/components/SubOperators/PopOverWithIcon.vue
+++ b/src/views/spectrumAnalysis/components/SubOperators/PopOverWithIcon.vue
@@ -1,14 +1,21 @@
 <template>
-  <a-popover :placement="placement" overlayClassName="popover-with-icon" v-model="innerVisible">
+  <a-popover
+    v-bind="$attrs"
+    :placement="placement"
+    overlayClassName="popover-with-icon"
+    :visible="innerVisible"
+    :getPopupContainer="(ele) => ele"
+    @click="handleClick"
+  >
     <div class="pop-over-with-icon">
       <span class="text">
         <slot />
       </span>
       <img src="@/assets/images/global/select-down.png" alt="" />
     </div>
-    <template slot="content">
+    <div slot="content" @click.stop>
       <slot name="content" />
-    </template>
+    </div>
   </a-popover>
 </template>
 <script>
@@ -16,27 +23,32 @@ export default {
   props: {
     placement: {
       type: String,
-      default: 'bottom'
+      default: 'bottom',
     },
     value: {
-      type: Boolean
-    }
+      type: Boolean,
+    },
   },
   data() {
     return {
-      innerVisible: false
+      innerVisible: false,
     }
   },
+  methods: {
+    handleClick() {
+      this.innerVisible = !this.innerVisible
+    },
+  },
   watch: {
     value: {
       handler(val) {
         this.innerVisible = val
       },
-      immediate: true
+      immediate: true,
     },
     innerVisible(val) {
       this.$emit('input', val)
-    }
-  }
+    },
+  },
 }
 </script>
diff --git a/src/views/spectrumAnalysis/components/SubOperators/QcFlags.vue b/src/views/spectrumAnalysis/components/SubOperators/QcFlags.vue
index a7044cf..b498e7d 100644
--- a/src/views/spectrumAnalysis/components/SubOperators/QcFlags.vue
+++ b/src/views/spectrumAnalysis/components/SubOperators/QcFlags.vue
@@ -15,31 +15,34 @@ export default {
   props: {
     data: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   },
   created() {
     this.items = items
-  }
+  },
 }
 </script>
 
 <style lang="less" scoped>
 .qc-flags {
   display: flex;
+  max-width: calc(100vw - 1120px);
+  overflow: auto;
+
   &-item {
     background-color: #46738e;
     display: flex;
     align-items: center;
-    width: 150px;
     height: 30px;
+    padding: 0 10px;
+    flex-shrink: 0;
 
     &:not(:last-child) {
       margin-right: 2px;
     }
 
     span {
-      margin-left: 20px;
       margin-right: 5px;
       width: 14px;
       height: 14px;
@@ -58,7 +61,7 @@ export default {
       }
 
       &.BLUE {
-        background: radial-gradient(circle, #00E57D 0, #00E57D 100%);
+        background: radial-gradient(circle, #00e57d 0, #00e57d 100%);
       }
 
       &.YELLOW {
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index cb6360b..af056f1 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -7,10 +7,6 @@
           Detailed-Information
           <detailed-infomation slot="content" :data="detailedInfomation" />
         </pop-over-with-icon>
-        <pop-over-with-icon placement="bottomLeft">
-          QC Flags
-          <qc-flags slot="content" :data="qcFlags" />
-        </pop-over-with-icon>
         <pop-over-with-icon>
           Graph Assistance
           <graph-assistance
@@ -20,24 +16,20 @@
             @reset="handleResetChart"
           />
         </pop-over-with-icon>
-        <a-popover
-          overlayClassName="popover-with-icon"
-          :visible="nuclideLibraryVisible"
-          @click="handleChangeNuclideVisible"
-          placement="bottom"
-        >
-          <div class="pop-over-with-icon">
-            <span class="text"> Nuclide Library </span>
-            <img src="@/assets/images/global/select-down.png" alt="" />
-          </div>
+        <pop-over-with-icon v-model="subOperatorsState.nuclideLibraryVisible">
+          Nuclide Library
           <a-spin slot="content" :spinning="isLoadingNuclide">
             <nuclide-library :list="nuclideLibraryList" @dblclick="handleNuclideDblClick" />
           </a-spin>
-        </a-popover>
+        </pop-over-with-icon>
 
         <div class="peak-info">
           <button-with-switch-icon @change="handlePeakInfoChange" @click="handleTogglePeak"></button-with-switch-icon>
         </div>
+        <pop-over-with-icon placement="right" v-model="subOperatorsState.qcFlagsVisible">
+          QC Flags
+          <qc-flags slot="content" :data="qcFlags" />
+        </pop-over-with-icon>
       </div>
       <!-- 二级交互栏结束 -->
       <!-- 主体部分 -->
@@ -184,7 +176,12 @@ export default {
       detailedInfomation: [],
       qcFlags: [],
       graphAssistance: cloneDeep(graphAssistance),
-      nuclideLibraryVisible: false,
+
+      // 子菜单状态
+      subOperatorsState: {
+        nuclideLibraryVisible: false,
+        qcFlagsVisible: false,
+      },
 
       channelData: {
         peakGroup: [],
@@ -263,13 +260,22 @@ export default {
 
     window.removeEventListener('keydown', this.handleKeyboardEvent)
     window.removeEventListener('click', this.closePeakInfomationTooltip)
+
+    if (this.qcFlagsTimer) {
+      clearTimeout(this.qcFlagsTimer)
+    }
   },
   deactivated() {
-    this.nuclideLibraryVisible = false
+    // Object.keys(this.subOperatorsState).forEach(k => {
+    //   this.subOperatorsState[k] = false
+    // })
   },
   mounted() {
     this.option.brush = { toolbox: [] }
     this.initWebSocket()
+    this.qcFlagsTimer = setTimeout(() => {
+      this.subOperatorsState.qcFlagsVisible = true
+    }, 100)
   },
   methods: {
     // 键盘事件
@@ -900,7 +906,7 @@ export default {
     changeSeriesType() {},
 
     handleChangeNuclideVisible() {
-      this.nuclideLibraryVisible = !this.nuclideLibraryVisible
+      this.subOperatorsState.nuclideLibraryVisible = !this.subOperatorsState.nuclideLibraryVisible
     },
 
     // 根据seriesName重绘线
@@ -1024,7 +1030,7 @@ export default {
           sampleId,
           channel,
           fileName,
-          energy
+          energy,
         })
         if (success) {
           const { possible } = result
@@ -1042,7 +1048,7 @@ export default {
 
     // Nuclide Library 单项双击
     handleNuclideDblClick(nuclide) {
-      this.nuclideLibraryVisible = false
+      this.subOperatorsState.nuclideLibraryVisible = false
       this.nuclideReview.nuclide = nuclide
       this.nuclideReview.visible = true
     },
@@ -2102,8 +2108,44 @@ export default {
     }
   }
 
+  // 二级操作栏开始
+  .spectrum-analysis-sub-operators {
+    flex-shrink: 0;
+    margin-bottom: 19px;
+    display: flex;
+    gap: 11px;
+    flex-wrap: nowrap;
+    overflow: auto;
+    height: 46px;
+    align-items: center;
+
+    .pop-over-with-icon {
+      height: 32px;
+
+      &:nth-child(1) {
+        width: 216px;
+      }
+      &:nth-child(2) {
+        width: 182px;
+      }
+      &:nth-child(3) {
+        width: 170px;
+      }
+      &:nth-child(5) {
+        width: 156px;
+      }
+    }
+
+    .peak-info {
+      width: 226px;
+      height: 32px;
+      display: inline-block;
+    }
+  }
+  // 二级操作栏结束
+
   &-main {
-    height: calc(100% - 51px);
+    height: calc(100% - 65px);
     display: flex;
     overflow: auto hidden;
     position: relative;
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 1f48f7b..6269585 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -1711,49 +1711,10 @@ export default {
   }
   // 顶部操作栏结束
 
-  ::v-deep {
-    // 二级操作栏开始
-    .spectrum-analysis-sub-operators {
-      flex-shrink: 0;
-      margin-bottom: 19px;
-      display: flex;
-      flex-wrap: nowrap;
-      overflow: auto;
-
-      .pop-over-with-icon {
-        height: 32px;
-
-        &:not(:last-child) {
-          margin-right: 11px;
-        }
-
-        &:nth-child(1) {
-          width: 256px;
-        }
-        &:nth-child(2) {
-          width: 186px;
-        }
-        &:nth-child(3) {
-          width: 246px;
-        }
-        &:nth-child(4) {
-          width: 246px;
-        }
-      }
-
-      .peak-info {
-        width: 306px;
-        height: 32px;
-        display: inline-block;
-      }
-    }
-    // 二级操作栏结束
-  }
-
   // 主体部分开始
   &-main {
-    margin-top: 15px;
-    height: calc(100% - 45px);
+    padding-top: 5px;
+    height: calc(100% - 15px);
     overflow: hidden;
   }
   // 主体部分结束

From 471666911f3135625bf4a7f201625a666dd973db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Thu, 7 Mar 2024 16:39:17 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8Cgamma=20=E5=88=86=E6=9E=90=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/gamma-analysis.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index af056f1..bc75927 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1808,6 +1808,7 @@ export default {
           return success
         } else {
           this.isLoading = false
+          this.reprocessingModalVisible = false
           if (showMessage) {
             const arr = message.split('\n')
             this.$warning({

From 5c66f2b6f423d0686859d54f047fed7a51c91107 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 8 Mar 2024 16:51:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=BB=98?=
 =?UTF-8?q?=E5=88=B6=E8=BD=A8=E8=BF=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../station-operation/icon-route-active.png   | Bin 0 -> 1431 bytes
 .../images/station-operation/icon-route.png   | Bin 0 -> 1419 bytes
 src/views/stationOperation/components/Map.vue | 128 ++++++++++++++-
 .../stationOperation/components/MapPane.vue   | 155 ++++++++++++++++--
 src/views/stationOperation/index.vue          |  12 +-
 5 files changed, 277 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/images/station-operation/icon-route-active.png
 create mode 100644 src/assets/images/station-operation/icon-route.png

diff --git a/src/assets/images/station-operation/icon-route-active.png b/src/assets/images/station-operation/icon-route-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc3feb64cd70615e8d1fd5986c03ceb48540b895
GIT binary patch
literal 1431
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!WpKsVXIz(~Q|QqR!L
z#Kg=%N5ROz$Uxt~RNv4@*U-$$z{JYXTmcG{fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr62to{@q^cxGNo
zetEGbSc9*xm1kaYNn&1ds;7&s63_^}%*+&Ea2mL{7&<!v2{%JSS653zBMT=Nb3+$H
zOA8kRM`xH`m;B_?+|;}hnBEkGUT2(oL1`hk0BEyIYEfocYKmJ?ey#%8&sLeZ-C~K;
zJgD9j+-`BisaGH97=2L8BE>XJ2$+08OnABla^NXHH4m8Fi-76+9z%^40|OJ6r;B4q
z#jT_#Tpxd*H(+RBbtz~OwOPJ=sePF5gp?!+1%s@QD~@V7OrAgc>6G@JE1Gu*NZ-{7
zd;B=*=92`CKObKA?@zy1_s3VfduxMTY<{{z$=Acv@1Im(x9|Vg_y6n5($w7CytoCN
z5*AKfw}3_6`t$q$|0Vl&&hFggu=dZl@Av<k_Q%z{-|_1K_XXW6+bfPXi{D>eB2t-O
z`|Dfv*~QcCEoLY(s<M{&>}!+ZXE!!ZzI)Vq{>r?<_g~rL|NZ&@eSeJi#PXZX&+muZ
z)_i1E`~Ks0|9;(HS~VscC0Nw%ReYH$DRHD&cMEI$-ydJU-FVHv-{H}9`?|l*n=RTJ
z_W`+aKR-M@|5yM1!)Y504UPURcU|Rne)sNq`~Uv@^ZR^#$VxHJr+2yE+x<T_wY+g=
z*F@e~n{UjVA#s~0w30dXsD&fbYq|Zu;!6L0dp`gFzrX6Yk^=6<=C1CaSf2RF{=XB?
zZ=fOjZ_ihByq~n-kn~c8gQoA_U0$zHH))f}_x}C$|HI=C_*CdDc@`_caPx<_MxRdE
z-Rn_2Pd5B4pI_S=d4!{7BG;rCmB=3L_lKed>;D@r=r(<!`8iPL_>WI|dJD7<9G<m8
z=P0lCQHPuWjtO&i6g-WMS->W-WI>78T8)#ekMyfQJc@q2ba(uTQ^#)rbuf7CJ(`|h
x$CS8AL}9@m>swzWw^p2pIAako*Q|konc?qW`G&3Wv#x@QN>5immvv4FO#q9NE7$-4

literal 0
HcmV?d00001

diff --git a/src/assets/images/station-operation/icon-route.png b/src/assets/images/station-operation/icon-route.png
new file mode 100644
index 0000000000000000000000000000000000000000..34ad7fb7d40f7a953ca3db63edfa611ab160ca69
GIT binary patch
literal 1419
zcmaJ>ZA=?=9KMazVPTq$MZv{!TtB!?+Phw%tT(y>y)v3uU{C|em~w58QlP!#?x2O3
zb%@)7jLjvEWWkCuKOjNgJ~(BIbu4YdNF2rx;+P`iZE<P=!(^8ByfVuCAYO9!f64Pa
zzqcpXQkZ{yxA+w?006u7d3ceq9*DfL&k5h7NMDz*ByqY@u9&LeoCHGx*%rz~f_gh)
zC5uSH(oj1}W&%Kr#AYnzN)2ydX38!jA{d#=P77=R$ke!K!dy*qpoz5F9BL?V!wZ2n
ziyA6PHy{RDOIF(Q8X2;<G2duztTwAGkmeYe>B0m7JIN8C%U<JPF_#+J(8Yv(<Qj&+
z4G34QhMp!>YA6J?6hnea86q_!2nuGXWO8L%ni5F`Q3OR`BpsHcQn?aC(lB`jxcNXr
zG{#ba72&y?v4oQvs^mBtgJGxBDRU}h6k~<uDwPUGP#8s}0z%3*I5@&3b+D4C0#34K
z#zu2C$^k|c2@_SvsUacLrzP0wEm;S<*(RZ3u#2E!xeSSv6a^X#{|~j>x6mwCL_W*+
zKZRLi15Lt3BumvXW?^s@l1L~T(=sH%QH+tIYNA~%tfV-Kt)yrWmCI1@V2RCPp`7fY
z4T8ad=^ZRbILxFTS3`n?%x1G-TBTNp<fP#^F4xKBI-N?Z%T*zY99<5sR46i(Q7%rI
z>+Gb1i*hZ`xVmk*5ii(jAu>)fwtCW%%TRW3qh`#ueJ(lM>TPl@+vlR)mJ18Xz>&%R
zYtqpx!9J1gmT!f_mh(x6V0T9F^~vESJpk+o>+x)(>z-*&yd1oX0B1z_`jPsuN-doq
zKtHsY5<#SDx!c#BrSr^Bp9^*I(wZM1S_iwtV_wzkXOlXQg~wb^?o)r4_V(Obp%%~-
zf5)U-(Qfrx*H#~CV)h@E#7HEhC^luO-+B&g?mqG-uW=`a`+t($`8Iyy@odoTx9|T(
z@!iAV$WkDARa$X>=y8zm-TRh5c-^h2nObXZ^1KSA$VS&S^49ZB&CQnw`{xy_(vQ_o
z;%;|pc;32i1$C5#JhhL8lj+gLf^Zn_o4wZJD<4}d;Kkwxyr)={G=1~*82!f_Jh0|D
z=??#J_~K0a-K*<YW)>zi@dXFMO>sj*D6-BMG#lI6ok=eSf}=~n`ZV_{UNf!8Bngu7
z$q(M~`Tc9&;kLl^r(+NJ7vA2pYcSjNnJE2WApg{RSDnN!lLdKer$g(PW^SqJaUTAB
zHWWzq`@X9Bz68;vUhJ4zyu@En8#-IQOtk(iiuuIj=25UUG{xq|&msPaR_};(=Sv75
z%K18PNI;xz>eM8S`@%09mrs1uv%GMsEKA$5>aI-9=-n4Hn4OZv)Q?<o*7ocY9g-y6
z=FiYF#68<XT}YVnmcJQSMeeQoEp)xkWWCw&dq(=up5DRZWtX47bK{z!^F-_U_kF1Y
fa|Wt)$If^lcImII@E3>MBELtyE+6m9DS!7Lz<wv1

literal 0
HcmV?d00001

diff --git a/src/views/stationOperation/components/Map.vue b/src/views/stationOperation/components/Map.vue
index 8cc3564..ad45525 100644
--- a/src/views/stationOperation/components/Map.vue
+++ b/src/views/stationOperation/components/Map.vue
@@ -11,6 +11,14 @@ import Map from 'ol/Map'
 import XYZ from 'ol/source/XYZ'
 import View from 'ol/View'
 import { fromLonLat } from 'ol/proj'
+import Stroke from 'ol/style/Stroke'
+import { MarkerIcon, MarkerType } from './markerEnum'
+import Icon from 'ol/style/Icon'
+import VectorSource from 'ol/source/Vector'
+import VectorLayer from 'ol/layer/Vector'
+import { LineString, Point } from 'ol/geom'
+import { Feature } from 'ol'
+import Style from 'ol/style/Style'
 
 const mapSourceUrl = process.env.VUE_APP_MAP_BASE_URL
 export default {
@@ -57,21 +65,29 @@ export default {
         }),
       })
 
-      const layers = [this.tileLayer]
+      this.animationSource = new VectorSource({
+        features: [],
+      })
 
-      const view = new View({
+      this.animationLayer = new VectorLayer({
+        source: this.animationSource,
+      })
+
+      const layers = [this.tileLayer, this.animationLayer]
+
+      this.view = new View({
         projection: 'EPSG:3857', // 使用这个坐标系
         center: fromLonLat([longitude, latitude]),
         zoom: this.zoom,
         maxZoom: this.maxZoom,
         minZoom: this.minZoom,
-        extent: [-20037508.34 - 3500000, -20037508.34 , 20037508.34 + 3500000, 20037508.34],
+        extent: [-20037508.34 - 3500000, -20037508.34, 20037508.34 + 3500000, 20037508.34],
       })
 
       this.map = new Map({
         target: this.$refs.mapContainerRef,
         layers,
-        view,
+        view: this.view,
         controls: [],
       })
     },
@@ -120,6 +136,110 @@ export default {
         })
       )
     },
+
+    // 按路线运动
+    animateByRoute(coordinates) {
+      if (!coordinates) {
+        return
+      }
+
+      if (!coordinates.length) {
+        this.stopRouteAnimation()
+        this.removeAnimationFeatures()
+        return
+      }
+
+      this.startRouteAnimation(
+        coordinates,
+        {
+          stroke: new Stroke({
+            color: '#17f85c',
+            lineDash: [6],
+            width: 2,
+          }),
+        },
+        {
+          image: new Icon({
+            src: MarkerIcon[MarkerType.Car],
+            anchor: [0.65, 0.5],
+          }),
+        },
+        [100, 430, 100, 450]
+      )
+    },
+    /**
+     * 沿轨迹运动
+     * @param {Array<any>} route 轨迹路线
+     * @param {Object} marker 运动的物体
+     */
+    startRouteAnimation(route, lineStyleOptions, markerStyleOptions, padding = []) {
+      // 清理上次的动画
+      this.stopRouteAnimation()
+
+      // 清理动画图层
+      this.removeAnimationFeatures()
+
+      const lineString = new LineString(route.map((item) => fromLonLat(item)))
+      const extent = lineString.getExtent()
+      this.view.fit(extent, {
+        padding,
+        duration: 1000,
+      })
+
+      // 创建轨迹线
+      const routeFeature = new Feature({
+        geometry: lineString,
+      })
+
+      // 设置轨迹线样式，并添加到地图上
+      routeFeature.setStyle(new Style(lineStyleOptions))
+      this.animationSource.addFeature(routeFeature)
+
+      // 创建标记物，并设置位置到轨迹路线的初始位置
+      const markerFeature = new Feature({
+        geometry: new Point(lineString.getFirstCoordinate()),
+      })
+
+      // 设置标记物样式，并添加到地图上
+      markerFeature.setStyle(new Style(markerStyleOptions))
+      this.animationSource.addFeature(markerFeature)
+
+      let lastTime = Date.now(),
+        distance = 0
+      this.postRenderCallback = (event) => {
+        const speed = 60
+        const time = event.frameState.time
+        const elapsedTime = time - lastTime
+        distance = (distance + (speed * elapsedTime) / 1e6) % 2
+        lastTime = time
+
+        if (distance >= 1) {
+          this.stopRouteAnimation()
+          return
+        }
+
+        const currentCoordinate = lineString.getCoordinateAt(distance > 1 ? 2 - distance : distance)
+        markerFeature.setGeometry(new Point(currentCoordinate))
+
+        // tell OpenLayers to continue the postrender animation
+        this.map.render()
+      }
+
+      this.animationLayer.on('postrender', this.postRenderCallback)
+    },
+
+    // 移除动画层所有元素
+    removeAnimationFeatures() {
+      this.animationSource.clear()
+    },
+
+    // 停止轨迹动画
+    stopRouteAnimation() {
+      if (this.postRenderCallback) {
+        this.animationLayer.un('postrender', this.postRenderCallback)
+        this.postRenderCallback = null
+      }
+    },
   },
 }
 </script>
diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 907df4a..6a3a189 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -32,6 +32,14 @@
           />
           <img v-else src="@/assets/images/station-operation/filter-station.png" @click="onPaneChange(2)" />
         </div>
+        <div title="Filter">
+          <img
+            v-if="active == 3 && showPane"
+            src="@/assets/images/station-operation/icon-route-active.png"
+            @click="showPane = !showPane"
+          />
+          <img v-else src="@/assets/images/station-operation/icon-route.png" @click="onPaneChange(3)" />
+        </div>
       </div>
 
       <div class="map-pane-operators-zoom">
@@ -149,6 +157,41 @@
         </div>
       </div>
       <!-- 站点筛选结束 -->
+
+      <!-- 路径 -->
+      <div class="route" v-show="active == 3">
+        <div class="map-pane-content-header">Route</div>
+        <div class="map-pane-content-main">
+          <div class="route-form-item">
+            <div class="label">Station</div>
+            <custom-select v-model="routeParams.stationCode" :options="stationSelectOptions"></custom-select>
+          </div>
+          <div class="route-form-item">
+            <div class="label">Start Date</div>
+            <custom-date-picker
+              show-time
+              format="YYYY/MM/DD HH:mm:ss"
+              valueFormat="YYYY/MM/DD HH:mm:ss"
+              v-model="routeParams.startDate"
+            ></custom-date-picker>
+          </div>
+          <div class="route-form-item">
+            <div class="label">End Date</div>
+            <custom-date-picker
+              show-time
+              format="YYYY/MM/DD HH:mm:ss"
+              valueFormat="YYYY/MM/DD HH:mm:ss"
+              v-model="routeParams.endDate"
+            ></custom-date-picker>
+          </div>
+          <div class="route-form-item">
+            <a-button class="btn" type="primary" :loading="isSearchingRoute" @click="handleRouteSearch"
+              >Search</a-button
+            >
+          </div>
+        </div>
+      </div>
+      <!-- 路径结束 -->
     </div>
     <!-- 主体部分结束 -->
 
@@ -274,6 +317,7 @@ import { MarkerType, FilterIcon } from './markerEnum'
 import { Vector as VectorLayer } from 'ol/layer'
 import VectorSource from 'ol/source/Vector'
 import { cloneDeep } from 'lodash'
+import dayjs from 'dayjs'
 
 // Filter中的筛选列表
 const filterList = [
@@ -393,10 +437,13 @@ export default {
       type: Number,
       default: 500,
     },
-
     treeData: {
       type: Array,
     },
+    originalDataList: {
+      type: Array,
+      default: () => [],
+    },
   },
   components: {
     CustomModal,
@@ -445,6 +492,14 @@ export default {
       stationInfo: undefined,
 
       mapSource: 'online',
+
+      routeParams: {
+        stationCode: undefined,
+        startDate: dayjs().subtract(7, 'd').format('YYYY-MM-DD'),
+        endDate: dayjs().format('YYYY-MM-DD'),
+      },
+
+      isSearchingRoute: false,
     }
   },
   created() {
@@ -492,18 +547,33 @@ export default {
     // 面板改变
     onPaneChange(active) {
       this.showPane = true
+      this.prevPane = this.active // 记录上次是哪个面板
       this.active = active
       const source = this.circleLayer.getSource()
       source.clear() // 清理图层
-      switch (active) {
-        case 1: // 核设施查询面板
+
+      // 如果切换到轨迹绘制页面，则使用上一次的轨迹先绘制一遍
+      if (active == 3) {
+        if (this.lastRoute) {
+          this.$emit('drawRoute', this.lastRoute)
+        }
+
+        this.$emit('changeMarker', [])
+      } else {
+        // 如果是从轨迹绘制切换到其他页面
+        if (this.prevPane == 3) {
+          this.$emit('drawRoute', [])
+        }
+
+        if (active == 1) {
           this.emitDrawCircle(2)
           this.emitStationChange()
-          break
-        case 2: // 筛选面板
+        }
+
+        if (active == 2) {
           this.emitDrawCircle(1)
           this.emitFilter()
-          break
+        }
       }
     },
 
@@ -822,6 +892,39 @@ export default {
     handleResize() {
       this.$refs.realtimeChartRef.resize()
     },
+
+    // 查询路径
+    async handleRouteSearch() {
+      if (!this.routeParams.stationCode) {
+        this.$message.warn('Station Code Cannot Be Null')
+        return
+      }
+
+      this.isSearchingRoute = true
+
+      try {
+        const { success, result, message } = await getAction('/stationOperation/getSelfStationGPS', {
+          ...this.routeParams,
+        })
+
+        if (success) {
+          if (!result.length) {
+            this.$message.warn('No Route Found')
+            return
+          }
+
+          this.lastRoute = result.map(({ lon, lat }) => [lon, lat])
+
+          this.$emit('drawRoute', this.lastRoute)
+        } else {
+          this.$message.error(message)
+        }
+      } catch (e) {
+        console.error(e)
+      } finally {
+        this.isSearchingRoute = false
+      }
+    },
   },
   watch: {
     async dataStatusModalVisible(val) {
@@ -840,6 +943,16 @@ export default {
       }
     },
   },
+  computed: {
+    stationSelectOptions() {
+      return this.originalDataList
+        .filter(({ stationType }) => stationType == 'Car')
+        .map(({ stationName: label }) => ({
+          label,
+          value: label,
+        }))
+    },
+  },
 }
 </script>
 <style lang="less" scoped>
@@ -868,6 +981,8 @@ export default {
 
     img {
       cursor: pointer;
+      width: 30px;
+      height: 30px;
     }
     &-main-operator {
       margin-top: 5px;
@@ -1057,17 +1172,12 @@ export default {
                 }
 
                 .ant-table-thead > tr th {
-                  padding-top: 2px !important;
-                  padding-bottom: 2px !important;
+                  padding-top: 2px 6px !important;
                 }
 
                 .ant-table-tbody .ant-table-row td {
                   padding: 6px !important;
                 }
-
-                .ant-table-placeholder {
-                  background-color: transparent;
-                }
               }
             }
           }
@@ -1135,6 +1245,27 @@ export default {
         }
       }
     }
+
+    // 路径
+    .route {
+      pointer-events: all;
+
+      &-form-item {
+        .label {
+          margin-bottom: 10px;
+        }
+
+        &:not(:first-child) {
+          margin-top: 15px;
+        }
+      }
+
+      .btn {
+        width: 100%;
+        margin-top: 50px;
+        height: 40px;
+      }
+    }
   }
 }
 // 地图右侧操作栏结束
diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue
index 783d58a..40b78d6 100644
--- a/src/views/stationOperation/index.vue
+++ b/src/views/stationOperation/index.vue
@@ -152,11 +152,13 @@
         <MapPane
           ref="mapPane"
           :treeData="treeData"
+          :originalDataList="originalDataList"
           @changeMarker="onChangeMarker"
           @filterMarker="onFilterMarker"
           @drawCircle="onDrawCircle"
           @mapSourceChange="handleMapSourceChange"
           @focusStationChange="getFollowedStationList"
+          @drawRoute="handleDrawRoute"
         />
       </Map>
     </div>
@@ -240,6 +242,7 @@ export default {
       updataFilterType: [],
       updataFilterDataQuality: [],
       httpNum: 0,
+      originalDataList: [],
     }
   },
   created() {
@@ -546,8 +549,8 @@ export default {
     // 地图图标点击
     onMarkerClick(stationInfo) {
       const { stationType, stationName } = stationInfo
-      const find = this.orgStationList.find(item => item.stationCode == stationName)
-      if(!find) {
+      const find = this.orgStationList.find((item) => item.stationCode == stationName)
+      if (!find) {
         return
       }
 
@@ -577,6 +580,11 @@ export default {
     getDictSelectTagContainer() {
       return document.body
     },
+
+    // 绘制轨迹
+    handleDrawRoute(routes) {
+      this.$refs.mapRef.animateByRoute(routes)
+    },
   },
 }
 </script>

From ecc8d6d4dcf458beeed16b6d3005e8bf7bcc291b Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 8 Mar 2024 17:42:05 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix:=20title=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stationOperation/components/MapPane.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 6a3a189..e250db4 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -32,7 +32,7 @@
           />
           <img v-else src="@/assets/images/station-operation/filter-station.png" @click="onPaneChange(2)" />
         </div>
-        <div title="Filter">
+        <div title="Route">
           <img
             v-if="active == 3 && showPane"
             src="@/assets/images/station-operation/icon-route-active.png"

From c5d8f3aed524b98ea416f83f2ab33462cd739b2f Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Sat, 9 Mar 2024 14:48:36 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4store=E4=B8=AD=E7=9A=84=E8=B0=B1=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BB=8D?=
 =?UTF-8?q?=E7=84=B6=E5=88=A0=E9=99=A4=E4=BA=86=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/sample.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/sample.js b/src/store/modules/sample.js
index 04bdb20..c13d6dd 100644
--- a/src/store/modules/sample.js
+++ b/src/store/modules/sample.js
@@ -32,7 +32,9 @@ const sample = {
 
     REMOVE_SAMPLE_DATA: (state, inputFileName) => {
       const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName)
-      state.sampleList.splice(findIndex, 1)
+      if(-1 !== findIndex) {
+        state.sampleList.splice(findIndex, 1)
+      }
     },
 
     CLEAR_SAMPLE_DATA: (state) => {

From 59678df335525d1f0e08306f23356fd4c76e69b2 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Mon, 11 Mar 2024 11:09:41 +0800
Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=B8=8A=E4=B8=80=E6=AC=A1=E8=AF=B7=E6=B1=82=E4=B8=AD?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/gamma-analysis.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index bc75927..dd3e522 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -525,7 +525,10 @@ export default {
         }
       } catch (error) {
         console.error(error)
-        this.isLoading = false
+        const isCancel = axios.isCancel(error)
+        if(!isCancel) {
+          this.isLoading = false
+        }
       }
     },
 
@@ -561,6 +564,7 @@ export default {
     cancelLastRequest() {
       if (this._cancelToken && typeof this._cancelToken == 'function') {
         this._cancelToken()
+        this._cancelToken = undefined
       }
     },
 
@@ -2058,6 +2062,8 @@ export default {
         this.handleResetState()
         const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
         if (sampleData) {
+          this.cancelLastRequest()
+          this.isLoading = false
           this.dataProcess(sampleData.data, sampleData.from)
         } else {
           if (newVal.sampleId) {