fix: 优化页面样式和/或逻辑

This commit is contained in:
Xu Zhimeng 2023-08-09 19:22:07 +08:00
parent d7f9f9f396
commit 7a6d13b471
7 changed files with 23 additions and 54 deletions

View File

@ -51,7 +51,6 @@ export default {
const res = await getAction('/spectrumAnalysis/viewComment', { const res = await getAction('/spectrumAnalysis/viewComment', {
sampleId: this.sampleId sampleId: this.sampleId
}) })
console.log('%c [ res ]-44', 'font-size:13px; background:pink; color:#bf2c9f;', res)
if (res.success) { if (res.success) {
this.comments = res.result this.comments = res.result
} else { } else {

View File

@ -945,7 +945,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
p { p {
margin-bottom: 5px; margin-bottom: 2px;
} }
.content { .content {

View File

@ -736,7 +736,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
p { p {
margin-bottom: 5px; margin-bottom: 2px;
} }
.content { .content {

View File

@ -56,20 +56,8 @@ export default {
data() { data() {
this.columns = columns this.columns = columns
return { return {
list: [ list: [],
{ isLoading: false
qcFlags: 'qcFlags',
evaluationMetrics: 'evaluationMetrics',
value: 'value',
status: 0
},
{
qcFlags: 'qcFlags',
evaluationMetrics: 'evaluationMetrics',
value: 'value',
status: 1
}
]
} }
}, },
methods: { methods: {

View File

@ -10,30 +10,7 @@
export default { export default {
data() { data() {
return { return {
content: `-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 -------------------------- content: '',
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
-------------------------- SampleAnalyse Beginning at 2023-07-10 11:44:56 --------------------------
`,
isLoading: true isLoading: true
} }
} }

View File

@ -172,9 +172,6 @@ const initialOption = {
borderWidth: 1, borderWidth: 1,
itemWidth: 50 itemWidth: 50
}, },
tooltip: {
trigger: 'axis'
},
xAxis: { xAxis: {
type: 'category', type: 'category',
axisLine: { axisLine: {
@ -189,7 +186,8 @@ const initialOption = {
margin: 10, margin: 10,
formatter: value => { formatter: value => {
return moment(value).format('YYYY/MM/DD') return moment(value).format('YYYY/MM/DD')
} },
interval: 4
}, },
splitLine: { splitLine: {
show: true, show: true,
@ -230,6 +228,7 @@ const initialFilterOption = {
dbName: 'RNAUTO', dbName: 'RNAUTO',
detectorName: '', detectorName: '',
stationId: '', stationId: '',
stationName: '',
statisticsType: 'Nuclides', statisticsType: 'Nuclides',
mdc: false, mdc: false,
activity: false, activity: false,
@ -294,6 +293,7 @@ export default {
this.setStationAndDetector(result) this.setStationAndDetector(result)
} else { } else {
this.detectorList = [] this.detectorList = []
this.queryParams.detectorName = undefined
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)

View File

@ -48,7 +48,6 @@
<a-button type="primary" @click="handleSnapshot($refs.chartRef)">Snapshot</a-button> <a-button type="primary" @click="handleSnapshot($refs.chartRef)">Snapshot</a-button>
</div> </div>
<!-- 左侧中间俩按钮结束 --> <!-- 左侧中间俩按钮结束 -->
<a-divider></a-divider>
</title-over-border> </title-over-border>
<!-- 右侧图表 --> <!-- 右侧图表 -->
<div class="statistics-paramer-history-chart"> <div class="statistics-paramer-history-chart">
@ -75,9 +74,6 @@ const initialOption = {
top: 20, top: 20,
bottom: 60 bottom: 60
}, },
tooltip: {
trigger: 'axis'
},
xAxis: { xAxis: {
type: 'category', type: 'category',
axisLine: { axisLine: {
@ -92,7 +88,8 @@ const initialOption = {
margin: 10, margin: 10,
formatter: value => { formatter: value => {
return moment(value).format('YYYY/MM/DD') return moment(value).format('YYYY/MM/DD')
} },
interval: 0
}, },
splitLine: { splitLine: {
show: true, show: true,
@ -103,7 +100,9 @@ const initialOption = {
axisTick: { axisTick: {
show: false show: false
}, },
data: [] data: new Array(5).fill(0).map((_, index) => {
return moment().add(-8 * index, 'hour').format('YYYY-MM-DD HH:mm:ss')
}).reverse()
}, },
yAxis: { yAxis: {
axisLine: { axisLine: {
@ -125,7 +124,7 @@ const initialOption = {
show: false show: false
}, },
min: 0, min: 0,
max: 0 max: 100
}, },
series: [] series: []
} }
@ -134,6 +133,7 @@ const initialOption = {
const initialFilterOption = { const initialFilterOption = {
detectorName: '', detectorName: '',
stationId: '', stationId: '',
stationName: '',
statisticsType: '', statisticsType: '',
startTime: null, startTime: null,
endTime: null endTime: null
@ -189,6 +189,7 @@ export default {
this.setStationAndDetector(result) this.setStationAndDetector(result)
} else { } else {
this.detectorList = [] this.detectorList = []
this.queryParams.detectorName = undefined
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
@ -224,9 +225,12 @@ export default {
const data = result.m_Values const data = result.m_Values
this.option.xAxis.data = result.m_Keys this.option.xAxis.data = result.m_Keys
const max = Math.max(...data)
const min = Math.min(...data)
this.option.yAxis.max = (Math.max(...data) * 1.1).toFixed(2) this.option.yAxis.max = (max > 0 ? max * 1.1 : max / 1.1).toFixed(2)
this.option.yAxis.min = (Math.min(...data) / 1.1).toFixed(2) this.option.yAxis.min = (min > 0 ? min / 1.1 : min * 1.1).toFixed(2)
this.option.xAxis.axisLabel.interval = Math.ceil(result.m_Keys.length / 5)
this.option.series = { this.option.series = {
type: 'line', type: 'line',
@ -284,6 +288,7 @@ export default {
.time-setting { .time-setting {
padding-left: 40px; padding-left: 40px;
margin-top: 15px;
} }
.center-btns { .center-btns {