From a8f1e88d917f6a61207c429dbdc6e19e59766864 Mon Sep 17 00:00:00 2001 From: renpy Date: Thu, 6 Jul 2023 11:15:19 +0800 Subject: [PATCH] =?UTF-8?q?node=20gas=20hpge=20=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/detail.vue | 28 +++--- .../radionuclide/nobleGas/hpge/calibphd.vue | 98 +++++++++++++++++++ .../radionuclide/nobleGas/hpge/detbkphd.vue | 93 ++++++++++++++++++ .../radionuclide/nobleGas/hpge/qcphd.vue | 93 ++++++++++++++++++ .../radionuclide/nobleGas/hpge/sphdf.vue | 94 ++++++++++++++++++ .../radionuclide/nobleGas/hpge/sphdp.vue | 94 ++++++++++++++++++ .../radionuclide/particulate/blankphd.vue | 2 +- src/views/statistics/list.vue | 9 +- 8 files changed, 497 insertions(+), 14 deletions(-) create mode 100644 src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue create mode 100644 src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue create mode 100644 src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue create mode 100644 src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue create mode 100644 src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue diff --git a/src/views/statistics/detail.vue b/src/views/statistics/detail.vue index 5485aa7..7649c26 100644 --- a/src/views/statistics/detail.vue +++ b/src/views/statistics/detail.vue @@ -91,33 +91,33 @@ - +
G ENERGY
- +
G RESOLUTION
- +
GAMMA EFFICIENCY
- +
CERTIFICATE
Total Source Activity [ Bq ]:{{ allData.certificateBlock.totalSourceActivity }} @@ -147,7 +147,7 @@
import * as echarts from 'echarts' -// import allData from "./data.json" export default { props: { allData: { @@ -302,6 +301,9 @@ export default { this.dataSourceCertificate = this.allData.certificateBlock?this.allData.certificateBlock.certificateSubBlock:[] }, methods: { + getUid() { + return (Math.random()+new Date().getTime()).toString(32).slice(0,8) + }, yLogChange(e) { this.yAxisType = e.target.checked?"log":"value" this.spectrumChart.setOption({ @@ -341,10 +343,13 @@ export default { this.spectrumChart.setOption({ tooltip: { trigger: 'axis', - formatter: '{a}
{b} : {c}' + formatter: function (params) { + return `
${params[0].axisValueLabel}
+
value:${params[0].value}
+ ` + } }, xAxis: { - // type: 'time', splitLine: { show: true, lineStyle: { @@ -367,7 +372,6 @@ export default { }, yAxis: { type: this.yAxisType, - // type: 'log', splitLine: { show: true, lineStyle: { diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue new file mode 100644 index 0000000..20de007 --- /dev/null +++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/calibphd.vue @@ -0,0 +1,98 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue new file mode 100644 index 0000000..b6de042 --- /dev/null +++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/detbkphd.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue new file mode 100644 index 0000000..e36176e --- /dev/null +++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/qcphd.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue new file mode 100644 index 0000000..ad817fc --- /dev/null +++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdf.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue new file mode 100644 index 0000000..6022bca --- /dev/null +++ b/src/views/statistics/imsData/radionuclide/nobleGas/hpge/sphdp.vue @@ -0,0 +1,94 @@ + + + + + \ No newline at end of file diff --git a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue index 314f982..d061a73 100644 --- a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue +++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue @@ -156,7 +156,7 @@ export default { }) }, handleDetail(record) { - getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => { + getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => { if (res.success) { this.detailJson = res.result this.detailJson = JSON.parse(JSON.stringify(this.detailJson)) diff --git a/src/views/statistics/list.vue b/src/views/statistics/list.vue index fbb8a61..0bc60bd 100644 --- a/src/views/statistics/list.vue +++ b/src/views/statistics/list.vue @@ -85,6 +85,12 @@ export default { console.log("查询数据", this.queryParam); console.log(this.dataType); this.isImmediate = false + // this.queryParam = { + // dataType: "S", + // startTime: "2023-05-01", + // endTime: "2023-05-07", + // stationIds: [209, 211, 213] + // } let params = { ...this.queryParam, pageNo: 1, @@ -101,7 +107,8 @@ export default { }, handleDetail(record) { // 测试接口数据 record.sampleId - getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => { + getAction("webStatistics/findGeneratedReport", { sampleId: record.sampleId }).then(res => { + // getAction("webStatistics/findGeneratedReport", { sampleId: "1523651" }).then(res => { if (res.success){ this.detailJson = res.result this.detailJson = JSON.parse(JSON.stringify(this.detailJson))