zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
shijing 2025-02-21 17:27:55 +08:00
parent 1e4842b47e 5e83bd7c24
commit db03953ce8
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/enm_kiln/report.vue
View File

@ -956,17 +956,26 @@ export default {
if (res3.length > 0) { if (res3.length > 0) {
let data3 = res3[0]; let data3 = res3[0];
that.tableDatas[0][3] = data3.total_production; that.tableDatas[0][3] = data3.total_production;
that.tableDatas[1][3] = data3.production_hour; if (data3.total_production<1){
that.tableDatas[2][3] = data3.run_hour; that.tableDatas[4][3] = 0;
that.tableDatas[3][3] = data3.run_rate; that.tableDatas[5][3] = 0;
that.tableDatas[4][3] = data3.elec_consume_unit; that.tableDatas[6][3] = 0;
that.tableDatas[5][3] = data3.celec_consume_unit; that.tableDatas[7][3] = 0;
that.tableDatas[6][3] = data3.coal_consume_unit; that.tableDatas[8][3] = 0;
that.tableDatas[7][3] = data3.cen_consume_unit; }else{
that.tableDatas[8][3] = data3.elec_consume; that.tableDatas[1][3] = data3.production_hour;
that.tableDatas[9][3] = data3.production_cost_unit; that.tableDatas[2][3] = data3.run_hour;
that.tableDatas[10][3] = data3.ammonia_consume; that.tableDatas[3][3] = data3.run_rate;
that.tableDatas[11][3] = (data3.ammonia_consume*1000/data3.total_production).toFixed(2); that.tableDatas[4][3] = data3.elec_consume_unit;
that.tableDatas[5][3] = data3.celec_consume_unit;
that.tableDatas[6][3] = data3.coal_consume_unit;
that.tableDatas[7][3] = data3.cen_consume_unit;
that.tableDatas[8][3] = data3.elec_consume;
that.tableDatas[9][3] = data3.production_cost_unit;
that.tableDatas[10][3] = data3.ammonia_consume;
that.tableDatas[11][3] = (data3.ammonia_consume*1000/data3.total_production).toFixed(2);
}
} }
}); });
//本日 //本日

4
src/views/fac_cal/mpointstat.vue
View File

@ -107,7 +107,7 @@
<el-button <el-button
link link
size="small" size="small"
v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'" v-if="scope.row.type == 'year_s' || scope.row.type == 'month_s' || scope.row.type == 'day_s'|| scope.row.type == 'month'|| scope.row.type == 'day'"
@click="handle_edit(scope.row)" @click="handle_edit(scope.row)"
type="primary" type="primary"
>校正</el-button >校正</el-button
@ -282,7 +282,7 @@ export default {
{ {
name: tableData.length > 0 ? tableData[0].mpoint_name : "", name: tableData.length > 0 ? tableData[0].mpoint_name : "",
type: 'line', // 折线图类型 type: 'line', // 折线图类型
data: tableData.length > 0 ? tableData.reverse().map((item) => parseFloat(item.val)) : [], // 将字符串转为数字 data: tableData.length > 0 ? tableData.map((item) => parseFloat(item.val)) : [], // 将字符串转为数字
smooth: true, // 平滑曲线 smooth: true, // 平滑曲线
} }
]; ];