Peak Information页面查看IDC数据进行比较接口

Radionuclide Activity页面查看IDC数据进行比较接口

src/views/spectrumAnalysis/beta-analysis.vue

@@ -165,17 +165,17 @@ export default {
     getIndex(val) {
       this.currIdx = val
     },
-    async handleDetalSelfStationCache() {
+    // async handleDetalSelfStationCache() {
-      const { inputFileName } = this.sample
+    //   const { inputFileName } = this.sample
-      let params = {
+    //   let params = {
-        sampleFileName: inputFileName,
+    //     sampleFileName: inputFileName,
-      }
+    //   }
-      try {
+    //   try {
-        const { success, result, message } = await deleteAction('/selfStation/deleteSelfStationCache', params)
+    //     const { success, result, message } = await deleteAction('/selfStation/deleteSelfStationCache', params)
-      } catch (error) {
+    //   } catch (error) {
-        console.error(error)
+    //     console.error(error)
-      }
+    //   }
-    },
+    // },
     async getSelfStationSampleDetail() {
       this.spectraType = this.SampleType[0].value
       const { inputFileName, detFileName } = this.sample

src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue

@@ -59,6 +59,7 @@ const columns = [
   {
     title: 'HalfLife',
     dataIndex: 'halfLife',
+    ellipsis: true,
   },
   {
     title: 'Energy (keV)',
@@ -114,6 +115,28 @@ export default {
     // 切换比较
     handleComparision() {
       this.compareVisible = !this.compareVisible
+      if (this.compareVisible) {
+        this.getCompareInfo()
+      }
+    },
+    async getCompareInfo() {
+      try {
+        this.isLoading = true
+        const { sampleId, inputFileName: fileName } = this.sampleData
+        const { success, result, message } = await getAction('/gamma/nuclComparison', {
+          // sampleId,
+          fileName,
+        })
+        if (success) {
+          this.compareList = result
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isLoading = false
+      }
     },
 
     async getInfo() {

src/views/spectrumAnalysis/components/PeakInfomation.vue

@@ -9,6 +9,7 @@
         <div class="comparison-list-item">
           <div class="comparison-list-item-title">IDC</div>
           <custom-table :list="compareList" :scroll="{ y: 230 }" :columns="columns"></custom-table>
+          <!-- <custom-table :list="compareList" :scroll="{ y: 230 }" :columns="columns_compare"></custom-table> -->
         </div>
       </div>
       <custom-table v-else :columns="columns" :list="list" :scroll="{ y: 460 }" :canSelect="false"></custom-table>
@@ -100,6 +101,28 @@ export default {
     // 切换比较
     handleComparision() {
       this.compareVisible = !this.compareVisible
+      if (this.compareVisible) {
+        this.getCompareInfo()
+      }
+    },
+    async getCompareInfo() {
+      try {
+        this.isLoading = true
+        const { sampleId, inputFileName: fileName } = this.sampleData
+        const { success, result, message } = await getAction('/gamma/peakComparison', {
+          // sampleId,
+          fileName,
+        })
+        if (success) {
+          this.compareList = result
+        } else {
+          this.$message.error(message)
+        }
+      } catch (error) {
+        console.error(error)
+      } finally {
+        this.isLoading = false
+      }
     },
 
     async getInfo() {

src/views/spectrumAnalysis/components/SpectraListInMenu.vue

@@ -46,7 +46,6 @@ export default {
         }
       }
       const deleted = this.list.splice(index, 1)
-      console.log('deleted', deleted)
       clearSampleCache(deleted)
       this.$forceUpdate()
     },

src/views/spectrumAnalysis/index.vue

@@ -579,22 +579,6 @@ export default {
       })
       const names = this.sampleList.map((item) => item.inputFileName) // 当前Sample列表中的所有id
       const willAddList = arr.filter((item) => !names.includes(item.inputFileName))
-      // console.log('willAddList', willAddList)
-      //willAddList.push({
-      //  checked: true,
-      //  dbName: '',
-      //  detFileName: 'ABC01_001-20240108_1327_D_FULL_381505.PHD',
-      //  detFileStatus: null,
-      //  gasFileName: '',
-      //  gasFileStatus: null,
-      //  inputFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD',
-      //  qcFileName: '',
-      //  qcFileStatus: null,
-      //  sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD',
-      //  sampleId: null,
-      //  sampleSystemType: 'C',
-      //  sampleType: 'C',
-      //})
       this.callInitValue(willAddList)
       this.sampleList = this.sampleList.concat(willAddList)
     },