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 2024-12-24 14:10:28 +08:00
parent 60d8ea8508 91fad99f5b
commit 4d414f1fcf
35 changed files with 113 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/enm_coal/power.vue
View File

@ -26,13 +26,13 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="6"> <th colspan="6">
煤磨工段主要设备（100KW以上）单位产品电耗数据表 煤磨工序主要设备（100KW以上）单位产品电耗数据表
</th> </th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
<th>设备位号</th> <th>设备位号</th>
<th>单位</th> <th>单位产品分布电耗</th>
<th>上个小时</th> <th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
@ -242,7 +242,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "煤磨工段", title: "煤磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,
@ -430,7 +430,7 @@ export default {
} }
let index = that.mpoints.indexOf(item.mpoint_name); let index = that.mpoints.indexOf(item.mpoint_name);
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[3] = item.elec_consume_unit; obj[3] = item.elec_consume_unit;
@ -469,7 +469,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[4] = item.elec_consume_unit; obj[4] = item.elec_consume_unit;
@ -496,7 +496,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[5] = item.elec_consume_unit; obj[5] = item.elec_consume_unit;

4
src/views/enm_coal/report.vue
View File

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">煤磨工段生产报告</th> <th colspan="10">煤磨工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -276,7 +276,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "煤磨工段", title: "煤磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_coal/teamAnalysis.vue
View File

@ -38,7 +38,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="16">煤磨工段班组月度对比分析</th> <th colspan="16">煤磨工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

2
src/views/enm_coal/workshopAnalysis.vue
View File

@ -39,7 +39,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8"> <th colspan="8">
煤磨工段车间单位产品电耗月度分析表 煤磨工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

2
src/views/enm_coalbase/power.vue
View File

@ -235,7 +235,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "煤磨工段", title: "煤磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,

4
src/views/enm_coalbase/report.vue
View File

@ -24,7 +24,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">煤磨工段生产报告</th> <th colspan="10">煤磨工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -275,7 +275,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "煤磨工段", title: "煤磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_coalbase/teamAnalysis.vue
View File

@ -37,7 +37,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="12">煤磨工段班组月度对比分析</th> <th colspan="12">煤磨工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

2
src/views/enm_coalbase/workshopAnalysis.vue
View File

@ -38,7 +38,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8"> <th colspan="8">
煤磨工段车间单位产品电耗月度分析表 煤磨工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

2
src/views/enm_cogeneration/report.vue
View File

@ -404,7 +404,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "回转窑工段", title: "烧成工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

36
src/views/enm_energy/electric_total.vue
View File

@ -66,24 +66,22 @@
border border
:height="tableHeight" :height="tableHeight"
> >
<el-table-column type="index"></el-table-column>
<el-table-column <el-table-column
label="设备名称" label="设备名称"
prop="name" prop="name"
fixed
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="对应点位" label="对应点位"
prop="code" prop="code"
fixed
> >
</el-table-column> </el-table-column>
<el-table-column label="日累计" prop="day" align="center" fixed> <el-table-column label="日累计" prop="day" align="center">
</el-table-column> </el-table-column>
<el-table-column label="月累计" prop="month" align="center" fixed> <el-table-column label="月累计" prop="month" align="center">
</el-table-column> </el-table-column>
<el-table-column label="年累计" prop="year" align="center" fixed> <el-table-column label="年累计" prop="year" align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
@ -95,22 +93,20 @@
:height="tableHeight" :height="tableHeight"
@cell-click="handleCellClick_range" @cell-click="handleCellClick_range"
> >
<el-table-column type="index"></el-table-column>
<el-table-column <el-table-column
label="设备名称" label="设备名称"
prop="mpoint__name" prop="mpoint__name"
fixed
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="对应点位" label="对应点位"
prop="mpoint__code" prop="mpoint__code"
fixed
align="center" align="center"
></el-table-column><el-table-column ></el-table-column><el-table-column
label="统计值(kwh)" label="统计值(kwh)"
prop="total_val" prop="total_val"
fixed
align="center" align="center"
></el-table-column> ></el-table-column>
</el-table> </el-table>
@ -283,6 +279,9 @@ export default {
}, },
methods: { methods: {
dateChange(e) { dateChange(e) {
if (e == null) {
return
}
let that = this; let that = this;
that.tableDatas = []; that.tableDatas = [];
let arr = []; let arr = [];
@ -301,7 +300,10 @@ export default {
formatArry(){ formatArry(){
this.result = this.mpointIdList.join(","); // 将数组转换为字符串 this.result = this.mpointIdList.join(","); // 将数组转换为字符串
}, },
changeDate(){ changeDate(val){
if (val == null){
return
}
let that = this; let that = this;
let obj = {}; let obj = {};
obj.type = "hour"; obj.type = "hour";
@ -334,7 +336,7 @@ export default {
that.mpointList = res.filter((item) => { that.mpointList = res.filter((item) => {
// 提取mpointIdList // 提取mpointIdList
that.mpointIdList.push(item.id); that.mpointIdList.push(item.id);
return item.report_sortstr !== ""; return true;
}); });
that.dataLoop(); that.dataLoop();
}); });
@ -355,7 +357,9 @@ export default {
}, },
getData(id, index) { getData(id, index) {
let that = this; let that = this;
let obj = {}; let obj = {
query: "{val}"
};
obj.type = "day"; obj.type = "day";
obj.year = that.year; obj.year = that.year;
obj.month = that.month; obj.month = that.month;
@ -368,7 +372,9 @@ export default {
}); });
}); });
//月 //月
let obj_month = {}; let obj_month = {
query: "{val}"
};
obj_month.type = "month"; obj_month.type = "month";
obj_month.year = that.year; obj_month.year = that.year;
obj_month.month = that.month; obj_month.month = that.month;
@ -380,7 +386,9 @@ export default {
}); });
}); });
//年 //年
let obj_year = {}; let obj_year = {
query: "{val}"
};
obj_year.type = "year"; obj_year.type = "year";
obj_year.year = that.year; obj_year.year = that.year;
obj_year.mpoint = id; obj_year.mpoint = id;

12
src/views/enm_kiln/power.vue
View File

@ -26,13 +26,13 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="6"> <th colspan="6">
回转窑工段主要设备（100KW以上）单位产品电耗数据表 烧成工序主要设备（100KW以上）单位产品电耗数据表
</th> </th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
<th>设备位号</th> <th>设备位号</th>
<th>单位</th> <th>单位产品分布电耗</th>
<th>上个小时</th> <th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
@ -253,7 +253,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "回转窑工段", title: "烧成工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,
@ -548,7 +548,7 @@ export default {
res.forEach((item) => { res.forEach((item) => {
let index = that.mpoints.indexOf(item.mpoint_name); let index = that.mpoints.indexOf(item.mpoint_name);
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[3] = item.elec_consume_unit; obj[3] = item.elec_consume_unit;
@ -587,7 +587,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[4] = item.elec_consume_unit; obj[4] = item.elec_consume_unit;
@ -614,7 +614,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[5] = item.elec_consume_unit; obj[5] = item.elec_consume_unit;

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

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">回转窑工段生产报告</th> <th colspan="10">烧成工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -167,7 +167,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="回转窑工段"> <sc-dialog v-model="chartShow" draggable title="烧成工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -452,7 +452,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "回转窑工段", title: "烧成工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_kiln/teamAnalysis.vue
View File

@ -38,7 +38,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="32">回转窑工段班组月度对比分析</th> <th colspan="32">烧成工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

2
src/views/enm_kilnbase/power.vue
View File

@ -239,7 +239,7 @@ export default {
], ],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "回转窑工段", title: "烧成工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,

6
src/views/enm_kilnbase/report.vue
View File

@ -24,7 +24,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">回转窑工段生产报告</th> <th colspan="10">烧成工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -160,7 +160,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="回转窑工段"> <sc-dialog v-model="chartShow" draggable title="烧成工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -411,7 +411,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "回转窑工段", title: "烧成工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_kilnbase/teamAnalysis.vue
View File

@ -37,7 +37,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="19">回转窑工段班组月度对比分析</th> <th colspan="19">烧成工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

12
src/views/enm_mill/power.vue
View File

@ -26,13 +26,13 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="6"> <th colspan="6">
水泥磨工段主要设备（100KW以上）单位产品电耗数据表 水泥粉磨工序主要设备（100KW以上）单位产品电耗数据表
</th> </th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
<th>设备位号</th> <th>设备位号</th>
<th>单位</th> <th>单位产品分布电耗</th>
<th>上个小时</th> <th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
@ -251,7 +251,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "水泥磨工段", title: "水泥粉磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,
@ -505,7 +505,7 @@ export default {
res.forEach((item) => { res.forEach((item) => {
let index = that.mpoints.indexOf(item.mpoint_name); let index = that.mpoints.indexOf(item.mpoint_name);
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[3] = item.elec_consume_unit; obj[3] = item.elec_consume_unit;
@ -542,7 +542,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[4] = item.elec_consume_unit; obj[4] = item.elec_consume_unit;
@ -569,7 +569,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[5] = item.elec_consume_unit; obj[5] = item.elec_consume_unit;

6
src/views/enm_mill/report.vue
View File

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">水泥磨工段生产报告</th> <th colspan="10">水泥粉磨工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -156,7 +156,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="水泥磨工段"> <sc-dialog v-model="chartShow" draggable title="水泥粉磨工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -414,7 +414,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "水泥磨工段", title: "水泥粉磨工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

8
src/views/enm_mill/teamAnalysis.vue
View File

@ -38,7 +38,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="19">水泥磨工段班组月度对比分析</th> <th colspan="19">水泥粉磨工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>
@ -58,7 +58,7 @@
<th>比表面积（%）</th> <th>比表面积（%）</th>
<th>SO3（%）</th> <th>SO3（%）</th>
<th>掺量（%）</th> <th>掺量（%）</th>
<th>循环风机1906（KW·h/t）</th> <th>原料循环风机（KW·h/t）</th>
<th>系统风机（KW·h/t）</th> <th>系统风机（KW·h/t）</th>
<th>目标值（kW·h/t）</th> <th>目标值（kW·h/t）</th>
<th>当期值（kW·h/t）</th> <th>当期值（kW·h/t）</th>
@ -215,8 +215,8 @@ export default {
: "/"; : "/";
//设备 //设备
arr[9] = arr[9] =
item.循环风机_consume_unit != null item.原料循环风机_consume_unit != null
? item.循环风机_consume_unit ? item.原料循环风机_consume_unit
: "/"; : "/";
arr[10] = arr[10] =
item.系统风机_consume_unit != null item.系统风机_consume_unit != null

4
src/views/enm_mill/workshopAnalysis.vue
View File

@ -52,7 +52,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9"> <th colspan="9">
水泥磨工段车间单位产品电耗月度分析表 水泥粉磨工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>
@ -102,7 +102,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9"> <th colspan="9">
水泥磨工段车间单位产品综合能耗月度分析表 水泥粉磨工序车间单位产品综合能耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

4
src/views/enm_pack/report.vue
View File

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">水泥包装工段生产报告</th> <th colspan="9">水泥包装工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -121,7 +121,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="水泥包装工段"> <sc-dialog v-model="chartShow" draggable title="水泥包装工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"

2
src/views/enm_pack/teamAnalysis.vue
View File

@ -39,7 +39,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="11"> <th colspan="11">
水泥包装工段班组月度对比分析 水泥包装工序班组月度对比分析
</th> </th>
</tr> </tr>
<tr> <tr>

2
src/views/enm_pack/workshopAnalysis.vue
View File

@ -39,7 +39,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8"> <th colspan="8">
水泥包装工段车间单位产品电耗月度分析表 水泥包装工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

18
src/views/enm_report/costing.vue
View File

@ -176,7 +176,7 @@ export default {
let arr = []; let arr = [];
params.page = 0; params.page = 0;
params.mgroup = that.query.mgroup; params.mgroup = that.query.mgroup;
params.mgroup_name = that.query.mgroup_name; // params.mgroup_name = that.query.mgroup_name;
if (that.query.type == 0) {//班 if (that.query.type == 0) {//班
arr = that.query.day.split('-'); arr = that.query.day.split('-');
params.year_s = Number(arr[0]); params.year_s = Number(arr[0]);
@ -215,7 +215,17 @@ export default {
if (materialName === "入窑生料") { if (materialName === "入窑生料") {
materialName = "生料"; materialName = "生料";
} }
arr.push(materialName) var unit = "（吨）"
if (materialName == "动力电") {
unit = "（度）"
}
else if (materialName == "包装袋"){
unit = "（袋）"
}
else if (materialName == "压缩空气" || materialName == "蒸汽") {
unit = "（m³）"
}
arr.push(materialName + unit)
arr.push('单价（元/吨）') arr.push('单价（元/吨）')
arr.push('总成本（元）') arr.push('总成本（元）')
arr.push('单位成本（元/吨）') arr.push('单位成本（元/吨）')
@ -223,7 +233,7 @@ export default {
materials.forEach(item => { materials.forEach(item => {
if(item.material_name == "动力电"){ if(item.material_name == "动力电"){
that.data2 = that.data2 + 4 that.data2 = that.data2 + 4
arr.push(item.material_name) arr.push(item.material_name + '（度）')
arr.push('单价（元/度）') arr.push('单价（元/度）')
arr.push('总成本（元）') arr.push('总成本（元）')
arr.push('单位成本（元/吨）') arr.push('单位成本（元/吨）')
@ -232,7 +242,7 @@ export default {
materials.forEach(item => { materials.forEach(item => {
if(item.material_name == "工业水"){ if(item.material_name == "工业水"){
that.data2 = that.data2 + 4 that.data2 = that.data2 + 4
arr.push(item.material_name) arr.push(item.material_name + '（吨）')
arr.push('单价（元/吨）') arr.push('单价（元/吨）')
arr.push('总成本（元）') arr.push('总成本（元）')
arr.push('单位成本（元/吨）') arr.push('单位成本（元/吨）')

12
src/views/enm_rm/power.vue
View File

@ -26,13 +26,13 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="6"> <th colspan="6">
原料磨工段主要设备（100KW以上）单位产品电耗数据表 生料工序主要设备（100KW以上）单位产品电耗数据表
</th> </th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
<th>设备位号</th> <th>设备位号</th>
<th>单位</th> <th>单位产品分布电耗</th>
<th>上个小时</th> <th>上个小时</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
@ -246,7 +246,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "原料磨工段", title: "生料工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,
@ -482,7 +482,7 @@ export default {
} }
let index = that.mpoints.indexOf(item.mpoint_name); let index = that.mpoints.indexOf(item.mpoint_name);
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[3] = item.elec_consume_unit; obj[3] = item.elec_consume_unit;
@ -521,7 +521,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[4] = item.elec_consume_unit; obj[4] = item.elec_consume_unit;
@ -551,7 +551,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[5] = item.elec_consume_unit; obj[5] = item.elec_consume_unit;

6
src/views/enm_rm/report.vue
View File

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">原料磨工段生产报告</th> <th colspan="10">生料工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -155,7 +155,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="原料磨工段"> <sc-dialog v-model="chartShow" draggable title="生料工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -414,7 +414,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hours", type: "hours",
title: "原料磨工段", title: "生料工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_rm/teamAnalysis.vue
View File

@ -38,7 +38,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="23">原料磨工段班组月度对比分析</th> <th colspan="23">生料工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

2
src/views/enm_rm/workshopAnalysis.vue
View File

@ -39,7 +39,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8"> <th colspan="8">
原料磨工段车间单位产品电耗月度分析表 生料工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

2
src/views/enm_rmbase/power.vue
View File

@ -230,7 +230,7 @@ export default {
], ],
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "原料磨工段", title: "生料工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,

6
src/views/enm_rmbase/report.vue
View File

@ -24,7 +24,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="10">原料磨工段生产报告</th> <th colspan="10">生料工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -153,7 +153,7 @@
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="原料磨工段"> <sc-dialog v-model="chartShow" draggable title="生料工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -404,7 +404,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hours", type: "hours",
title: "原料磨工段", title: "生料工序",
cate: "", cate: "",
apiObj: this.$API.enm.enstat, apiObj: this.$API.enm.enstat,
showClose: true, showClose: true,

2
src/views/enm_rmbase/teamAnalysis.vue
View File

@ -37,7 +37,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="12">原料磨工段班组月度对比分析</th> <th colspan="12">生料工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>

2
src/views/enm_rmbase/workshopAnalysis.vue
View File

@ -38,7 +38,7 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="8"> <th colspan="8">
原料磨工段车间单位产品电耗月度分析表 生料工序车间单位产品电耗月度分析表
</th> </th>
</tr> </tr>
<tr> <tr>

10
src/views/enm_slag/power.vue
View File

@ -26,13 +26,13 @@
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="5"> <th colspan="5">
电石渣工段主要设备（100KW以上）单位产品电耗数据表 电石渣工序主要设备（100KW以上）单位产品电耗数据表
</th> </th>
</tr> </tr>
<tr> <tr>
<th>设备名称</th> <th>设备名称</th>
<th>设备位号</th> <th>设备位号</th>
<th>单位</th> <th>单位产品分布电耗</th>
<th>昨日</th> <th>昨日</th>
<th>本月</th> <th>本月</th>
</tr> </tr>
@ -205,7 +205,7 @@ export default {
tableData: [], tableData: [],
modelValue: true, modelValue: true,
type: "day_s", type: "day_s",
title: "电石渣工段", title: "电石渣工序",
cate: "", cate: "",
apiObj: this.$API.enm.mpoint.stat, apiObj: this.$API.enm.mpoint.stat,
showClose: true, showClose: true,
@ -344,7 +344,7 @@ export default {
that.tableDatas[index_d][3] = item.elec_consume_unit; that.tableDatas[index_d][3] = item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[3] = item.elec_consume_unit; obj[3] = item.elec_consume_unit;
@ -371,7 +371,7 @@ export default {
item.elec_consume_unit; item.elec_consume_unit;
} else { } else {
let obj = []; let obj = [];
obj[0] = item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;; obj[0] = item.ep_monitored_name?item.ep_monitored_name:item.mpoint_nickname?item.mpoint_nickname:item.mpoint_name;
obj[1] = item.ep_monitored_number; obj[1] = item.ep_monitored_number;
obj[2] = "KW·h/t"; obj[2] = "KW·h/t";
obj[4] = item.elec_consume_unit; obj[4] = item.elec_consume_unit;

8
src/views/enm_slag/report.vue
View File

@ -25,7 +25,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="9">电石渣工段生产报告</th> <th colspan="9">电石渣工序生产报告</th>
</tr> </tr>
<tr> <tr>
<th colspan="2">参数</th> <th colspan="2">参数</th>
@ -127,7 +127,7 @@
</div> </div>
</div> </div>
</div> </div>
<sc-dialog v-model="chartShow" draggable title="电石渣工段"> <sc-dialog v-model="chartShow" draggable title="电石渣工序">
<div class="searchHead" v-if="type == 'hours'"> <div class="searchHead" v-if="type == 'hours'">
<el-date-picker <el-date-picker
v-model="query.start_time" v-model="query.start_time"
@ -396,7 +396,7 @@ export default {
mgroup: "3346491835287007232", mgroup: "3346491835287007232",
}, },
tableDatas: [ tableDatas: [
["产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0], ["电石干粉产量", "总产量（t）", 0, 0, 0, 0, 0, 0, 0, 0],
["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0], ["能耗", "单位产品分布电耗（KW·h/t）", 0, 0, 0, 0, 0, 0, 0, 0],
["能耗", "总电耗（KW·h）", 0, 0, 0, "/", "/", "/", "/", "/"], ["能耗", "总电耗（KW·h）", 0, 0, 0, "/", "/", "/", "/", "/"],
["成本", "电石渣成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0], ["成本", "电石渣成本（元/吨）", 0, 0, 0, 0, 0, 0, 0, 0],
@ -408,7 +408,7 @@ export default {
tableName: "生产报告", tableName: "生产报告",
modelValue: true, modelValue: true,
type: "hour_s", type: "hour_s",
title: "电石渣工段", title: "电石渣工序",
showClose: true, showClose: true,
echartType: "line", echartType: "line",
asynDialog: false, asynDialog: false,

2
src/views/enm_slag/teamAnalysis.vue
View File

@ -38,7 +38,7 @@
> >
<thead class="myTableHead"> <thead class="myTableHead">
<tr> <tr>
<th colspan="12">电石渣工段班组月度对比分析</th> <th colspan="12">电石渣工序班组月度对比分析</th>
</tr> </tr>
<tr> <tr>
<th rowspan="2">月份</th> <th rowspan="2">月份</th>