|
|
@@ -166,7 +166,7 @@
|
|
|
{label:'产水量', leiLabel:'累产水量', value:'water', unit:'(万吨)'},
|
|
|
{label:'产液量', leiLabel:'累产液量', value:'fluid', unit:'(万吨)'},
|
|
|
{label:'产气量', leiLabel:'累产气量', value:'gas', unit:'(立方米)'},
|
|
|
- {label:'含水率', leiLabel:'含水率', value:'watercut', unit:''},
|
|
|
+ {label:'含水率', leiLabel:'含水率', value:'watercut', unit:'(%)'},
|
|
|
{label:'注水量', leiLabel:'累注水量', value:'vol', unit:'(万吨)'}
|
|
|
];
|
|
|
},
|
|
|
@@ -265,6 +265,12 @@
|
|
|
for(let i=0;i< showList.length;i++){
|
|
|
let total = 0;
|
|
|
yDatas[i].forEach(it=>{ total+=it*1; });
|
|
|
+ //含水率，平均值
|
|
|
+ if(showList[i].value=='watercut'){
|
|
|
+ let avgCount = yDatas[i].filter(it=>{ return it>0;}).length;
|
|
|
+ if(avgCount>0) total = total / avgCount;
|
|
|
+ }
|
|
|
+
|
|
|
totals.push({
|
|
|
name:showList[i].leiLabel,
|
|
|
total : total,
|
