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-11-13 17:01:26 +08:00
parent 07958e9a57 e611c4597b
commit 6fd716d4ba
17 changed files with 156 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.env.development
View File

@ -16,17 +16,17 @@ VUE_APP_PJ = ''
# VUE_APP_API_BASEURL = http://127.0.0.1:8887/api
#测试环境
# VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
#VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
VUE_APP_API_BASEURL = http://10.50.211.228:2250/api
# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
# VUE_APP_BASEURL = http://10.50.211.228:2250/
VUE_APP_BASEURL = http://10.50.211.228:2250/
# VUE_APP_BASEURL = http://127.0.0.1:8887
#VUE_APP_BASEURL = http://127.0.0.1:2226
# VUE_APP_BASEURL = http://127.0.0.1:2226
# #光子
VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
VUE_APP_BASEURL = http://49.232.14.174:2226
# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
# VUE_APP_BASEURL = http://49.232.14.174:2226
#
# 本地端口
VUE_APP_PORT = 2800

4
src/config/route.js
View File

@ -792,7 +792,7 @@ const routes = [
path: "/enm_mill",
meta: {
title: "水泥磨",
icon: "el-icon-help-filled",
icon: "el-icon-menu",
type: "menu",
perms: ["enm_mill"],
},
@ -855,7 +855,7 @@ const routes = [
path: "/enm_pack",
meta: {
title: "水泥包装",
icon: "el-icon-goods-filled",
icon: "el-icon-menu",
type: "menu",
perms: ["enm_pack"],
},

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

@ -584,7 +584,7 @@ export default {
);
that.tableDatas[4][5] = data1.elec_consume_unit;
that.tableDatas[4][9] = precen(
that.tableDatas[4][5],
(that.tableDatas[4][5]-that.tableDatas[4][8]),
that.tableDatas[4][8]
);
} else {
@ -622,7 +622,7 @@ export default {
);
that.tableDatas[4][4] = data2.elec_consume_unit;
that.tableDatas[4][7] = precen(
that.tableDatas[4][4],
(that.tableDatas[4][4]-that.tableDatas[4][6]),
that.tableDatas[4][6]
);
}

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

@ -61,10 +61,10 @@
>
<div :class="bindClass(item1, ind)">
<span v-if="item1 > 0 && ind == 3"
>↑</span
>▲</span
>
<span v-if="item1 < 0 && ind == 3"
>↓</span
>▼</span
>
<span v-if="item1 > 0 && ind == 5"
>▲</span
@ -162,11 +162,11 @@ export default {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = true;
classInfo.redColor = false;
} else if (item < 0) {
classInfo.redColor = true;
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}
@ -266,7 +266,7 @@ export default {
if (
lastDiff !== "/" &&
lastNum !== "/" &&
lastNum !== 0
lastNum != 0
) {
lastRate = this.precen(lastDiff, lastNum);
} else {

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

@ -146,7 +146,7 @@
yearStart:'',
},
deptName:'',
tableName:'全场能源日统计',
tableName:'全厂能源日统计',
options:[
{id:0,name:'日统计'},
{id:1,name:'月统计'},
@ -172,11 +172,11 @@
methods: {
typeCange(value){
if(value==1){
this.tableName = '全场能源日统计'
this.tableName = '全厂能源日统计'
}else if(value==1){
this.tableName = '全场能源月统计'
this.tableName = '全厂能源月统计'
}else{
this.tableName = '全场能源年统计'
this.tableName = '全厂能源年统计'
}
},
deptChange(e){

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

@ -804,29 +804,29 @@ export default {
);
that.tableDatas[4][5] = data1.elec_consume_unit;
that.tableDatas[4][9] = precen(
that.tableDatas[4][5],
(that.tableDatas[4][5]-that.tableDatas[4][8]),
that.tableDatas[4][8]
);
that.tableDatas[5][5] =
data1.celec_consume_unit;
that.tableDatas[5][9] = precen(
that.tableDatas[5][5],
(that.tableDatas[5][5]-that.tableDatas[5][8]),
that.tableDatas[5][8]
);
that.tableDatas[6][5] = data1.coal_consume_unit;
that.tableDatas[6][9] = precen(
that.tableDatas[6][5],
(that.tableDatas[6][5]-that.tableDatas[6][8]),
that.tableDatas[6][8]
);
that.tableDatas[7][5] = data1.cen_consume_unit;
that.tableDatas[7][9] = precen(
that.tableDatas[7][5],
(that.tableDatas[7][5]-that.tableDatas[7][8]),
that.tableDatas[7][8]
);
that.tableDatas[8][5] =
data1.production_cost_unit;
that.tableDatas[8][9] = precen(
that.tableDatas[8][5],
(that.tableDatas[8][5]-that.tableDatas[8][8]),
that.tableDatas[8][8]
);
} else {
@ -864,29 +864,29 @@ export default {
);
that.tableDatas[4][4] = data2.elec_consume_unit;
that.tableDatas[4][7] = precen(
that.tableDatas[4][4],
that.tableDatas[4][4]-that.tableDatas[4][6],
that.tableDatas[4][6]
);
that.tableDatas[5][4] =
data2.celec_consume_unit;
that.tableDatas[5][7] = precen(
that.tableDatas[5][4],
that.tableDatas[5][4]-that.tableDatas[5][6],
that.tableDatas[5][6]
);
that.tableDatas[6][4] = data2.coal_consume_unit;
that.tableDatas[6][7] = precen(
that.tableDatas[6][4],
that.tableDatas[6][4]-that.tableDatas[6][6],
that.tableDatas[6][6]
);
that.tableDatas[7][4] = data2.cen_consume_unit;
that.tableDatas[7][7] = precen(
that.tableDatas[7][4],
that.tableDatas[7][4]-that.tableDatas[7][6],
that.tableDatas[7][6]
);
that.tableDatas[8][4] =
data2.production_cost_unit;
that.tableDatas[8][7] = precen(
that.tableDatas[8][4],
that.tableDatas[8][4]-that.tableDatas[8][6],
that.tableDatas[8][6]
);
}

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

@ -71,12 +71,12 @@
:key="ind"
class="numCell"
>
<div :class="bindClass(item1, ind)">
<div :class="bindClass1(item1, ind)">
<span v-if="item1 > 0 && ind == 3"
>↑</span
>▲</span
>
<span v-if="item1 < 0 && ind == 3"
>↓</span
>▼</span
>
<span v-if="item1 > 0 && ind == 5"
>▲</span
@ -127,11 +127,17 @@
:key="ind"
class="numCell"
>
<div :class="bindClass(item1, ind)">
<div :class="bindClass2(item1, ind)">
<span v-if="item1 > 0 && ind == 6"
>▲</span
>
<span v-if="item1 < 0 && ind == 6"
<span v-if="item1 < 0 && ind == 6"
>▼</span
>
<span v-if="item1 > 0 && ind == 7"
>▲</span
>
<span v-if="item1 < 0 && ind == 7"
>▼</span
>
{{ item1 }}
@ -177,13 +183,19 @@
:key="ind"
class="numCell"
>
<div :class="bindClass(item1, ind)">
<div :class="bindClass3(item1, ind)">
<span v-if="item1 > 0 && ind == 6"
>▲</span
>
<span v-if="item1 < 0 && ind == 6"
>▼</span
>
<span v-if="item1 > 0 && ind == 7"
>▲</span
>
<span v-if="item1 < 0 && ind == 7"
>▼</span
>
{{ item1 }}
</div>
</td>
@ -227,13 +239,19 @@
:key="ind"
class="numCell"
>
<div :class="bindClass(item1, ind)">
<div :class="bindClass4(item1, ind)">
<span v-if="item1 > 0 && ind == 6"
>▲</span
>
<span v-if="item1 < 0 && ind == 6"
>▼</span
>
<span v-if="item1 > 0 && ind == 7"
>▲</span
>
<span v-if="item1 < 0 && ind == 7"
>▼</span
>
{{ item1 }}
</div>
</td>
@ -318,17 +336,65 @@ export default {
},
methods: {
// 动态绑定Class
bindClass(item, index) {
bindClass1(item, index) {
let classInfo = { redColor: false, greenColor: false };
if (index == 3 || index == 5|| index == 6) {
if (index == 3 || index == 5) {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = true;
classInfo.redColor = false;
} else if (item < 0) {
classInfo.redColor = true;
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}
return classInfo;
},
bindClass2(item, index) {
let classInfo = { redColor: false, greenColor: false };
if (index == 6 || index == 7) {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}
return classInfo;
},
bindClass3(item, index) {
let classInfo = { redColor: false, greenColor: false };
if (index == 6 || index == 7) {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}
return classInfo;
},
bindClass4(item, index) {
let classInfo = { redColor: false, greenColor: false };
if (index == 6 || index == 7) {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}

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

@ -737,18 +737,18 @@ export default {
);
that.tableDatas[4][5] = data1.elec_consume_unit;
that.tableDatas[4][9] = precen(
that.tableDatas[4][5],
that.tableDatas[4][5]-that.tableDatas[4][8],
that.tableDatas[4][8]
);
that.tableDatas[5][5] = data1.cen_consume_unit;
that.tableDatas[5][9] = precen(
that.tableDatas[5][5],
that.tableDatas[5][5]-that.tableDatas[5][8],
that.tableDatas[5][8]
);
that.tableDatas[6][5] =
data1.production_cost_unit;
that.tableDatas[6][9] = precen(
that.tableDatas[6][5],
that.tableDatas[6][5]-that.tableDatas[6][8],
that.tableDatas[6][8]
);
} else {
@ -786,18 +786,18 @@ export default {
);
that.tableDatas[4][4] = data2.elec_consume_unit;
that.tableDatas[4][7] = precen(
that.tableDatas[4][4],
that.tableDatas[4][4]-that.tableDatas[4][6],
that.tableDatas[4][6]
);
that.tableDatas[5][4] = data2.cen_consume_unit;
that.tableDatas[5][7] = precen(
that.tableDatas[5][4],
that.tableDatas[5][4]-that.tableDatas[5][6],
that.tableDatas[5][6]
);
that.tableDatas[6][4] =
data2.production_cost_unit;
that.tableDatas[6][7] = precen(
that.tableDatas[6][4],
that.tableDatas[6][4]-that.tableDatas[6][6],
that.tableDatas[6][6]
);
}

4
src/views/enm_monthSet/goalSetting.vue
View File

@ -42,14 +42,14 @@
@click="handleQuery"
></el-button>
</div>
<!-- <div class="right-panel">
<div class="right-panel">
<el-button
type="primary"
icon="el-icon-plus"
@click="roleAdd"
v-auth="'goal.create'"
></el-button>
</div> -->
</div>
</el-header>
<el-main class="nopadding">
<scTable

4
src/views/enm_monthSet/priceset.vue
View File

@ -29,14 +29,14 @@
@click="handleQuery"
></el-button>
</div>
<!-- <div class="right-panel">
<div class="right-panel">
<el-button
type="primary"
icon="el-icon-plus"
@click="table_add"
v-auth="'priceset.create'"
></el-button>
</div> -->
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id">

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

@ -642,7 +642,7 @@ export default {
that.tableDatas[9][7]
);//计算年完成度
that.tableDatas[9][6] = precen(
that.tableDatas[9][3],
that.tableDatas[9][3]-that.tableDatas[9][5],
that.tableDatas[9][5]
);// 计算月完成度

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

@ -61,10 +61,10 @@
>
<div :class="bindClass(item1, ind)">
<span v-if="item1 > 0 && ind == 3"
>↑</span
>▲</span
>
<span v-if="item1 < 0 && ind == 3"
>↓</span
>▼</span
>
<span v-if="item1 > 0 && ind == 5"
>▲</span
@ -136,11 +136,11 @@ export default {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = true;
classInfo.redColor = false;
} else if (item < 0) {
classInfo.redColor = true;
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}

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

@ -845,7 +845,7 @@ export default {
this.$API.enm.enstat.req(params4).then((res4) => {
if (res4.length > 0) {
let data4 = res4[0];
that.tableDatas[0][2] = data4.total_production;
that.tableDatas[0][2] = data4.total_production < 1 ? 0 : data4.total_production;
that.tableDatas[4][2] = data4.elec_consume_unit;
that.tableDatas[5][2] = data4.production_cost_unit;
}
@ -934,13 +934,13 @@ export default {
that.tableDatas[4][5] =
data1.elec_consume_unit;
that.tableDatas[4][9] = precen(
that.tableDatas[4][5],
(that.tableDatas[4][5]-that.tableDatas[4][8]),
that.tableDatas[4][8]
);
that.tableDatas[5][5] =
data1.production_cost_unit;
that.tableDatas[5][9] = precen(
that.tableDatas[5][5],
(that.tableDatas[5][5]-that.tableDatas[5][8]),
that.tableDatas[5][8]
);
} else {
@ -987,13 +987,13 @@ export default {
that.tableDatas[4][4] =
data2.elec_consume_unit;
that.tableDatas[4][7] = precen(
that.tableDatas[4][4],
(that.tableDatas[4][4]-that.tableDatas[4][6]),
that.tableDatas[4][6]
);
that.tableDatas[5][4] =
data2.production_cost_unit;
that.tableDatas[5][7] = precen(
that.tableDatas[5][4],
(that.tableDatas[5][4]-that.tableDatas[5][6]),
that.tableDatas[5][6]
);
}

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

@ -61,10 +61,10 @@
>
<div :class="bindClass(item1, ind)">
<span v-if="item1 > 0 && ind == 3"
>↑</span
>▲</span
>
<span v-if="item1 < 0 && ind == 3"
>↓</span
>▼</span
>
<span v-if="item1 > 0 && ind == 5"
>▲</span
@ -134,13 +134,14 @@ export default {
bindClass(item, index) {
let classInfo = { redColor: false, greenColor: false };
if (index == 3 || index == 5) {
if (typeof item == "number") {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = true;
classInfo.redColor = false;
} else if (item < 0) {
classInfo.redColor = true;
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}
@ -256,7 +257,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 = "/";
}
@ -266,7 +267,8 @@ export default {
if (
lastDiff !== "/" &&
lastNum !== "/" &&
lastNum !== 0
lastNum != 0
) {
lastRate = ((lastDiff / lastNum) * 100).toFixed(2);
} else {
@ -280,10 +282,10 @@ export default {
wrapArr0[index].elec_consume_unit
) {
sameRate =
((arrs[1] -
(((arrs[1] -
wrapArr0[index].elec_consume_unit) /
wrapArr0[index].elec_consume_unit) *
100;
100).toFixed(2);
} else {
sameRate = "/";
}

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

@ -592,13 +592,13 @@ export default {
);
that.tableDatas[1][4] = data1.elec_consume_unit;
that.tableDatas[1][8] = precen(
that.tableDatas[1][4],
(that.tableDatas[1][4]-that.tableDatas[1][7]),
that.tableDatas[1][7]
);
that.tableDatas[2][4] =
data1.production_cost_unit;
that.tableDatas[2][8] = precen(
that.tableDatas[2][4],
(that.tableDatas[2][4]-that.tableDatas[2][7]),
that.tableDatas[2][7]
);
if (data1.imaterial_data.length > 0) {
@ -630,13 +630,13 @@ export default {
);
that.tableDatas[1][3] = data2.elec_consume_unit;
that.tableDatas[1][6] = precen(
that.tableDatas[1][3],
(that.tableDatas[1][3]-that.tableDatas[1][5]),
that.tableDatas[1][5]
);
that.tableDatas[2][3] =
data2.production_cost_unit;
that.tableDatas[2][6] = precen(
that.tableDatas[2][3],
(that.tableDatas[2][3]-that.tableDatas[2][5]),
that.tableDatas[2][5]
);
if (data2.imaterial_data.length > 0) {

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

@ -183,7 +183,7 @@ export default {
arr[4] = item.elec_consume_unit; //当期值（KW·h/t）
let keyVale = "goal_val_" + n;
arr[5] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
arr[6] = arr[4] - arr[5]; //当期与目标差值（KW·h/t）
arr[6] = (arr[4] - arr[5]).toFixed(2); //当期与目标差值（KW·h/t）
let ind_pre = 0,
huanqi = 0,
huanqicha = 0,

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

@ -59,10 +59,10 @@
>
<div :class="bindClass(item1, ind)">
<span v-if="item1 > 0 && ind == 3"
>↑</span
>▲</span
>
<span v-if="item1 < 0 && ind == 3"
>↓</span
>▼</span
>
<span v-if="item1 > 0 && ind == 5"
>▲</span
@ -169,11 +169,11 @@ export default {
if ( item != "/") {
item = Number(item);
if (item > 0) {
classInfo.greenColor = true;
classInfo.redColor = false;
} else if (item < 0) {
classInfo.redColor = true;
classInfo.greenColor = false;
classInfo.redColor = true;
} else if (item < 0) {
classInfo.redColor = false;
classInfo.greenColor = true;
}
}
}