src/utils/file.js

@@ -58,7 +58,6 @@ export const readFile = (file, fileType = 'text') => {
       resolve(event.target.result)
     }
     fileReader.onerror = error => {
-      message.error('无法读取文件，请确认文件是否被修改')
       reject(error)
     }
   })

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

@@ -715,12 +715,10 @@ export default {
           this.$message.warn('File is Empty ')
           return
         }
-
-        try {
         const zipedFiles = await zipFile(files, 'test.zip')
         console.log('zipedFileszipedFiles', zipedFiles)
         this.isUploadingZip = true
-
+        try {
           const { success, message } = await this.uploadZipFile(zipedFiles)
           if (success) {
             let result = []

src/views/statistics/detail.vue

@@ -143,14 +143,7 @@
           </custom-table>
         </template>
       </a-tab-pane>
-      <a-tab-pane
-        key="efficiency"
-        tab="EFFICIENCY"
-        v-if="allData.gefficiencyBlock || allData.bgEfficiencyBlock || allData.befficiencyBlock"
-        forceRender
-      >
-        <!-- Geff开始 -->
-        <template v-if="allData.gefficiencyBlock">
+      <a-tab-pane key="efficiency" tab="EFFICIENCY" v-if="allData.gefficiencyBlock === null ? false : true" forceRender>
         <div class="pane-title" style="margin-bottom: 15px">GAMMA EFFICIENCY</div>
         <custom-table
           size="middle"
@@ -161,10 +154,7 @@
           :canSelect="false"
         >
         </custom-table>
-        </template>
-        <!-- Geff结束 -->
-        <!-- BG开始 -->
-        <template v-if="allData.bgEfficiencyBlock">
+        <template v-if="allData.bgEfficiencyBlock === null ? false : true">
           <div class="pane-title" style="margin: 15px 0">BETA-GAMMA EFFICIENCY</div>
           <custom-table
             size="middle"
@@ -176,21 +166,6 @@
           >
           </custom-table>
         </template>
-        <!-- BG结束 -->
-        <!-- Beff开始 -->
-        <template v-if="allData.befficiencyBlock">
-          <div class="pane-title" style="margin: 15px 0">BETA EFFICIENCY</div>
-          <custom-table
-            size="middle"
-            :rowKey="getUid()"
-            :columns="columnsEfficiency_BG"
-            :list="dataSourceEfficiency_BE"
-            :pagination="false"
-            :canSelect="false"
-          >
-          </custom-table>
-        </template>
-        <!-- Beff结束 -->
       </a-tab-pane>
       <a-tab-pane key="roi" tab="ROI" v-if="allData.roiLimitsBlock === null ? false : true" forceRender>
         <div class="pane-title" style="margin-bottom: 15px">ROI LIMITS</div>
@@ -248,7 +223,7 @@
         </div>
         <div class="gamma-spectrum-chart" id="spectrumChartRef_B"></div>
       </a-tab-pane>
-      <a-tab-pane key="histogram" tab="HISTOGRAM" v-if="allData.histogramBlock === null ? false : true">
+      <a-tab-pane key="histogram" tab="HISTOGRAM" v-if="allData.bspectrumBlock === null ? false : true">
         <div class="pane-title" style="margin-bottom: 15px">HISTOGRAM</div>
         <div class="gamma-spectrum-row">
           <div>
@@ -459,7 +434,6 @@ export default {
       ],
       dataSourceEfficiency_G: [],
       dataSourceEfficiency_BG: [],
-      dataSourceEfficiency_BE: [],
       columnsRoiLimits: [
         {
           title: 'ROI number',
@@ -593,7 +567,6 @@ export default {
     this.dataSourceResulution_B = this.allData.bresolutionBlock
     this.dataSourceEfficiency_G = this.allData.gefficiencyBlock
     this.dataSourceEfficiency_BG = this.allData.bgEfficiencyBlock
-    this.dataSourceEfficiency_BE = this.allData.befficiencyBlock
     this.dataSourceRoiLimits = this.allData.roiLimitsBlock
     this.dataSourceRatios = this.allData.ratiosBlock
     this.dataSourceSpectrum_G = this.allData.gspectrumBlock && this.allData.gspectrumBlock.gspectrumSubBlock
@@ -609,7 +582,6 @@ export default {
         return index
       })
     this.allData.histogramBlock &&
-      this.allData.histogramBlock.histogramSubBlock &&
       this.allData.histogramBlock.histogramSubBlock.forEach((item) => {
         if (item.c === 1) {
           this.dataSourceHistogray.level_1.push(item)
@@ -839,22 +811,20 @@ export default {
       }
     },
     drawSpectrumChart_G() {
-      if (this.spectrumChart_G) return
-
       this.spectrumChart_G = echarts.init(document.getElementById('spectrumChartRef_G'))
       this.spectrumChart_G.setOption(this.getOptions('G'))
-      window.addEventListener('resize', this.handleSpectrumGChartResize)
+      window.addEventListener('resize', function () {
+        this, spectrumChart_G.resize()
+      })
     },
     drawSpectrumChart_B() {
-      if (this.spectrumChart_B) return
-
       this.spectrumChart_B = echarts.init(document.getElementById('spectrumChartRef_B'))
       this.spectrumChart_B.setOption(this.getOptions('B'))
-      window.addEventListener('resize', this.handleSpectrumBChartResize)
+      window.addEventListener('resize', function () {
+        this.spectrumChart_B.resize()
+      })
     },
     drawHistogramChart() {
-      if (this.histogramChart) return
-
       let dataset = [],
         series = []
       for (const key in this.dataSourceHistogray) {
@@ -876,9 +846,6 @@ export default {
           },
         }
       })
-
-      const { bchannels, gchannels } = this.allData.histogramBlock || {}
-
       this.histogramChart = echarts.init(document.getElementById('histogramChartRef'))
       this.histogramChart.setOption({
         dataset,
@@ -891,7 +858,7 @@ export default {
             },
           },
           interval: 65,
-          max: bchannels,
+          max: 260,
         },
         yAxis: {
           scale: false,
@@ -901,8 +868,8 @@ export default {
               color: 'rgbA(64, 105, 121, 0.2)',
             },
           },
-          interval: gchannels / 4,
-          max: gchannels,
+          interval: 65,
+          max: 260,
         },
         tooltip: {
           trigger: 'item',
@@ -920,24 +887,11 @@ export default {
         },
         series,
       })
-      window.addEventListener('resize', this.handleHistogramChartResize)
-    },
-
-    handleSpectrumGChartResize() {
-      this.spectrumChart_G.resize()
-    },
-    handleSpectrumBChartResize() {
-      this.spectrumChart_B.resize()
-    },
-    handleHistogramChartResize() {
+      window.addEventListener('resize', function () {
         this.histogramChart.resize()
+      })
     },
   },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.handleSpectrumGChartResize)
-    window.removeEventListener('resize', this.handleSpectrumBChartResize)
-    window.removeEventListener('resize', this.handleHistogramChartResize)
-  },
 }
 </script>
 
@@ -1067,6 +1021,7 @@ export default {
     padding: 15px 20px !important;
   }
   .ant-row {
+    height: 36px;
     line-height: 36px;
   }
   .ant-tabs-tab-prev,