From 5177f85677f1eee1d35455f456f3733d56dbe9a7 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 29 Feb 2024 15:41:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DResult=20Display?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ResultDisplay.vue               | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/ResultDisplay.vue b/src/views/spectrumAnalysis/components/ResultDisplay.vue
index 2d00eb7..7fbeb65 100644
--- a/src/views/spectrumAnalysis/components/ResultDisplay.vue
+++ b/src/views/spectrumAnalysis/components/ResultDisplay.vue
@@ -46,6 +46,8 @@
 </template>
 
 <script>
+import { cloneDeep } from 'lodash'
+
 const columns = [
   {
     title: 'Flag',
@@ -94,6 +96,8 @@ const columns = [
     width: 34,
   },
 ]
+
+const sortList = ['Xe131m', 'Xe133', 'Xe133m', 'Xe135']
 export default {
   props: {
     data: {
@@ -121,7 +125,8 @@ export default {
     data: {
       handler(val) {
         if (val && Array.isArray(val)) {
-          val.forEach((item) => {
+          const list = cloneDeep(val)
+          list.forEach((item) => {
             if (item.conc < 0) {
               item.className = 'error'
             } else if (item.conc > 0 && item.conc < item.mdc) {
@@ -130,8 +135,15 @@ export default {
               item.className = 'success'
             }
           })
-          this.source1 = val.slice(0, 2)
-          this.source2 = val.slice(2, 4)
+
+          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)
         }
       },
       immediate: true,