Merge remote-tracking branch 'origin/master-dev' into feature-Beta-dev-renpy

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)
           }

src/views/spectrumAnalysis/index.vue

@@ -1829,8 +1829,6 @@ export default {
     padding: 0;
     position: relative;
     border-right: 0;
-    max-height: calc(100vh - 506px);
-    overflow: hidden auto;
 
     &-submenu {
       &-active {

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) {