Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
This commit is contained in:
commit
086a049238
|
@ -99,6 +99,7 @@
|
|||
:columns="columnsEnergy_G"
|
||||
:list="dataSourceEnergy_G"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
<template v-if="allData.benergyBlock===null?false:true">
|
||||
|
@ -109,6 +110,7 @@
|
|||
:columns="columnsEnergy_B"
|
||||
:list="dataSourceEnergy_B"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</template>
|
||||
|
@ -121,6 +123,7 @@
|
|||
:columns="columnsResulution_G"
|
||||
:list="dataSourceResulution_G"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
<template v-if="allData.bresolutionBlock===null?false:true">
|
||||
|
@ -131,6 +134,7 @@
|
|||
:columns="columnsResulution_B"
|
||||
:list="dataSourceResulution_B"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</template>
|
||||
|
@ -143,6 +147,7 @@
|
|||
:columns="columnsEfficiency_G"
|
||||
:list="dataSourceEfficiency_G"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
<template v-if="allData.bgEfficiencyBlock===null?false:true">
|
||||
|
@ -153,6 +158,7 @@
|
|||
:columns="columnsEfficiency_BG"
|
||||
:list="dataSourceEfficiency_BG"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</template>
|
||||
|
@ -165,6 +171,7 @@
|
|||
:columns="columnsRoiLimits"
|
||||
:list="dataSourceRoiLimits"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</a-tab-pane>
|
||||
|
@ -176,6 +183,7 @@
|
|||
:columns="columnsRatios"
|
||||
:list="dataSourceRatios"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</a-tab-pane>
|
||||
|
@ -211,10 +219,10 @@
|
|||
<div class="pane-title" style="margin-bottom: 15px;">HISTOGRAM</div>
|
||||
<div class="gamma-spectrum-row">
|
||||
<div>
|
||||
<span class="span-key">Number of B Channels:</span><span class="row-val">{{ allData.bspectrumBlock.numberBChannels }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">B Energy Span:</span><span class="row-val">{{ allData.bspectrumBlock.energySpan }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">Number of G Channels:</span><span class="row-val">{{ allData.bspectrumBlock.energySpan }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">G Energy Span:</span><span class="row-val">{{ allData.bspectrumBlock.energySpan }}</span>
|
||||
<span class="span-key">Number of B Channels:</span><span class="row-val">{{ allData.histogramBlock.bchannels }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">B Energy Span:</span><span class="row-val">{{ allData.histogramBlock.benergySpan }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">Number of G Channels:</span><span class="row-val">{{ allData.histogramBlock.gchannels }}</span>
|
||||
<span class="span-key" style="margin-left: 35px;">G Energy Span:</span><span class="row-val">{{ allData.histogramBlock.genergySpan }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="gamma-spectrum-chart" id="histogramChartRef"></div>
|
||||
|
@ -232,6 +240,7 @@
|
|||
:columns="columnsCertificate"
|
||||
:list="dataSourceCertificate"
|
||||
:pagination="false"
|
||||
:canSelect="false"
|
||||
>
|
||||
</custom-table>
|
||||
</a-tab-pane>
|
||||
|
@ -508,7 +517,6 @@ export default {
|
|||
level_5:[],
|
||||
level_6:[]
|
||||
},
|
||||
// dataSourceHistogray: [],
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
|
@ -614,19 +622,18 @@ export default {
|
|||
}
|
||||
},
|
||||
xAxis: {
|
||||
// type:"value",
|
||||
scale: false,
|
||||
splitLine: {
|
||||
show: true,
|
||||
lineStyle: {
|
||||
color: "rgbA(64, 105, 121, 0.2)"
|
||||
},
|
||||
},
|
||||
axisTick: {
|
||||
show: false,
|
||||
alignWithLabel: true,
|
||||
interval: 5
|
||||
},
|
||||
boundaryGap: false,
|
||||
data: str==="G"?this.dataSourceSpectrumX_G:this.dataSourceSpectrumX_B
|
||||
boundaryGap:false,
|
||||
interval: 25,
|
||||
max:str==="G"?this.allData.gspectrumBlock.numberGChannels:this.allData.bspectrumBlock.numberBChannels,
|
||||
data: str === "G" ? this.dataSourceSpectrumX_G : this.dataSourceSpectrumX_B
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
|
@ -641,12 +648,13 @@ export default {
|
|||
lineStyle: {
|
||||
color: "rgbA(64, 105, 121, 0.2)"
|
||||
}
|
||||
}
|
||||
},
|
||||
scale: false
|
||||
},
|
||||
dataZoom: [
|
||||
{
|
||||
start: 0,
|
||||
end: 20
|
||||
end: 255
|
||||
}
|
||||
],
|
||||
series: [
|
||||
|
@ -704,6 +712,8 @@ export default {
|
|||
color: "rgbA(64, 105, 121, 0.2)"
|
||||
},
|
||||
},
|
||||
interval:65,
|
||||
max:260
|
||||
},
|
||||
yAxis: {
|
||||
scale: false,
|
||||
|
@ -713,6 +723,8 @@ export default {
|
|||
color: "rgbA(64, 105, 121, 0.2)"
|
||||
},
|
||||
},
|
||||
interval:65,
|
||||
max:260
|
||||
},
|
||||
tooltip: {
|
||||
trigger: "item",
|
||||
|
|
Loading…
Reference in New Issue
Block a user