Merge branch 'feature-Beta-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-Beta-dev-renpy

src/views/spectrumAnalysis/beta-analysis.vue

@@ -322,10 +322,11 @@ export default {
     // },
     async getSelfStationSampleDetail() {
       this.spectraType = this.SampleType[0].value
-      const { inputFileName, detFileName } = this.sample
+      const { inputFileName, detFileName,qcFileName } = this.sample
       let params = {
         sampleFileName: inputFileName,
         detFileName: detFileName,
+        qcFileName: qcFileName,
         // sampleFileName: 'ABC01_001-20240108_1405_S_FULL_40186.0.PHD',
         // detFileName: detFileName || 'ABC01_001-20240108_1327_D_FULL_381505.PHD',
       }

src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal-Beta.vue

@@ -315,7 +315,7 @@ export default {
 
     beforeModalOpen() {
       this.selectedRowKeys = []
-      this.getData('PHD')
+      this.getData()
       this.model.channel = null
       this.model.energy = null
     },

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

@@ -513,6 +513,23 @@ export default {
                   }
                 }
               })
+              // 查找 QC 文件
+              let qcFileInfo = {
+                file: undefined,
+                fileName: `${sampleFilePrefix}Q.PHD`,
+              }
+              const qcFileList = fileList.filter((file) => file.name.includes('_Q_'))
+              for (const qcFile of qcFileList) {
+                if (qcFile.name.slice(0, 23) <= sampleFilePrefix) {
+                  qcFileInfo = {
+                    file: qcFile,
+                    fileName: qcFile.name,
+                  }
+                } else {
+                  break
+                }
+              }
+              record.qcFileName = qcFileInfo
             } else {
               Object.assign(record, {
                 gasFileName: undefined,