|
@@ -495,12 +495,12 @@ const WaterFlow = (props) => {
|
|
|
{
|
|
|
title: '差值',
|
|
|
// width: '15%',
|
|
|
- dataIndex: 'current_val',
|
|
|
+ dataIndex: 'result_val',
|
|
|
},
|
|
|
{
|
|
|
title: '时间',
|
|
|
// width: '15%',
|
|
|
- dataIndex: 'create_time',
|
|
|
+ dataIndex: 'created_time',
|
|
|
render: (text) => {
|
|
|
if (text) {
|
|
|
return dayjs(text).format('HH:mm:ss');
|
|
@@ -513,11 +513,14 @@ const WaterFlow = (props) => {
|
|
|
width: '30%',
|
|
|
render: (record) => (
|
|
|
<ThresholdDetail
|
|
|
- current={record.current_val || 0}
|
|
|
+ current={record.result_val || 0}
|
|
|
data={{
|
|
|
JsonNumThreshold: {
|
|
|
exception: [
|
|
|
- { ThresholdValue: record?.thresholds, ThresholdType: 1 },
|
|
|
+ {
|
|
|
+ ThresholdValue: record?.threshold_error,
|
|
|
+ ThresholdType: record.result_val > 0 ? 1 : 2,
|
|
|
+ },
|
|
|
],
|
|
|
},
|
|
|
Type: 2,
|