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

fix: tkx bug

This commit is contained in:
zty 2024-09-26 18:12:56 +08:00
parent f0aa7a2d2f
commit 9c1c1fd39b
21 changed files with 230 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/scEnm/lineChartsdialog.vue
View File

@ -417,8 +417,8 @@ export default {
});
let chartDom = document.getElementById("myChart");
that.myChart = echarts.init(chartDom);
that.option.xAxis.data = xAxisData;
that.option.series[0].data = lineData;
that.option.xAxis.data = xAxisData.reverse();
that.option.series[0].data = lineData.reverse();
that.myChart.setOption(that.option);
});
},

9
src/config/route.js
View File

@ -1869,15 +1869,6 @@ const routes = [
},
component: "inm/mioitem",
},
{
name: "workshop_mio",
path: "/inm/workshop_mio",
meta: {
title: "车间出入库记录",
// hidden: true,
},
component: "inm/workshop_mio",
},
],
},

8
src/views/enm_coal/handoverLog.vue
View File

@ -216,17 +216,17 @@
<td class="numCell">煤粉细度合格率（%）</td>
<td
class="numCell"
v-if="reportItem.煤粉_细度_rate_pass"
v-if="reportItem.出磨煤粉_细度_rate_pass"
>
{{ reportItem.煤粉_细度_rate_pass * 100 }}
{{ reportItem.出磨煤粉_细度_rate_pass * 100 }}
</td>
<td class="numCell" v-else>0</td>
<td class="numCell">煤粉水分合格率（%）</td>
<td
class="numCell"
v-if="reportItem.煤粉_水分_rate_pass"
v-if="reportItem.出磨煤粉_水分_rate_pass"
>
{{ reportItem.煤粉_水分_rate_pass * 100 }}
{{ reportItem.出磨煤粉_水分_rate_pass * 100 }}
</td>
<td class="numCell" v-else>0</td>
<td class="numCell"></td>

6
src/views/enm_cogeneration/workshopAnalysis.vue
View File

@ -95,7 +95,7 @@
width="1075"
cellspacing="0"
:key="2"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 2"
>
@ -145,7 +145,7 @@
width="1075"
cellspacing="0"
:key="3"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 3"
>
@ -195,7 +195,7 @@
width="1075"
cellspacing="0"
:key="4"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 4"
>

11
src/views/enm_energy/day_base.vue
View File

@ -172,7 +172,7 @@
</el-card>
</el-main>
<el-dialog v-model="itemVisible" :title="tableName">
<el-dialog v-model="itemVisible" :title="tableName" width="1100px">
<scEcharts
height="400px"
width="1033px"
@ -208,19 +208,19 @@ export default {
timeStamp: null,
tableWidth: "3300",
itemChartTitle: "",
tableName: "全厂电量日统计",
tableName: "电量日统计",
sourceData: {},
mgroupObj: {},
option: {
title: {
text: "全厂电量日统计",
// text: "电量日统计",
x: "center",
},
grid: {
// 图表距离边框的距离，可用百分比和数字（px）配置
top: "20%",
left: "3%",
right: "10%",
right: "6%",
bottom: "5%",
containLabel: true,
},
@ -452,7 +452,8 @@ export default {
let that = this;
let index = that.tableDatas2.indexOf(row);
console.log(index, "index");
console.log('row', row)
that.tableName = `${row.nickname}-电量日统计`
let lineData = that.tableDatas[index].slice(3, that.days + 3);
that.option.xAxis.data = that.xAxisData;
that.option.series[0].data = lineData;

2
src/views/enm_energy/energy.vue
View File

@ -78,7 +78,7 @@
<el-card style="margin-top:5px">
<div ref="print" id="myReport" class="printContainer">
<h3 style="text-align: center;">{{ tableName }}</h3>
<table border="1" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead">
<tr>
<th rowspan="3">日期</th>

5
src/views/enm_energy/hour_base.vue
View File

@ -162,7 +162,7 @@
</div>
</el-card>
</el-main>
<el-dialog v-model="itemVisible" :title="itemChartTitle">
<el-dialog v-model="itemVisible" :title="itemChartTitle" width="1100px">
<scEcharts
height="400px"
width="1033px"
@ -221,7 +221,7 @@ export default {
sourceData: {},
option: {
title: {
text: "全厂电量小时统计",
// text: "全厂电量小时统计",
x: "center",
},
grid: {
@ -511,6 +511,7 @@ export default {
},
itemClick(item, index) {
let that = this;
that.tableName = `${row.nickname}-电量日统计`
let lineData = that.tableDatas[index].slice(3, that.headerLength);
that.option.xAxis.data = that.xAxisData;
that.option.series[0].data = lineData;

9
src/views/enm_energy/month_base.vue
View File

@ -161,7 +161,7 @@
</el-card>
</el-main>
<el-dialog v-model="itemVisible" :title="tableName">
<el-dialog v-model="itemVisible" :title="tableName" width="1100px">
<scEcharts
height="400px"
width="1033px"
@ -197,7 +197,7 @@ export default {
xAxisData: [],
option: {
title: {
text: "全厂电量月统计",
// text: "全厂电量月统计",
x: "center",
},
grid: {
@ -424,11 +424,8 @@ export default {
},
handleCellClick(row, column, cell, event) {
let that = this;
console.log("row", row);
console.log("column", column);
console.log("cell", cell);
let index = that.tableDatas2.indexOf(row);
console.log(index, "index");
that.tableName = `${row.nickname}-电量日统计`
//获取图数据
let lineData = that.tableDatas[index].slice(3, 14);
that.option.xAxis.data = that.xAxisData;

34
src/views/enm_energy/value.vue
View File

@ -82,9 +82,10 @@ export default {
if (res.length > 0) {
res.forEach((item) => {
let ind = item.month_s - 1;
wrapArr[ind] = item;
wrapArr[ind] = item; //上年
});
} else {
wrapArr = [];
}
let obj2 = {};
obj2.year_s = this.year_s;
@ -93,7 +94,7 @@ export default {
if (res2.length > 0) {
res2.forEach((item2) => {
let ind2 = item2.month_s - 1;
wrapArr2[ind2] = item2;
wrapArr2[ind2] = item2; //本年
});
} else {
}
@ -141,8 +142,8 @@ export default {
} else {
hPercent3 = "/";
}
this.tableDatas[i][4] = hPercent3; //环比
this.tableDatas[i][5] = tPercent3; //同比
this.tableDatas[i][4] = tPercent3; //环比
this.tableDatas[i][5] = hPercent3; //同比
this.tableDatas[i][6] = wrapArr2[i].en_consume_unit; //总产值当前
let tValue6 = 0,
hValue6 = 0,
@ -157,7 +158,7 @@ export default {
? wrapArr[12].en_consume_unit
: "/";
}
if (tValue6 !== "/" && tValue6 !== 0) {
if (tValue6 !== "/" && tValue6 !== 0 && wrapArr2[i].en_consume_unit !== 0) {
tPercent6 =
((wrapArr2[i].en_consume_unit - tValue6) /
tValue6) *
@ -165,6 +166,9 @@ export default {
} else {
tPercent6 = "/";
}
if (isNaN(tPercent6)){
tPercent6 = 0
}
hValue6 = wrapArr[i]
? wrapArr[i].en_consume_unit
: "/";
@ -176,8 +180,11 @@ export default {
} else {
hPercent6 = "/";
}
this.tableDatas[i][7] = hPercent6; //总产值环比
this.tableDatas[i][8] = tPercent6; //总产值同比
if(isNaN(hPercent6)){
hPercent6 = 0
}
this.tableDatas[i][7] = tPercent6; //总产值环比
this.tableDatas[i][8] = hPercent6; //总产值同比
this.tableDatas[i][9] =
wrapArr2[i].en_add_consume_unit;
let tValue9 = 0,
@ -192,7 +199,7 @@ export default {
tValue9 = wrapArr[12]
? wrapArr[12].en_add_consume_unit
: "/";
}
};
if (tValue9 !== "/" && tValue9 !== 0) {
tPercent9 =
((wrapArr2[i].en_add_consume_unit -
@ -201,7 +208,10 @@ export default {
100;
} else {
tPercent9 = "/";
}
};
if (isNaN(tPercent9)) {
tPercent9=0
};
hValue9 = wrapArr[i]
? wrapArr[i].en_add_consume_unit
: "/";
@ -213,9 +223,9 @@ export default {
100;
} else {
hPercent9 = "/";
}
this.tableDatas[i][10] = hPercent9;
this.tableDatas[i][11] = tPercent9;
};
this.tableDatas[i][10] = tPercent9;
this.tableDatas[i][11] = hPercent9;
} else {
}
}

4
src/views/enm_kiln/handoverLog.vue
View File

@ -232,9 +232,9 @@
<td class="numCell">熟料f-CaO合格率（%）</td>
<td
class="numCell"
v-if="reportItem.出窑熟料_f-CaO_rate_pass"
v-if="reportItem.出窑熟料_fCaO_rate_pass"
>
{{reportItem.出窑熟料_f-CaO_rate_pass*100}}
{{reportItem.出窑熟料_fCaO_rate_pass*100}}
</td>
<td class="numCell" v-else>0</td>
</tr>

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

@ -95,7 +95,7 @@
width="1075"
cellspacing="0"
:key="2"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 2"
>
@ -145,7 +145,7 @@
width="1075"
cellspacing="0"
:key="3"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 3"
>
@ -195,7 +195,7 @@
width="1075"
cellspacing="0"
:key="4"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 4"
>

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

@ -95,7 +95,7 @@
width="1075"
cellspacing="0"
:key="2"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 2"
>
@ -145,7 +145,7 @@
width="1075"
cellspacing="0"
:key="3"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 3"
>
@ -195,7 +195,7 @@
width="1075"
cellspacing="0"
:key="4"
id="myTable1"
id="myTable"
class="myTable"
v-else-if="query.type == 4"
>

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

@ -95,7 +95,7 @@
width="1075"
cellspacing="0"
:key="1"
id="myTable1"
id="myTable"
class="myTable"
v-else
>

127
src/views/enm_report/exception.vue
View File

@ -1,4 +1,4 @@
<!-- 成本分析 -->
<!-- 异常动态报表 -->
<template>
<el-container class="app-container">
<el-header>
@ -47,15 +47,25 @@
</el-button>
</div>
</el-header>
<el-main>
<el-main class="nopadding">
<el-container>
<el-main class="nopadding">
<scTable
ref="stlogTable"
:apiObj="apiObjStlog"
:query="query"
:params="params"
row-key="id"
stripe
hideSetting
@row-click="stlogRowClick"
highlightCurrentRow
hideDo
>
<el-table-column type="index" width="100" />
<el-table-column
label="工段"
prop="mgroup_name"
></el-table-column>
<el-table-column
label="异常类别"
prop="duration"
@ -97,10 +107,69 @@
></el-table-column>
</scTable>
</el-main>
<el-aside width="600px">
<el-container>
<el-header>
对应值班记录
</el-header>
<el-main class="nopadding">
<scTable
ref="expTable"
:data="sflogexpList"
row-key="id"
stripe
:height="heightTable"
hidePagination
highlightCurrentRow
hideDo
>
<el-table-column type="index" width="50" />
<el-table-column label="班组名称">
<template #default="scope">
<span v-if="scope.row.sflog_">{{
scope.row.sflog_.shift_name
}}</span>
</template>
</el-table-column>
<el-table-column label="开始时间">
<template #default="scope">
<span v-if="scope.row.sflog_">{{
scope.row.sflog_.start_time
}}</span>
</template>
</el-table-column>
<el-table-column label="结束时间">
<template #default="scope">
<span v-if="scope.row.sflog_">{{
scope.row.sflog_.end_time
}}</span>
</template>
</el-table-column>
<el-table-column label="所在工段">
<template #default="scope">
<span v-if="scope.row.sflog_">{{
scope.row.sflog_.mgroup_name
}}</span>
</template>
</el-table-column>
<el-table-column
label="处理备注"
prop="note"
></el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
</el-container>
</el-main>
</el-container>
</template>
<script>
import stlogDialog from "../enm_rm/stlog_form.vue";
export default {
components: {
stlogDialog
},
data() {
return {
query: {
@ -119,6 +188,7 @@ export default {
},
value1:[],
materialList: [],
sflogexpList: [],
mgroupOptions: [],
tableName: '班组成本计算',
options: [
@ -128,8 +198,9 @@ export default {
],
tableNmae: '',
tableData1: [],
stlogVisiable: false,
apiObjStlog: null,
sourceData: {}
sourceData: {},
};
},
mounted() {
@ -150,8 +221,8 @@ export default {
this.mgroupOptions.push(item);
})
this.mgroupOptions = this.mgroupOptions.reverse();
this.query.mgroup = this.mgroupOptions[0].id;
this.params.mgroup = this.mgroupOptions[0].id;
// this.query.mgroup = this.mgroupOptions[0].id;
// this.params.mgroup = this.mgroupOptions[0].id;
this.apiObjStlog = this.$API.wpm.stlog.list;
this.tableName = this.mgroupOptions[0].name;
this.getTableData();
@ -163,33 +234,6 @@ export default {
this.optionsShift = res;
})
},
//查询类型
// getData() {
// let that = this;
// that.tableData1 = [];
// let params = {};
// params.mgroup = that.query.mgroup;
// // if (that.query.type == 0) {//班
// // arr = that.query.day.split('-');
// // params.year_s = Number(arr[0]);
// // params.month_s = Number(arr[1]);
// // params.day_s = Number(arr[2]);
// // params.type = "day_s"
// // } else if (that.query.type == 1) {//日
// // arr = that.query.month.split('-');
// // params.start_time__year = Number(arr[0]);
// // params.start_time__month = Number(arr[1]);
// // params.start_time__day = Number(arr[2]);
// // } else {//月
// // params.start_time__year = Number(that.query.year);
// // params.start_time__month = Number(that.query.month);
// // }
// params.start_time__gt = that.query[0];
// params.start_time__lt = that.query[1];
// this.$API.wpm.stlog.list.req(params).then(res => {
// that.apiObjStlog = res;
// })
// },
getTableData() {
let that = this;
let arr = [];
@ -197,7 +241,6 @@ export default {
this.query.start_time__gt = this.value1[0];
this.query.start_time__lt = this.value1[1];}
else if (that.query.type == 2) {
console.log(this.query.month);
arr = that.query.month.split('-');
this.query.start_time__year = Number(arr[0]);
this.query.start_time__month = Number(arr[1]);
@ -213,6 +256,22 @@ export default {
this.$XLSX('#myTable', this.tableName)
this.exportLoading = false;
},
//点击stlog，展示sflogexp
stlogRowClick(row) {
console.log(row);
this.sflogexpList = [];
this.clickItem = row;
this.getSflogexp(row.id);
},
getSflogexp(id) {
let obj = {};
obj.page = 0;
obj.stlog = id;
this.$API.wpm.sflogexp.list.req(obj).then((res) => {
this.sflogexpList = res;
console.log(this.sflogexpList);
});
},
}
};
</script>

3
src/views/enm_report/quality.vue
View File

@ -69,7 +69,7 @@
</el-header>
<el-card style="margin-top:5px">
<div class="tableContainer">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable1" class="myTable">
<table border="1" cellspacing="0" :key="timeStamp" id="myTable" class="myTable">
<thead class="myTableHead">
<tr>
<th rowspan="41">日期</th>
@ -163,6 +163,7 @@
if(days<10){
days = '0'+days;
}
this.query.month = myDate.getFullYear()+'-'+month
this.query.day = myDate.getFullYear()+'-'+month+'-'+days;
this.getGroup();
},

8
src/views/enm_report/reportDay.vue
View File

@ -230,10 +230,10 @@
that.tableDatas[32][3] = dataList.电石渣.elec_consume;
that.tableDatas[33][3] = dataList.原料磨.elec_consume;
that.tableDatas[34][3] = dataList.回转窑.elec_consume;
that.tableDatas[35][3] = dataList.煤磨.elec_consume;
that.tableDatas[36][3] = dataList.水泥磨.elec_consume;
that.tableDatas[37][3] = dataList.水泥包装.elec_consume;
// that.tableDatas[39][3] = dataList.生活区.elec_consume;
// that.tableDatas[35][3] = dataList.煤磨.elec_consume;
that.tableDatas[35][3] = dataList.水泥磨.elec_consume;
that.tableDatas[36][3] = dataList.水泥包装.elec_consume;
that.tableDatas[37][3] = dataList.生活区.elec_consume;
}).then(res=>{
//获取月和年目标
let params1 = {};

44
src/views/enm_report/reportMonth.vue
View File

@ -75,30 +75,30 @@
[4,'主机设备台产','回转窑台产（t/h）'],
[5,'主机设备台产','水泥磨台产（t/h）'],
[6,'能耗','熟料日综合电耗（kw.h/t）'],
[7,'能耗','熟料日单位标煤耗(kgce/t)'],
[8,'能耗','熟料日综合能耗(kgce/t)'],
[9,'能耗','水泥日综合能耗(kgce/t)'],
[10,'能耗','日电石渣分布电耗（kw.h/t）'],
[11,'能耗','日生料分布电耗（kw.h/t）'],
[12,'能耗','日熟料分布电耗（kw.h/t）'],
[13,'能耗','日水泥粉磨分布电耗（kw.h/t）'],
[14,'能耗','日水泥包装分布电耗（kw.h/t）'],
[6,'能耗','熟料月综合电耗（kw.h/t）'],
[7,'能耗','熟料月单位标煤耗(kgce/t)'],
[8,'能耗','熟料月综合能耗(kgce/t)'],
[9,'能耗','水泥月综合能耗(kgce/t)'],
[10,'能耗','月电石渣分布电耗（kw.h/t）'],
[11,'能耗','月生料分布电耗（kw.h/t）'],
[12,'能耗','月熟料分布电耗（kw.h/t）'],
[13,'能耗','月水泥粉磨分布电耗（kw.h/t）'],
[14,'能耗','月水泥包装分布电耗（kw.h/t）'],
[15,'产量','日电石渣产量(t)'],
[15,'产量','月电石渣产量(t)'],
[16,'产量','月电石渣产量完成率(%)'],
[17,'产量','日生料产量(t)'],
[17,'产量','月生料产量(t)'],
[18,'产量','月生料产量完成率(%)'],
[19,'产量','日熟料产量(t)'],
[19,'产量','月熟料产量(t)'],
[20,'产量','月熟料产量完成率(%)'],
[21,'产量','日水泥产量(t)'],
[21,'产量','月水泥产量(t)'],
[22,'产量','月水泥产量完成率(%)'],
[23,'产量','日熟料出厂量(t)'],
[23,'产量','月熟料出厂量(t)'],
[24,'产量','月熟料累计出厂量(t)'],
[25,'产量','日散装水泥出厂量(t)'],
[25,'产量','月散装水泥出厂量(t)'],
[26,'产量','月散装水泥出厂量(t)'],
[27,'产量','日袋装水泥出厂量(t)'],
[27,'产量','月袋装水泥出厂量(t)'],
[28,'产量','月袋装水泥出厂量(t)'],
@ -346,9 +346,9 @@
that.tableDatas[33][4] = this.canCompute(that.nowData[33],dataList.电石渣.elec_consume);
that.tableDatas[34][4] = this.canCompute(that.nowData[34],dataList.原料磨.elec_consume);
that.tableDatas[35][4] = this.canCompute(that.nowData[35],dataList.回转窑.elec_consume);
that.tableDatas[36][4] = this.canCompute(that.nowData[36],dataList.煤磨.elec_consume);
that.tableDatas[37][4] = this.canCompute(that.nowData[37],dataList.水泥磨.elec_consume);
that.tableDatas[38][4] = this.canCompute(that.nowData[38],dataList.水泥包装.elec_consume);
that.tableDatas[36][4] = this.canCompute(that.nowData[36],dataList.水泥磨.elec_consume);
that.tableDatas[37][4] = this.canCompute(that.nowData[37],dataList.水泥包装.elec_consume);
that.tableDatas[38][4] = this.canCompute(that.nowData[38],dataList.生活区.elec_consume);
// that.tableDatas[39][3] = dataList.生活区.elec_consume;
}).then(res=>{
//获取月和年目标
@ -440,9 +440,9 @@
that.tableDatas[33][5] = this.canCompute(that.nowData[33],dataList.电石渣.elec_consume);
that.tableDatas[34][5] = this.canCompute(that.nowData[34],dataList.原料磨.elec_consume);
that.tableDatas[35][5] = this.canCompute(that.nowData[35],dataList.回转窑.elec_consume);
that.tableDatas[36][5] = this.canCompute(that.nowData[36],dataList.煤磨.elec_consume);
that.tableDatas[37][5] = this.canCompute(that.nowData[37],dataList.水泥磨.elec_consume);
that.tableDatas[38][5] = this.canCompute(that.nowData[38],dataList.水泥包装.elec_consume);
that.tableDatas[36][5] = this.canCompute(that.nowData[36],dataList.水泥磨.elec_consume);
that.tableDatas[37][5] = this.canCompute(that.nowData[37],dataList.水泥包装.elec_consume);
that.tableDatas[38][5] = this.canCompute(that.nowData[38],dataList.生活区.elec_consume);
}
// that.tableDatas[39][4] = dataList.生活区.elec_consume;
}).then(res=>{

4
src/views/enm_rm/handoverLog.vue
View File

@ -202,9 +202,9 @@
<td class="numCell">
{{ reportItem.run_rate }}
</td>
<td class="numCell">停机时长（s）</td>
<td class="numCell">停机时长（h）</td>
<td class="numCell">
{{ reportItem.shut_sec }}
{{ (reportItem.shut_sec/3600).toFixed(2) }}
</td>
<td class="numCell">
当期单位产品电耗（kW·h/t）

8
src/views/enm_rm/logDetail.vue
View File

@ -737,18 +737,18 @@ export default {
that.mpointOptions = [];
res.forEach((item) => {
item.mpFormVal = null;
item.mpFormValAble = false;
that.mpointOptions.push(item);
});
that.mpointOptions.forEach((item) =>{
that.$API.enm.mpoint.stat.req({mpoint: item.id, sflog: this.form.id, page: 0}).then(res=>{
if(res.length>0){
item.mpFormVal = res[0].val;
}else{
item.mpFormVal = 0;
}
that.mpointOptions.push(item);
})
});
})
that.getMpointStat();
}
});

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

@ -645,7 +645,9 @@ export default {
let item = i + "日";
dayXAxis.push(item);
}
console.log(dayXAxis);
options.xAxis.data = dayXAxis;
console.log(dayXAxis);
that.optionDay = options;
});
},

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

@ -254,7 +254,7 @@ export default {
let lastDiff = 0;
if (arrs[1] !== "/" && arrs[4] !== "/") {
lastDiff = arrs[1] - arrs[4];
lastDiff = (arrs[1] - arrs[4]).toFixed(2);
} else {
lastDiff = "/";
}