fix:分析结果监控 - history 对接分页接口，详情页面接口
This commit is contained in:
orgin
parent
a85ddf23d1
commit
51be141a39
|
|
@ -10,9 +10,9 @@
|
||||||
:list="dataSource"
|
:list="dataSource"
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:selectRowClick="rowClick"
|
@selectRowClick="rowClick"
|
||||||
>
|
>
|
||||||
<template slot="station" slot-scope="{ text }">
|
<template slot="stationList" slot-scope="{ text }">
|
||||||
<a-tooltip placement="topLeft">
|
<a-tooltip placement="topLeft">
|
||||||
<template slot="title">
|
<template slot="title">
|
||||||
{{ text.join("、") }}
|
{{ text.join("、") }}
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
{{ text.join("、") }}
|
{{ text.join("、") }}
|
||||||
</a-tooltip>
|
</a-tooltip>
|
||||||
</template>
|
</template>
|
||||||
<template slot="dataSource" slot-scope="{ text }">
|
<template slot="sourceList" slot-scope="{ text }">
|
||||||
<a-tooltip placement="topLeft">
|
<a-tooltip placement="topLeft">
|
||||||
<template slot="title">
|
<template slot="title">
|
||||||
{{ text.join("、") }}
|
{{ text.join("、") }}
|
||||||
|
|
@ -35,6 +35,7 @@
|
||||||
:columns="columns_info"
|
:columns="columns_info"
|
||||||
:dataSource="record.nuclideList"
|
:dataSource="record.nuclideList"
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
|
rowKey="nuclide"
|
||||||
></a-table>
|
></a-table>
|
||||||
</template>
|
</template>
|
||||||
{{ text }}
|
{{ text }}
|
||||||
|
|
@ -70,65 +71,65 @@
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Site Code:</a-col>
|
<a-col :span="12" class="info-key">Site Code:</a-col>
|
||||||
<a-col :span="12" class="info-val">ARPO1</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.siteCode }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="11">
|
<a-col :span="11">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="14" class="info-key">Sample Geometry:</a-col>
|
<a-col :span="14" class="info-key">Sample Geometry:</a-col>
|
||||||
<a-col :span="10" class="info-val">DISK 50X5_3M</a-col>
|
<a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.sampleGeometry }}</a-col>
|
||||||
</a-row></a-col>
|
</a-row></a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Detector Code:</a-col>
|
<a-col :span="12" class="info-key">Detector Code:</a-col>
|
||||||
<a-col :span="12" class="info-val">ARPO1 001</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.detectorCode }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="11">
|
<a-col :span="11">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="14" class="info-key">Spectrum Qualifier:</a-col>
|
<a-col :span="14" class="info-key">Spectrum Qualifier:</a-col>
|
||||||
<a-col :span="10" class="info-val">FULL</a-col>
|
<a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.spectrumQualifier }}</a-col>
|
||||||
</a-row></a-col>
|
</a-row></a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">System Type:</a-col>
|
<a-col :span="12" class="info-key">System Type:</a-col>
|
||||||
<a-col :span="12" class="info-val">P</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.systemType }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="11">
|
<a-col :span="11">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="14" class="info-key">Sample Reference Identification:</a-col>
|
<a-col :span="14" class="info-key">Sample Reference Identification:</a-col>
|
||||||
<a-col :span="10" class="info-val">01888888880003</a-col>
|
<a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.sampleReferenceIdentification }}</a-col>
|
||||||
</a-row></a-col>
|
</a-row></a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Measurement Identification:</a-col>
|
<a-col :span="12" class="info-key">Measurement Identification:</a-col>
|
||||||
<a-col :span="12" class="info-val">ARP01_001-2023 / 03 / 21-14 : 10 : 55.0</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.measurementIdentification }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="11">
|
<a-col :span="11">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="14" class="info-key">Gas Background Measurement Identification:</a-col>
|
<a-col :span="14" class="info-key">Gas Background Measurement Identification:</a-col>
|
||||||
<a-col :span="10" class="info-val">asdfasdf</a-col>
|
<a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.gasBackgroundMeasurementId }}</a-col>
|
||||||
</a-row></a-col>
|
</a-row></a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Detector Background Measurement Identification:</a-col>
|
<a-col :span="12" class="info-key">Detector Background Measurement Identification:</a-col>
|
||||||
<a-col :span="12" class="info-val">ARP01_001-2019 / 01 / 11-19 : 09 : 42.02</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.headerBlock.detectorBackgroundMeasurementId }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :span="11">
|
<a-col :span="11">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="14" class="info-key">Transmit Time:</a-col>
|
<a-col :span="14" class="info-key">Transmit Time:</a-col>
|
||||||
<a-col :span="10" class="info-val">2023 / 03 / 21 14:30:01</a-col>
|
<a-col :span="10" class="info-val">{{ sampleInfo.headerBlock.transmitDate }}</a-col>
|
||||||
</a-row></a-col>
|
</a-row></a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -138,7 +139,7 @@
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Acquisition Time:</a-col>
|
<a-col :span="12" class="info-key">Acquisition Time:</a-col>
|
||||||
<a-col :span="12" class="info-val">2023 / 03 / 21 14:10:55</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionLiveTime }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|
@ -146,7 +147,7 @@
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Acquisition Real Time:</a-col>
|
<a-col :span="12" class="info-key">Acquisition Real Time:</a-col>
|
||||||
<a-col :span="12" class="info-val">938</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionRealTime }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
|
|
@ -154,28 +155,18 @@
|
||||||
<a-col :span="13">
|
<a-col :span="13">
|
||||||
<a-row>
|
<a-row>
|
||||||
<a-col :span="12" class="info-key">Acquisition Live Time:</a-col>
|
<a-col :span="12" class="info-key">Acquisition Live Time:</a-col>
|
||||||
<a-col :span="12" class="info-val">900</a-col>
|
<a-col :span="12" class="info-val">{{ sampleInfo.acquisitionBlock.acquisitionStartDate }}</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</div>
|
</div>
|
||||||
<a-table
|
<a-table
|
||||||
size="middle"
|
size="middle"
|
||||||
rowKey="id"
|
:columns="columns_info"
|
||||||
:columns="columns_acq"
|
:dataSource="dataSourceDetailNuclide"
|
||||||
:list="dataSource_acq"
|
|
||||||
>
|
|
||||||
</a-table>
|
|
||||||
<!-- <TableList
|
|
||||||
size="middle"
|
|
||||||
rowKey="id"
|
|
||||||
:columns="columns_acq"
|
|
||||||
:list="dataSource_acq"
|
|
||||||
:loading="false"
|
|
||||||
:pagination="false"
|
:pagination="false"
|
||||||
:canSelect="false"
|
rowKey="nuclide"
|
||||||
>
|
></a-table>
|
||||||
</TableList> -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -189,16 +180,16 @@ import { getAction, postAction, httpAction, deleteAction } from '@/api/manage'
|
||||||
const columns = [{
|
const columns = [{
|
||||||
title: 'STATION',
|
title: 'STATION',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'station',
|
dataIndex: 'stationList',
|
||||||
width: 160,
|
width: 160,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: {
|
scopedSlots: {
|
||||||
customRender: 'station',
|
customRender: 'stationList',
|
||||||
}
|
}
|
||||||
},{
|
},{
|
||||||
title: 'COLLECTION START',
|
title: 'COLLECTION START',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'collectionStartTime',
|
dataIndex: 'collectionDate',
|
||||||
width: 200,
|
width: 200,
|
||||||
},{
|
},{
|
||||||
title: 'ALARM TIME',
|
title: 'ALARM TIME',
|
||||||
|
|
@ -208,11 +199,11 @@ const columns = [{
|
||||||
},{
|
},{
|
||||||
title: 'DATA SOURCES ',
|
title: 'DATA SOURCES ',
|
||||||
align: 'center',
|
align: 'center',
|
||||||
dataIndex: 'dataSource',
|
dataIndex: 'sourceList',
|
||||||
width: 180,
|
width: 180,
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
scopedSlots: {
|
scopedSlots: {
|
||||||
customRender: 'dataSource',
|
customRender: 'sourceList',
|
||||||
}
|
}
|
||||||
},{
|
},{
|
||||||
title: 'ALARM INFO',
|
title: 'ALARM INFO',
|
||||||
|
|
@ -234,41 +225,47 @@ const columns_info = [{
|
||||||
},{
|
},{
|
||||||
title: 'ARMDARR',
|
title: 'ARMDARR',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'ARMDARR'
|
dataIndex: 'ARMDARR',
|
||||||
|
customRender: (val) => {
|
||||||
|
if(!val){
|
||||||
|
return "--"
|
||||||
|
} else{
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
},{
|
},{
|
||||||
title: 'ARMDRRR',
|
title: 'ARMDRRR',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'ARMDRRR'
|
dataIndex: 'ARMDRRR',
|
||||||
|
customRender: (val) => {
|
||||||
|
if(!val){
|
||||||
|
return "--"
|
||||||
|
} else{
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
},{
|
},{
|
||||||
title: 'IDCARR',
|
title: 'IDCARR',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'IDCARR'
|
dataIndex: 'IDCARR',
|
||||||
|
customRender: (val) => {
|
||||||
|
if(!val){
|
||||||
|
return "--"
|
||||||
|
} else{
|
||||||
|
return val
|
||||||
|
}
|
||||||
|
}
|
||||||
},{
|
},{
|
||||||
title: 'IDCRRR',
|
title: 'IDCRRR',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
dataIndex: 'IDCRRR'
|
dataIndex: 'IDCRRR',
|
||||||
}
|
customRender: (val) => {
|
||||||
]
|
if(!val){
|
||||||
const columns_acq = [{
|
return "--"
|
||||||
title: 'NUCLIDE',
|
} else{
|
||||||
align: 'center',
|
return val
|
||||||
dataIndex: 'nuclide',
|
}
|
||||||
width:"25%"
|
}
|
||||||
},{
|
|
||||||
title: 'THRESHOLD ',
|
|
||||||
align: 'center',
|
|
||||||
dataIndex: 'threshold',
|
|
||||||
width:"25%"
|
|
||||||
},{
|
|
||||||
title: 'IDC',
|
|
||||||
align: 'center',
|
|
||||||
dataIndex: 'idc',
|
|
||||||
width:"25%"
|
|
||||||
},{
|
|
||||||
title: 'ARMD',
|
|
||||||
align: 'center',
|
|
||||||
dataIndex: 'armd',
|
|
||||||
width:"25%"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
export default {
|
export default {
|
||||||
|
|
@ -282,32 +279,7 @@ export default {
|
||||||
paramsArg: {},
|
paramsArg: {},
|
||||||
columns,
|
columns,
|
||||||
columns_info,
|
columns_info,
|
||||||
dataSource: [
|
dataSource: [],
|
||||||
{
|
|
||||||
name: "ARP01、ARP02测试报警规则名称",
|
|
||||||
station: [ "ARP01", "ARP02","ARP01","ARP01","ARP01","ARP01","ARP01","ARP01" ],
|
|
||||||
collectionStartTime: "2023-07-25 16:27:03",
|
|
||||||
alarmStartDate: "2023-07-25 16:27:03",
|
|
||||||
alarmInfo: "Ce141核素首次出现；Ce141、Cs134、Cs137核素浓度高于历史平均值",
|
|
||||||
nuclideList: [
|
|
||||||
{ nuclide: "Cs132", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: null, IDCARR: null, IDCRRR: null },
|
|
||||||
{ nuclide: "Cs132", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: null, IDCARR: 2.2, IDCRRR: null }
|
|
||||||
],
|
|
||||||
dataSource: [ "ARMDARR", "IDCARR","ARMDARR","ARMDARR" ]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "UPS02测试报警规则名称",
|
|
||||||
station: [ "UPS02" ],
|
|
||||||
collectionStartTime: "2023-07-25 16:37:03",
|
|
||||||
alarmStartDate: "2023-07-25 16:27:03",
|
|
||||||
alarmInfo: "Pb210、Pb212核素浓度高于历史平均值",
|
|
||||||
nuclideList: [
|
|
||||||
{ nuclide: "Pb210", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: 3.21393, IDCARR: -0.34512, IDCRRR: null },
|
|
||||||
{ nuclide: "Pb212", threshold: 1.3, ARMDARR: 2.2, ARMDRRR: -3.2323, IDCARR: 2.2, IDCRRR: null }
|
|
||||||
],
|
|
||||||
dataSource: [ "ARMDARR", "ARMDRRR" ]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
loading: false,
|
loading: false,
|
||||||
ipagination:{
|
ipagination:{
|
||||||
current: 1,
|
current: 1,
|
||||||
|
|
@ -321,13 +293,19 @@ export default {
|
||||||
showSizeChanger: true,
|
showSizeChanger: true,
|
||||||
total: 0
|
total: 0
|
||||||
},
|
},
|
||||||
isDetail: true,
|
isDetail: false,
|
||||||
columns_acq,
|
dataSourceDetailNuclide:[],
|
||||||
dataSource_acq:[]
|
url: {
|
||||||
|
list: "/alarmAnalysisLog/findPage",
|
||||||
|
sampleInfo: "/webStatistics/sampleInfo"
|
||||||
|
},
|
||||||
|
selectRow: {},
|
||||||
|
sampleInfo: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
this.getStationList();
|
this.getStationList();
|
||||||
|
this.getPageData();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getStationList() {
|
getStationList() {
|
||||||
|
|
@ -348,28 +326,58 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
getPageData() {
|
||||||
|
this.loading = true;
|
||||||
|
let param = {
|
||||||
|
source: this.paramsArg.sources,
|
||||||
|
stations: this.paramsArg.stations,
|
||||||
|
nuclides: this.paramsArg.nuclides,
|
||||||
|
startDate: this.paramsArg.startDate,
|
||||||
|
endDate: this.paramsArg.endDate,
|
||||||
|
pageNo: this.ipagination.current,
|
||||||
|
pageSize: this.ipagination.pageSize
|
||||||
|
}
|
||||||
|
getAction(this.url.list, param).then(res => {
|
||||||
|
this.loading = false;
|
||||||
|
if (res.success) {
|
||||||
|
this.dataSource = res.result.records
|
||||||
|
this.ipagination.total = res.result.total
|
||||||
|
} else {
|
||||||
|
this.$message.warning("This operation fails. Contact your system administrator")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
async getSampleInfo() {
|
||||||
|
await getAction(this.url.sampleInfo, { sampleId: this.selectRow.sampleId}).then(res=> {
|
||||||
|
this.sampleInfo = res.result;
|
||||||
|
this.loading = false;
|
||||||
|
})
|
||||||
|
},
|
||||||
handleSearch({ startDate, endDate, stations, sources }) {
|
handleSearch({ startDate, endDate, stations, sources }) {
|
||||||
console.log(startDate, endDate, stations, sources);
|
|
||||||
this.paramsArg = {
|
this.paramsArg = {
|
||||||
startDate,
|
startDate,
|
||||||
endDate,
|
endDate,
|
||||||
stations,
|
stations,
|
||||||
sources
|
sources
|
||||||
}
|
}
|
||||||
// this.getServerAlarmHistory({ startDate, endDate, names })
|
this.getPageData()
|
||||||
},
|
},
|
||||||
rowClick(record) {
|
async rowClick(record) {
|
||||||
|
this.loading = true;
|
||||||
|
this.selectRow = record;
|
||||||
|
this.dataSourceDetailNuclide = record.nuclideList
|
||||||
|
await this.getSampleInfo();
|
||||||
this.isDetail = true
|
this.isDetail = true
|
||||||
},
|
},
|
||||||
handlePageChange(page, pageSize) {
|
handlePageChange(page, pageSize) {
|
||||||
this.ipagination.current = page
|
this.ipagination.current = page
|
||||||
this.ipagination.pageSize = pageSize
|
this.ipagination.pageSize = pageSize
|
||||||
// this.getServerAlarmHistory(this.paramsArg)
|
this.getPageData()
|
||||||
},
|
},
|
||||||
handleSizeChange(current, size) {
|
handleSizeChange(current, size) {
|
||||||
this.ipagination.current = current
|
this.ipagination.current = current
|
||||||
this.ipagination.pageSize = size
|
this.ipagination.pageSize = size
|
||||||
// this.getServerAlarmHistory(this.paramsArg)
|
this.getPageData()
|
||||||
},
|
},
|
||||||
handleback() {
|
handleback() {
|
||||||
this.isDetail = false
|
this.isDetail = false
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user