fix: 修复beta下Add Comment、Statistics弹窗及load from file文件名问题

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue

@@ -34,6 +34,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    comment: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -56,7 +60,9 @@ export default {
         })
         if (res.success) {
           this.comments = res.result
-          this.$emit('sedInfo', this.comments)
+          if(this.value) { // 如果之前有值，用之前的
+            this.comments.spectrumAnalysisCommentInfo = this.comment
+          }
         } else {
           this.$message.error(res.message)
         }
@@ -72,7 +78,9 @@ export default {
       this.getCommets()
     },
     handleOk() {
-      console.log('%c [  ]-26', 'font-size:13px; background:pink; color:#bf2c9f;', this.comments)
+      this.$emit('sendInfo', this.comments)
+      this.$message.success('Commit successful')
+      this.visible = false
     },
   },
 }

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue

@@ -61,7 +61,7 @@
           <template slot="title">
             <a-checkbox v-model="queryParams.filterGrpbox">Filter</a-checkbox>
           </template>
-          <a-checkbox>Xe Result Flag</a-checkbox>
+          <a-checkbox :disabled="filterDisabled">Xe Result Flag</a-checkbox>
           <!-- 配置详情 -->
           <div class="filter-options">
             <div class="filter-option">
@@ -291,7 +291,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
-          this.queryParams.detectorName = undefined
+          this.queryParams.detectorId = ''
         }
       } catch (error) {
         console.error(error)
@@ -329,7 +329,7 @@ export default {
       try {
         const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
         const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
-          detectorCode: find.label,
+          detectorCode: find? find.label: '',
           ...this.queryParams
         })
         if (success) {

src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue

@@ -194,7 +194,7 @@ export default {
           this.setStationAndDetector(result)
         } else {
           this.detectorList = []
-          this.queryParams.detectorName = undefined
+          this.queryParams.detectorId = ''
         }
       } catch (error) {
         console.error(error)
@@ -227,7 +227,7 @@ export default {
       try {
         const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
         const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', {
-          detectorCode: find.label,
+          detectorCode: find? find.label: '',
           ...this.queryParams
         })
         if (success) {

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

@@ -445,9 +445,10 @@ export default {
                 })
 
                 if (findFile) {
+                  const regExp = new RegExp(`(${otherFilePrefix}${fileType}_${qualify}_\\d{1,}\\.{0,}\\d{0,}).*?(\\.PHD)`)
                   record[nameKeys[index]] = {
                     file: findFile,
-                    fileName: findFile.name,
+                    fileName: findFile.name.replace(regExp, '$1$2'),
                   }
                 } else {
                   record[nameKeys[index]] = {

src/views/spectrumAnalysis/index.vue

@@ -157,6 +157,7 @@
     <beta-gamma-comments-modal
       v-model="betaGammaCommentsModalVisible"
       :isAdd="isBetaGammaCommentsAdd"
+      :comment="params_toDB.comment"
       @sendInfo="getcommentsInfo"
     />
     <!-- Beta-Gamma 的Comments 结束 -->
@@ -477,6 +478,7 @@ export default {
         this.analysisType = ANALYZE_TYPE.GAMMA
       }
       this.sampleData = this.newSampleData = sample
+      this.params_toDB.comment = ''
     },
 
     // 清理全部