From ecd16d9fbfd40e3049e6f335860b189979fbaf80 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, 14 Mar 2024 18:52:44 +0800
Subject: [PATCH 1/3] =?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=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/Scheduling.vue | 46 ++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue
index 70cc927..7070e2c 100644
--- a/src/views/system/Scheduling.vue
+++ b/src/views/system/Scheduling.vue
@@ -195,6 +195,13 @@
       </a-spin>
     </custom-modal>
     <!-- 增加/编辑排班弹窗结束 -->
+    <custom-modal title="Failure record" v-model="visibleRes" :footer="null">
+      <custom-table size="middle" :columns="columns" :list="dataSource">
+        <template slot="index" slot-scope="{ index }">
+          {{ index + 1 }}
+        </template>
+      </custom-table>
+    </custom-modal>
   </div>
 </template>
 <script>
@@ -250,6 +257,41 @@ export default {
       dragItem: null,
       fromUserId: '',
       stationName: '',
+      visibleRes: false,
+      columns: [
+        {
+          title: 'NO',
+          align: 'left',
+          scopedSlots: {
+            customRender: 'index',
+          },
+          customHeaderCell: () => {
+            return {
+              style: {
+                'padding-left': '60px !important',
+              },
+            }
+          },
+          customCell: () => {
+            return {
+              style: {
+                'padding-left': '60px !important',
+              },
+            }
+          },
+        },
+        {
+          title: 'LINE',
+          align: 'left',
+          dataIndex: 'line',
+        },
+        {
+          title: 'RESULT',
+          align: 'left',
+          dataIndex: 'result',
+        },
+      ],
+      dataSource: [],
     }
   },
   created() {
@@ -421,8 +463,10 @@ export default {
       try {
         const formData = new FormData()
         formData.append('file', file)
-        const { success, failure } = await postAction('/sysTask/importExcel', formData)
+        const { success, failure, detailList } = await postAction('/sysTask/importExcel', formData)
         this.$message.success(`${success} Success, ${failure} Fail`)
+        this.dataSource = detailList
+        this.visibleRes = true
         this.isImport = false
         this.getList()
       } catch (error) {

From 63a271be2b39b7b3de758d1c0f88954d7cc9c7dc Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Mar 2024 09:49:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E7=9A=84=E4=BA=8C=E7=BA=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=A2=AB=E6=A0=B7=E5=BC=8F=E9=9A=90=E8=97=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spectrumAnalysis/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 77002c3..66bcb00 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -1764,8 +1764,6 @@ export default {
     padding: 0;
     position: relative;
     border-right: 0;
-    max-height: calc(100vh - 506px);
-    overflow: hidden auto;
 
     &-submenu {
       &-active {

From 2301ce140985fd3da19cc4bfa14ae17210c09351 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Fri, 15 Mar 2024 10:05:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=B8=E7=B4=A0=E5=90=8E=E6=9C=AA=E5=88=B7=E6=96=B0table?=
 =?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

---
 .../components/Modals/AnalyzeInteractiveToolModal/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
index 9bfc63f..7f919a3 100644
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
@@ -1562,14 +1562,16 @@ export default {
         try {
           this.$set(this.selectedTableItem, '_deleting', true)
           const { inputFileName: fileName } = this.sampleData
-          const { success, message } = await postAction('/gamma/deleteNuclide', {
+          const { success, result, message } = await postAction('/gamma/deleteNuclide', {
             curRow: this.curRow,
             nuclideName: this.model.identifiedNuclide,
             fileName,
             list_identify: nuclides,
           })
           if (success) {
-            nuclides.splice(findIndex, 1)
+            const { identify, table } = result
+            this.selectedTableItem.nuclides = identify
+            this.list = table
           } else {
             this.$message.error(message)
           }