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

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

@@ -1,7 +1,7 @@
 <template>
   <custom-modal v-model="visible" title="BetaGamma Analyser Log" :width="800">
     <a-spin :spinning="isLoading">
-      <a-textarea class="bg-log-viewer" v-model="content"></a-textarea>
+      <a-textarea :rows="20" v-model="content"></a-textarea>
     </a-spin>
     <div slot="custom-footer">
       <a-button type="primary" @click="handleClick">Save As</a-button>
@@ -26,7 +26,7 @@ export default {
       try {
         this.isLoading = true
         const { dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData
-        const { success, result, message } = await getAction('/spectrumAnalysis/viewBGLogViewer', {
+        const result = await getAction('/spectrumAnalysis/viewBGLogViewer', {
           dbName,
           sampleId,
           sampleFileName,
@@ -34,12 +34,7 @@ export default {
           detFileName,
           qcFileName,
         })
-        if (success) {
+        this.content = result
-          console.log('%c [  ]-21', 'font-size:13px; background:pink; color:#bf2c9f;', result)
-          this.content = 'test'
-        } else {
-          this.$message.error(message)
-        }
       } catch (error) {
         console.error(error)
       } finally {
@@ -60,8 +55,4 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.bg-log-viewer {
-  height: 400px;
-  overflow: auto;
-}
 </style>

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

@@ -110,15 +110,15 @@ export default {
 
           this.list.push({
             qcFlags: 'Gas Bg',
-            evaluationMetrics: result.gasBgValueAndStatus,
+            evaluationMetrics: result.gasBgEvaluationMetrics,
-            value: result.gasBgValueAndStatus ? 'Match' : 'UnMatch',
+            value: result.gasBgValue,
             status: result.gasBgValueAndStatus ? 'Pass' : 'Failed',
           })
 
           this.list.push({
             qcFlags: 'Det Bg',
-            evaluationMetrics: result.detBgValueAndStatus,
+            evaluationMetrics: result.detBgEvaluationMetrics,
-            value: result.detBgValueAndStatus ? 'Match' : 'UnMatch',
+            value: result.detBgValue,
             status: result.detBgValueAndStatus ? 'Pass' : 'Failed',
           })
 

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

@@ -421,6 +421,7 @@ export default {
           m_vCurReso: this.list.map((item) => item.fwhm),
           m_vCurUncert: this.uncert,
           m_curParam: this.param,
+          width: 922,
         })
         if (success) {
           this.handleResult(result)

src/views/spectrumAnalysis/components/PeakInfomation.vue

@@ -86,6 +86,7 @@ const columns = [
   {
     title: 'Indentify',
     dataIndex: 'indentify',
+    ellipsis: true,
   },
 ]
 export default {