gamma功能的configureSave接口增加 applyAll字段

Reprocessing all 请求接口的时候改为依次调用分析接口分析全部需要隐藏单个文件的进度弹窗；分析全部的时候增加进度条弹窗； beta的Statistics功能模块增加一个字段 xeResultFlag
2023-11-16 18:19:24 +08:00 · 2023-11-16 18:19:24 +08:00 · 709a0c069a
commit 709a0c069a
parent f6450af8b2
5 changed files with 153 additions and 50 deletions
--- a/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue
@ -177,6 +177,7 @@ export default {
          dateTime_Conc,
          checkBox_updateCal,
          checkBox_keepPeak,
+          group_calPS,
        } = this.model

        const param = {
@ -196,6 +197,7 @@ export default {
          refTime_conc: dateTime_Conc,
          updateCalibration: checkBox_updateCal,
          keepCalPeakSearchPeaks: checkBox_keepPeak,
+          applyAll: group_calPS || false,
        }

        const { success, message } = await postAction('/gamma/configureSave', param)
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/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 :disabled="filterDisabled">Xe Result Flag</a-checkbox>
+          <a-checkbox :disabled="filterDisabled" v-model="queryParams.xeResFlag">Xe Result Flag</a-checkbox>
          <!-- 配置详情 -->
          <div class="filter-options">
            <div class="filter-option">
@ -157,7 +157,7 @@ const initialOption = {
    right: 10,
    left: 40,
    top: 20,
-    bottom: 60
+    bottom: 60,
  },
  legend: {
    show: false,
@ -166,62 +166,62 @@ const initialOption = {
    right: 20,
    z: 999,
    textStyle: {
-      color: '#fff'
+      color: '#fff',
    },
    backgroundColor: '#022024',
    borderColor: '#0b8c82',
    borderWidth: 1,
-    itemWidth: 50
+    itemWidth: 50,
  },
  xAxis: {
    type: 'category',
    axisLine: {
      lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
-      }
+        color: 'rgba(119, 181, 213, .3)',
+      },
    },
    axisLabel: {
      color: '#ade6ee',
      fontSize: 12,
      rotate: 45,
      margin: 10,
-      formatter: value => {
+      formatter: (value) => {
        return moment(value).format('YYYY/MM/DD')
      },
-      interval: 4
+      interval: 4,
    },
    splitLine: {
      show: true,
      lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
-      }
+        color: 'rgba(119, 181, 213, .3)',
+      },
    },
    axisTick: {
-      show: false
+      show: false,
    },
-    data: []
+    data: [],
  },
  yAxis: {
    axisLine: {
      lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
-      }
+        color: 'rgba(119, 181, 213, .3)',
+      },
    },
    axisLabel: {
      color: '#ade6ee',
-      fontSize: 12
+      fontSize: 12,
    },
    splitLine: {
      show: true,
      lineStyle: {
-        color: 'rgba(119, 181, 213, .3)'
-      }
+        color: 'rgba(119, 181, 213, .3)',
+      },
    },
    axisTick: {
-      show: false
-    }
+      show: false,
+    },
  },
-  series: []
+  series: [],
 }

 // 左侧配置
@ -244,7 +244,7 @@ const initialFilterOption = {
  xeVolumeLine: 0.87,
  mdcLine: 0,
  concLine: 0,
-  nuclidesList: []
+  nuclidesList: [],
 }
 export default {
  components: { TitleOverBorder, CustomChart },
@ -254,8 +254,10 @@ export default {
      option: cloneDeep(initialOption),
      initialMDC: {}, // 初始化的信息，用于重置

-      queryParams: {},
-      detectorList: [] // 探测器列表
+      queryParams: {
+        xeResFlag: false,
+      },
+      detectorList: [], // 探测器列表
    }
  },
  methods: {
@ -265,7 +267,7 @@ export default {
        const { sampleId, inputFileName: sampleFileName } = this.sampleData
        const { success, message, result } = await getAction('/spectrumAnalysis/viewMDC', {
          sampleId,
-          sampleFileName
+          sampleFileName,
        })
        if (success) {
          this.setStationAndDetector(result)
@ -303,7 +305,7 @@ export default {
      this.queryParams.stationName = stationName
      this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
        label: detectorCode,
-        value: detectorId || ''
+        value: detectorId || '',
      }))
      this.queryParams.detectorName = detectorList[0].detectorCode
      this.queryParams.detectorId = detectorList[0].detectorId || ''
@ -315,7 +317,7 @@ export default {
      this.queryParams.stationName = this.initialMDC.stationName
      this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
        label: detectorCode,
-        value: detectorId || ''
+        value: detectorId || '',
      }))
    },

@ -327,29 +329,28 @@ export default {
      }

      try {
-        const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+        const find = this.detectorList.find((item) => item.value == this.queryParams.detectorId)
        const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
-          detectorCode: find? find.label: '',
-          ...this.queryParams
+          detectorCode: find ? find.label : '',
+          ...this.queryParams,
        })
        if (success) {
          if (result) {
-
            this.option.xAxis.data = result[0].m_Keys
            this.option.legend.show = true

-            this.option.series = result.map(item => {
+            this.option.series = result.map((item) => {
              return {
                type: 'line',
                name: item.m_strGraphName,
                data: item.m_Values,
                itemStyle: {
-                  color: item.m_GraphPen
+                  color: item.m_GraphPen,
                },
                lineStyle: {
-                  color: item.m_GraphPen
+                  color: item.m_GraphPen,
                },
-                symbol: 'circle'
+                symbol: 'circle',
              }
            })
          } else {
@ -375,17 +376,17 @@ export default {
      this.queryParams = {
        ...initialFilterOption,
        startTime: moment().format('YYYY-MM-DD'),
-        endTime: moment().format('YYYY-MM-DD')
+        endTime: moment().format('YYYY-MM-DD'),
      }

      this.option = cloneDeep(initialOption)
-    }
+    },
  },
  computed: {
    filterDisabled() {
      return !this.queryParams.filterGrpbox
-    }
-  }
+    },
+  },
 }
 </script>

--- a/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
@ -0,0 +1,48 @@
+<template>
+  <custom-modal v-model="visible" centered :width="420" title="Processing Monitor" class="processing-monitor">
+    <div class="processing-monitor-content">
+      <div class="processing-monitor-content-bar" :style="{ width: `${350 * percent}px` }">
+        <span class="processing-monitor-content-bar-percent">{{ percent * 100 }}%</span>
+      </div>
+    </div>
+    <div style="margin-top: 15px; font-size: 12px">{{ analysedFileName[0] }}</div>
+    <div slot="custom-footer">
+      <a-button @click="visible = false">Cancel</a-button>
+    </div>
+  </custom-modal>
+</template>
+
+<script>
+import ModalMixin from '@/mixins/ModalMixin'
+export default {
+  mixins: [ModalMixin],
+  props: {
+    percent: {
+      type: Number,
+    },
+    analysedFileName: {
+      type: Array,
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.processing-monitor {
+  &-content {
+    width: 350px;
+    height: 16px;
+    background: url(~@/assets/images/abnormalAlarm/green-bg.png) repeat;
+    &-bar {
+      position: relative;
+      height: 100%;
+      background: url(~@/assets/images/abnormalAlarm/green.png) repeat;
+      &-percent {
+        position: absolute;
+        right: -10px;
+        top: -1px;
+      }
+    }
+  }
+}
+</style>
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@ -1534,9 +1534,10 @@ export default {

      try {
        this.isLoading = true
+        const str = `&processKey=${userId}_${this.timerStamp}`
        const { inputFileName: fileName } = this.sample
        const { success, result, message } = await postAction(
-          `/gamma/Reprocessing?fileName=${fileName}&processKey=${userId}_${this.timerStamp}`
+          `/gamma/Reprocessing?fileName=${fileName}${showMessage ? str : ''}`
        )
        if (success) {
          this.reprocessingModalVisible = false //如果分析成功了，分析进度的弹窗即便是没有接收到后面的 ws 消息也要关闭弹窗
@ -1546,6 +1547,7 @@ export default {
          this.handleResetState()
          result.DetailedInformation = this.detailedInfomation
          this.dataProcess(result)
+          return success
        } else {
          this.isLoading = false
          if (showMessage) {
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@ -93,6 +93,13 @@
      @senInfo="getUpdateFlag"
    />
    <!-- 分析-设置弹窗结束 -->
+    <!-- 全部分析-进度弹窗开始 -->
+    <processing-monitor-modal
+      v-model="analyzeAllModalVisible"
+      :percent="percentBar"
+      :analysedFileName="analysedFileName"
+    />
+    <!-- 全部分析-进度弹窗结束 -->

    <!-- 分析工具弹窗开始 -->
    <analyze-interactive-tool-modal
@ -224,6 +231,7 @@ import NuclideActivityAndMdcModal from './components/Modals/NuclideActivityAndMD
 import MultiLevelMenu from './components/MultiLevelMenu.vue'
 import SaveSettingModal from './components/Modals/SaveSettingModal.vue'
 import AnalyzeSettingModal from './components/Modals/AnalyzeSettingModal.vue'
+import ProcessingMonitorModal from './components/Modals/ProcessingMonitorModal.vue'
 import AnalyzeInteractiveToolModal from './components/Modals/AnalyzeInteractiveToolModal/index.vue'
 import KorsumModal from './components/Modals/KorsumModal.vue'
 import ZeroTimeModal from './components/Modals/ZeroTimeModal.vue'
@ -275,6 +283,7 @@ export default {
    MultiLevelMenu,
    SaveSettingModal,
    AnalyzeSettingModal,
+    ProcessingMonitorModal,
    AnalyzeInteractiveToolModal,
    KorsumModal,
    ZeroTimeModal,
@ -333,6 +342,7 @@ export default {
      saveSettingModalVisible: false, // 保存设置弹窗

      analyzeConfigureModalVisible: false, // 分析设置弹窗
+      analyzeAllModalVisible: false, // 全部分析设置弹窗
      analyzeInteractiveToolModalVisible: false, // 分析工具弹窗
      zeroTimeModalVisible: false, // Zero Time 弹窗
      korsumModalShow: false, // Korsum 弹窗
@ -413,6 +423,10 @@ export default {

      colorConfig: {}, // 颜色配置
      sampleInfo: {},
+      gammaSampleNum: 0,
+      finishCont: 0,
+      percentBar: 0,
+      analysedFileName: '', //分析完成的文件名称
    }
  },
  created() {
@ -780,23 +794,59 @@ export default {
    },

    handleReprocessAll() {
+      this.analyzeAllModalVisible = true
      const { inputFileName, sampleType } = this.sampleData
+      // 获取所有的gamma list
+      const gammaSampleList = this.sampleList.filter((sample) => sample.sampleType !== 'B')
+      this.gammaSampleNum = gammaSampleList.length
+      const gammaInputFileNames = gammaSampleList.map((item) => item.inputFileName)

-      // 先排除当前的谱
-      const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName)
+      if (gammaInputFileNames.length > 0) {
+        this.fetchReprocessing(gammaInputFileNames, inputFileName, sampleType)
+      }

-      const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B')
-      const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B')
-      gammaSamples.forEach((gammaSample) => {
-        postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`)
-      })
+      // // 先排除当前的谱
+      // const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName)

-      // 处理当前的谱的reprocessing
-      if (inputFileName && sampleType !== 'B') {
-        this.$refs.gammaAnalysisRef.reProcessing(false)
+      // const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B')
+      // const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B')
+      // gammaSamples.forEach((gammaSample) => {
+      //   postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`)
+      // })
+
+      // // 处理当前的谱的reprocessing
+      // if (inputFileName && sampleType !== 'B') {
+      //   this.$refs.gammaAnalysisRef.reProcessing(false)
+      // }
+    },
+    async fetchReprocessing(fileNames, currFileName, sampleType) {
+      if (fileNames[0] == currFileName && sampleType !== 'B') {
+        this.$refs.gammaAnalysisRef.reProcessing(false).then((res) => {
+          if (res) {
+            this.finishCont++
+            this.percentBar = this.finishCont / this.gammaSampleNum
+            this.analysedFileName = fileNames.splice(0, 1)
+            if (fileNames.length > 0) {
+              this.fetchReprocessing(fileNames, currFileName, sampleType)
+            }
+          }
+        })
+      } else {
+        try {
+          const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
+          if (success) {
+            this.finishCont++
+            this.percentBar = this.finishCont / this.gammaSampleNum
+            this.analysedFileName = fileNames.splice(0, 1)
+            if (fileNames.length > 0) {
+              this.fetchReprocessing(fileNames, currFileName, sampleType)
+            }
+          }
+        } catch (error) {
+          console.error(error)
+        }
      }
    },
-
    // 查看Comments
    handleViewComments() {
      // 如果是gamma