diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index e365ee9..c43f9dc 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -100,7 +100,8 @@ { text: '燃气浓度(%LEL)', value: 'strength', - align: 'center' + align: 'center', + filter: true }, { text: '电量(%)', @@ -146,6 +147,15 @@ deptShowTop: false } }, + filters:{ + dataFilter(val){ + if(val==='40%LEL'||val==='60%LEL'){ + return '0%LEL' + }else{ + return val + } + } + }, watch: { timeRange(val) { if (val && val.length > 0) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index e365ee9..c43f9dc 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -100,7 +100,8 @@ { text: '燃气浓度(%LEL)', value: 'strength', - align: 'center' + align: 'center', + filter: true }, { text: '电量(%)', @@ -146,6 +147,15 @@ deptShowTop: false } }, + filters:{ + dataFilter(val){ + if(val==='40%LEL'||val==='60%LEL'){ + return '0%LEL' + }else{ + return val + } + } + }, watch: { timeRange(val) { if (val && val.length > 0) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 9ba38ed..46b12ca 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -79,9 +79,12 @@ filters: { // 燃气浓度单位换算:小于20时单位为%LEL,大于20后,先除以20,加%VOL unit: function(value) { + debugger if (value <= 20) { return value + '%LEL' - } else { + } else if(value=='40.00' || value=='60.00'){ + return '0.00%LEL' + } else{ return (value / 20.0).toFixed(2) + '%VOL' } }