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:
Li xia 2024-08-19 14:16:38 +08:00
parent b05ce66c38 fe704c09a7
commit 2fdcd3db1b
19 changed files with 180 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config/route.js
View File

@ -946,16 +946,16 @@ const routes = [
},
component: "enm_energy/value",
},
{
name: "electric",
path: "/enm_energy/electric",
meta: {
title: "全厂电量统计",
// icon: "el-icon-grid",
perms: ["enm_energy_electric"],
},
component: "enm_energy/electric",
},
// {
// name: "electric",
// path: "/enm_energy/electric",
// meta: {
// title: "全厂电量统计",
// // icon: "el-icon-grid",
// perms: ["enm_energy_electric"],
// },
// component: "enm_energy/electric",
// },
{
name: "electricHour",
path: "/enm_energy/electricHour",

8
src/style/dark.scss
View File

@ -10,6 +10,14 @@ html.dark {
--el-color-primary-light-5: var(--el-color-primary-dark-4) !important;
--el-color-primary-light-3: var(--el-color-primary-dark-3) !important;
--el-menu-active-color: #ffffff !important;
// --el-bg-color: #1e789a;
// --el-text-color-regular: #ffffff;
.el-dialog__close {
color: #ffffff;
}
.el-dialog__title {
color: #ffffff;
}
.el-tag {
background-color: #f8f5f5 !important;

24
src/style/fix.scss
View File

@ -376,3 +376,27 @@ body .el-table th.gutter {
.el-dialog__footer {
padding: 6px 6px 6px;
}
.aside_one,
.aside_side {
height: 100%;
background: var(--el-bg-color-overlay);
border-color: var(--el-border-color-light);
// border-radius: 4px;
background: rgb(4, 50, 83);
background-color: rgb(4, 50, 83);
box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109);
border: 1px solid #1279c3;
}
.el-aside:has(> .aside_one) {
padding: 8px;
border-right: none;
}
.infoLine {
color: #ffffff;
}
.typeLine {
color: #ffffff;
}

25
src/views/bigScreen/index_enp_blue.vue
View File

@ -184,8 +184,14 @@
</el-dropdown>
</div>
</div>
<div class="wraning_icon"></div>
<div class="wraning_icon">
</div>
<div class="user_icon" @click="backSystem"></div>
<div class="dark_config">
<el-button :icon="config.dark ? 'el-icon-sunny' : 'el-icon-moon'" circle type="info"
@click="configDark" size="small"></el-button>
</div>
</div>
</div>
</el-header>
@ -651,6 +657,17 @@ export default {
intervalinfo: null, //窗口数据更新定时器
};
},
watch: {
'config.dark'(val) {
if (val) {
document.documentElement.classList.add("dark")
this.$TOOL.data.set("APP_DARK", val)
} else {
document.documentElement.classList.remove("dark")
this.$TOOL.data.remove("APP_DARK")
}
}
},
created() {
document.documentElement.classList.add("dark");
this.$TOOL.data.set("APP_DARK", true);
@ -1167,6 +1184,12 @@ header {
background-size: cover;
background-image: url("/public/img/enp_blue/user_enp.png");
}
.dark_config {
width: 2.3vh;
height: 2.3vh;
margin-top: 0.9vh;
margin-left: 2vh;
}
.model {
top: 8%;

7
src/views/em/mpoint_form.vue
View File

@ -149,6 +149,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="计算系数" label-width="90">
<el-input-number
v-model="form.coefficient"
></el-input-number>
</el-form-item>
</el-col>
<el-col :md="24" :sm="24">
<el-form-item label="计算公式">
<el-input

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

@ -99,32 +99,22 @@ export default {
//月目标
let paramsGoal = {};
paramsGoal.page = 0;
paramsGoal.mgroup = that.query.mgroup;
that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
if (ress.length > 0) {
let monthGoal = [];
ress.forEach((goal) => {
if (goal.goal_cate_name == "单位产品分布电耗（KW·h/t）") {
monthGoal[0] = goal.goal_val;
monthGoal[1] = goal.goal_val_2;
monthGoal[2] = goal.goal_val_3;
monthGoal[3] = goal.goal_val_4;
monthGoal[4] = goal.goal_val_5;
monthGoal[5] = goal.goal_val_6;
monthGoal[6] = goal.goal_val_7;
monthGoal[7] = goal.goal_val_8;
monthGoal[8] = goal.goal_val_9;
monthGoal[9] = goal.goal_val_10;
monthGoal[10] = goal.goal_val_11;
monthGoal[11] = goal.goal_val_12;
monthGoal[12] = goal.goal_val_12;
that.monthGoal = monthGoal;
this.$API.mtm.mgroup.list
.req({page:0, search:"煤磨"})
.then((res) =>{
that.query.mgroup = res[0].id;
let params = {};
params.page = 0;
params.year = year;
params.mgroup = that.query.mgroup;
this.$API.mtm.goal.list.req(params).then((res) => {
let data = [];
if (res.length > 0) {
data = res[0];
}
console.log(data);
that.getData(data);
});
this.getData();
} else {
this.getData();
}
});
},
methods: {
@ -181,25 +171,25 @@ export default {
arr.push(item.total_production);
arr.push(item.production_hour);
arr.push(item.run_rate);
arr.push(item.production_cost_unit);
//质量
arr[6] =
item.煤粉_细度_rate_pass != null
? item.煤粉_细度_rate_pass
arr[5] =
item.出磨煤粉_细度_rate_pass !== undefined && item.出磨煤粉_细度_rate_pass !== null
? item.出磨煤粉_细度_rate_pass
: "/";
arr[7] =
item.煤粉_水分_rate_pass != null
? item.煤粉_水分_rate_pass
arr[6] =
item.出磨煤粉_水分_rate_pass !== undefined && item.出磨煤粉_水分_rate_pass !== null
? item.出磨煤粉_水分_rate_pass
: "/";
//设备
arr[8] =
item.煤磨排风机_consume_unit != null
arr[7] =
item.煤磨排风机_consume_unit !== undefined && item.煤磨排风机_consume_unit !== null
? item.煤磨排风机_consume_unit
: "/";
let keyVale = "goal_val_" + n;
arr[9] = item.elec_consume_unit; //当期值（KW·h/t）
arr[10] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
arr[11] = item.celec_consume_unit - arr[10]; //当期与目标差值（KW·h/t）
arr[8] = item.elec_consume_unit; //当期值（KW·h/t）
arr[9] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
arr[10] = item.celec_consume_unit - arr[9]; //当期与目标差值（KW·h/t）
let ind_pre = 0,
huanqi = 0,
huanqicha = 0,
@ -213,19 +203,19 @@ export default {
} else {
ind_pre = n - 1;
huanqi = wrapArr[ind_pre]
? wrapArr[ind_pre].elec_consume_unit
? wrapArr[ind_pre].elec_consume_unit>=0
? wrapArr[ind_pre].elec_consume_unit
: "/"
: "/";
}
arr[12] = huanqi; //环期值（KW·h/t）上个月的值
arr[11] = huanqi; //环期值（KW·h/t）上个月的值
if (huanqi !== "/") {
huanqicha = item.celec_consume_unit - huanqi;
} else {
huanqicha = item.celec_consume_unit;
}
arr[13] = huanqicha; //当期与环期差值（KW·h/t）
arr[14] =
arr[12] = huanqicha; //当期与环期差值（KW·h/t）
arr[13] =
huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%）
if (wrapArr0[n]) {
tongqicha =
@ -236,8 +226,8 @@ export default {
tongqicha = item.celec_consume_unit;
tongqi = 0;
}
arr[15] = tongqi; //同比增长率（%）
arr[16] = 0; //同比增长率（%）
arr[14] = tongqi; //同比增长率（%）
arr[15] = 0.0; //得分
wrapArr[ind] = arr;
});
console.log(wrapArr);

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

@ -142,11 +142,17 @@ export default {
that.monthGoal = monthGoal;
}
});
this.getData();
} else {
this.getData();
}
});
this.$API.mtm.mgroup.list
.req({ page: 0, search: "煤磨" })
.then((res) => {
console.log("煤磨", res);
that.query.mgroup = res[0].id;
this.getData();
});
},
methods: {
// 动态绑定Class
@ -203,7 +209,7 @@ export default {
that.monthGoal[ind] !== undefined
? that.monthGoal[ind]
: "/";
wrapArr[ind] = arr;
wrapArr.push(arr);
});
wrapArr.forEach((item, index) => {
let arrs = [];
@ -214,20 +220,20 @@ export default {
//当期与目标差值（KW·h/t）
let diff = 0;
if (item[2] !== "/") {
diff = item[1] - item[2];
diff = (item[1] - item[2]).toFixed(2);
} else {
diff = "/";
}
arrs[3] = diff;
//环期值（KW·h/t）上个月的值
let lastNum = 0;
if (index > 1) {
if (index > 0) {
let num = index - 1;
if (
wrapArr[num] &&
wrapArr[num].elec_consume_unit
wrapArr[num][1]
) {
lastNum = wrapArr[num].elec_consume_unit;
lastNum = wrapArr[num][1];
} else {
lastNum = "/";
}
@ -241,7 +247,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 = "/";
}

1
src/views/enm_energy/electric.vue
View File

@ -1,4 +1,3 @@
<!-- 全厂电量统计 -->
<template>
<div class="app-container">
<el-header>

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

@ -485,9 +485,10 @@ export default {
obj.mgroup__name = "回转窑";
obj.page = 0;
obj.enabled = 1;
obj.material__code__in = "elec,elec_0";
obj.ep_monitored__isnull = 0;
obj.need_display = 1;
obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0";
this.$API.enm.mpoint.list.req(obj).then((res) => {
console.log("mpoints", res);
let arr = [];
@ -730,7 +731,10 @@ export default {
data.forEach((item) => {
let ind = item.month_s - 1;
let index = that.mpoints.indexOf(item.mpoint_name); //第几个mpoint
if(index != undefined){
seriesData[index][ind] = item.elec_consume_unit;
}
});
let options = { ...that.option3 };
for (let j = 0; j < that.mpoints.length; j++) {

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

@ -480,7 +480,8 @@ export default {
//当期与目标差值（KW·h/t）
let diff = 0;
if (arrs[2] !== "/") {
diff = arrs[1] - arrs[2];
diff = (arrs[1] - arrs[2]).toFixed(2)
;
} else {
diff = "/";
}
@ -507,7 +508,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 = "/";
}
@ -519,7 +520,7 @@ export default {
lastNum !== "/" &&
lastNum !== 0
) {
lastRate = (lastDiff / lastNum) * 100;
lastRate = ((lastDiff / lastNum) * 100).toFixed(2);
} else {
lastRate = "/";
}
@ -628,7 +629,7 @@ export default {
: "/";
}
if (arrs3[1] !== "/" && lastNum3 !== "/") {
lastDiff3 = arrs3[1] - lastNum3;
lastDiff3 = (arrs3[1] - lastNum3).toFixed(2);
} else {
lastDiff3 = "/";
}

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

@ -197,11 +197,12 @@ export default {
this.$API.mtm.mgroup.list
.req({ page: 0, search: "水泥磨" })
.then((res) => {
console.log("水泥磨", res);
that.query.mgroup = res[0].id;
//月目标
this.getMonthGoal();
this.getData();
});
},
methods: {
// 动态绑定Class
@ -229,6 +230,7 @@ export default {
that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
if (ress.length > 0) {
let monthGoal = [];
let monthGoal2 = [];
ress.forEach((goal) => {
if (
goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
@ -266,8 +268,7 @@ export default {
monthGoal2[12] = goal.goal_val_12;
that.monthGoal2 = monthGoal2;
}
});
this.getData();
})
} else {
this.getData();
}
@ -312,7 +313,7 @@ export default {
that.monthGoal[ind] !== undefined
? that.monthGoal[ind]
: "/";
wrapArr[ind] = arr;
wrapArr.push(arr);
});
wrapArr.forEach((item, index) => {
let ind = item.month_s;
@ -327,13 +328,14 @@ export default {
//当期与环期差值（KW·h/t）
let lastNum = 0,
lastDiff = 0;
if (index > 1) {
if (index > 0) {
let num = index - 1;
if (
wrapArr[num] &&
wrapArr[num].elec_consume_unit
wrapArr[num][1]
) {
lastNum = wrapArr[num].elec_consume_unit;
lastNum = wrapArr[num][1];
} else {
lastNum = "/";
}
@ -351,7 +353,7 @@ export default {
//环比增长率（%）
let lastRate = 0;
if (
lastDiff == "/" &&
lastDiff !== "/" &&
lastNum !== "/" &&
lastNum !== 0
) {

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

@ -125,7 +125,7 @@ export default {
methods: {
//获取工段列表
getMgroup() {
this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => {
this.$API.mtm.mgroup.list.req({ page: 0, cate: 'section' }).then(res => {
res.forEach(item => {
if (item.name !== '煤磨' && item.name !== '水泥包装') {
this.mgroupOptions.push(item);
@ -133,7 +133,8 @@ export default {
})
this.mgroupOptions = this.mgroupOptions.reverse();
this.query.mgroup = this.mgroupOptions[0].id;
this.tableName = '电石渣干粉核算'
this.tableName = this.mgroupOptions[0].name;
this.getTableData();
})
},
//班组列表
@ -143,6 +144,7 @@ export default {
})
},
mgroupChange(value) {
if(value){
let arr = this.mgroupOptions.filter(item => {
return item.id == value
})
@ -156,6 +158,8 @@ export default {
} else if (name == '水泥磨') {
this.tableName = '水泥核算'
}
}
},
//查询类型

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

@ -216,8 +216,9 @@
that.header3 = ['比表面积','SO3','掺量'];//检测项
that.header4 = ['平均值','检次','合次','及格率','平均值','检次','合次','及格率','平均值','检次','合次','及格率'];//检测项
}
let params = {};
let params = {page: 0};
let arr = [];
if(that.query.type==0){//日
arr = that.query.month.split('-');
params.year_s = arr[0];
@ -229,7 +230,7 @@
}
params.mgroup__belong_dept = that.query.belong_dept;
this.$API.enm.enstat.req(params).then((res) => {
let data = res.results;
let data = res;
let wrapArr = [];
let innerArr = [];
let ind = 0;
@ -292,14 +293,14 @@
itemArr[ind] = item3.val_avg.toFixed(2);
itemArr.push(item3.num_test)
itemArr.push(item3.num_ok)
let pass = (item3.rate_pass*100).toFixed(2);
let pass = (item3.rate_pass).toFixed(2);
pass= pass+'%';
itemArr.push(pass)
}else{
itemArr.push(item3.val_avg.toFixed(2))
itemArr.push(item3.num_test)
itemArr.push(item3.num_ok)
let pass = (item3.rate_pass*100).toFixed(2);
let pass = (item3.rate_pass).toFixed(2);
pass= pass+'%';
itemArr.push(pass)
}

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

@ -63,7 +63,7 @@
<th>CaO（%）</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>
@ -216,18 +216,18 @@ export default {
item.循环风机_consume_unit != null
? item.循环风机_consume_unit
: "/";
arr[13] =
arr[14] =
item.尾排风机_consume_unit != null
? item.尾排风机_consume_unit
: "/";
arr[13] =
item.废气风机_consume_unit != null
? item.废气风机_consume_unit
arr[15] =
item.立磨主电机_consume_unit != null
? item.立磨主电机_consume_unit
: "/";
//
arr[16] = item.elec_consume_unit; //当期值（KW·h/t）
let keyVale = "goal_val_" + n;
arr[17] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
arr[17] = goalData[keyVale]?goalData[keyVale]:0; //目标值（KW·h/t）//需要接口获取
arr[18] = item.celec_consume_unit - arr[16]; //当期与目标差值（KW·h/t）
let ind_pre = 0,
huanbi = 0;

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

@ -126,6 +126,7 @@ export default {
that.query.mgroup = res[0].id;
//月目标
that.getMonthGoal();
that.getData();
});
},
methods: {
@ -174,7 +175,6 @@ export default {
that.monthGoal = monthGoal;
}
});
this.getData();
} else {
this.getData();
}
@ -218,7 +218,7 @@ export default {
that.monthGoal[ind] !== undefined
? that.monthGoal[ind]
: "/";
wrapArr[ind] = arr;
wrapArr.push(arr);
});
wrapArr.forEach((item, index) => {
let arrs = [];
@ -236,13 +236,13 @@ export default {
arrs[3] = diff;
//环期值（KW·h/t）上个月的值
let lastNum = 0;
if (index > 1) {
if (index > 0) {
let num = index - 1;
if (
wrapArr[num] &&
wrapArr[num].elec_consume_unit
wrapArr[num][1]
) {
lastNum = wrapArr[num].elec_consume_unit;
lastNum = wrapArr[num][1];
} else {
lastNum = "/";
}

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

@ -238,9 +238,9 @@ export default {
let num = index - 1;
if (
wrapArr[num] &&
wrapArr[num].elec_consume_unit
wrapArr[num][1]
) {
lastNum = wrapArr[num].elec_consume_unit;
lastNum = wrapArr[num][1];
} else {
lastNum = "/";
}

10
src/views/login/components/passwordForm.vue
View File

@ -133,10 +133,12 @@ export default {
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
if (this.redirect) {
base_dashboard = this.redirect;
}
else if (base_dashboard == null || base_dashboard == undefined) {
// 去除重定向因客户不理解
// if (this.redirect) {
// base_dashboard = this.redirect;
// }
// else
if (base_dashboard == null || base_dashboard == undefined) {
base_dashboard = '/dashboard'
}
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {

9
src/views/login/components/phoneForm.vue
View File

@ -102,10 +102,11 @@ export default {
that.$TOOL.data.set("USER_INFO", res1);
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
if (this.redirect) {
base_dashboard = this.redirect;
}
else if (base_dashboard == null || base_dashboard == undefined) {
// if (this.redirect) {
// base_dashboard = this.redirect;
// }
// else
if (base_dashboard == null || base_dashboard == undefined) {
base_dashboard = '/dashboard'
}
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {

4
src/views/pm/mtask_drawer.vue
View File

@ -169,7 +169,9 @@ export default {
return this;
},
table_edit(row) {
this.form = Object.assign(row, this.form);
this.form = {};
let item = row;
this.form = Object.assign(item, this.form);
this.dialogVisible = true;
},
updateMtaskSubmit() {