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-01-13 16:48:53 +08:00
parent 80f36a0e6f b31ae9403c
commit 2dc9099409
11 changed files with 75 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/config/route.js
View File

@ -289,6 +289,7 @@ const routes = [
},
component: "enm_slag/teamAnalysis",
},
{
name: "slag_workshopAnalysis",
path: "/enm_slag/workshopAnalysis",
@ -1232,6 +1233,16 @@ const routes = [
},
component: "enm_report/exception",
},
{
name: "teamAnalysisLog",
path: "/enm_report/teamAnalysisLog",
meta: {
title: "交接班日志表",
// icon: "el-icon-grid",
perms: ["enm_report"],
},
component: "enm_report/teamAnalysisLog",
},
],
},
//制造管理 mtm

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

59
src/views/enm_energy/energyPicture.vue
View File

@ -3,10 +3,9 @@
<el-main style="background: #fff;">
<div class="pictureContainer">
<img src="/media/elec_flow.png" class="flowImg" >
<!-- <img src="/img/energy.png" class="flowImg" /> -->
<div class="pictureHeader" style="top: 35px;">
<div class="pictureHeader" >
<div class="left-panel">
<el-select
<el-select
v-model="query.type"
placeholder="查询类型"
clearable
@ -28,6 +27,7 @@
placeholder="天"
v-if="query.type==0"
style="margin-right: 6px"
class="headerSearch"
/>
<el-date-picker
v-model="query.month"
@ -234,24 +234,37 @@
let month = date.getMonth() + 1;
let day = date.getDate();
let hour = date.getHours();
let obj = {
year: year,
month: month,
day: day,
type: 'day',
page:0,
mpoint__material__code__in:'elec,coal,pcoal,water,steam,oil,cair'
};
this.$API.enm.mpoint.stat.req(obj).then(res => {
res.forEach(item => {
that.dataObj[item.mpoint_nickname]=item.val;
})
console.log(that.dataObj)
})
that.query.day = year + '-' + month + '-' + day;
that.dateChange();
},
methods: {
dateChange() {
let that = this;
that.tableDatas = [];
let params = {page:0, mpoint__material__code__in:'elec,coal,pcoal,water,steam,oil,cair'};
let arr = [];
if(that.query.type==0){//日
arr = that.query.day.split('-');
params.type='day_s';
params.year_s = Number(arr[0]);
params.month_s = Number(arr[1]);
params.day_s = Number(arr[2]);
}else if(that.query.type==1){//月
let arr = that.query.month.split('-');
params.year_s = Number(arr[0]);
params.month_s = Number(arr[1]);
params.type='month_s';
}else if (that.query.type==2){
that.year = that.query.year;
params.type='year_s';
}
this.$API.enm.mpoint.stat.req(params).then(res => {
res.forEach(item => {
that.dataObj[item.mpoint_nickname]=item.val;
})
console.log(that.dataObj)
})
},
}
};
</script>
@ -320,8 +333,8 @@
}
.pictureHeader {
position: absolute;
top: -30px; /* 调整表头距离图片的高度 */
left: 20%;
top: 35px; /* 调整表头距离图片的高度 */
left: 50%;
transform: translateX(-50%);
background-color: #f8f9fa; /* 表头背景颜色 */
padding: 5px 10px;
@ -331,4 +344,8 @@
font-weight: bold;
color: #333;
}
.headerSearch{
width: 500px;
}
</style>

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

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

@ -294,12 +294,25 @@
if(indexObj>0&&index3==0){
let inde = indexObj-1;
let ind =header2Objtem[inde].lengths*4+1;
itemArr[ind] = (item3.val_avg).toFixed(2);
if(item3.val_avg){
itemArr[ind] = Number(item3.val_avg).toFixed(2);
}else{
itemArr[ind] = 0;
}
// itemArr[ind] = (item3.val_avg).toFixed(2);
itemArr.push(item3.num_test)
itemArr.push(item3.num_ok)
let pass = (item3.rate_pass).toFixed(2);
pass= pass+'%';
itemArr.push(pass)
let pass = 0;
if (item3.rate_pass){
pass = Number(item3.rate_pass).toFixed(2)+ '%';
itemArr.push(pass)
}else{
pass = Number(item3.rate_pass).toFixed(2) + '%';
itemArr.push(pass)
}
// pass= pass+'%';
}else{
itemArr.push(Number(item3.val_avg).toFixed(2));
itemArr.push(item3.num_test);

4
src/views/enm_report/teamAnalysisLog.vue
View File

@ -10,7 +10,7 @@
<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<el-select
v-model="query.sflogs__team"
v-model="query.team"
placeholder="班组"
clearable
style="margin-left: 2px; width: 120px"
@ -166,7 +166,7 @@ export default {
start_time__gte: '',
end_time__lt: '',
start_time__month: '',
sflogs__team: '',
team: '',
start_time__year: '',
end_time__month: '',
end_time__year: '',

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

2
src/views/enm_rm_copy/handoverLog.vue
View File

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"

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

@ -11,7 +11,7 @@
style="width: 200px"
/>
<el-date-picker
v-model="query.start_time__lte"
v-model="query.end_time__lt"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="班开始时间止"