diff --git a/.env.development b/.env.development
index 8ad6dbf4..9f55d067 100644
--- a/.env.development
+++ b/.env.development
@@ -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
diff --git a/src/config/route.js b/src/config/route.js
index 443cda9b..3ea868c3 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -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"],
},
diff --git a/src/views/enm_coal/report.vue b/src/views/enm_coal/report.vue
index 7a37da7b..2d915d96 100644
--- a/src/views/enm_coal/report.vue
+++ b/src/views/enm_coal/report.vue
@@ -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]
);
}
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index dfb6fb22..c57c2f38 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -61,10 +61,10 @@
>
↑▲
↓▼
▲ 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 {
diff --git a/src/views/enm_energy/energy.vue b/src/views/enm_energy/energy.vue
index d802afa6..9adc3be3 100644
--- a/src/views/enm_energy/energy.vue
+++ b/src/views/enm_energy/energy.vue
@@ -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){
diff --git a/src/views/enm_kiln/report.vue b/src/views/enm_kiln/report.vue
index d45f3055..a0080916 100644
--- a/src/views/enm_kiln/report.vue
+++ b/src/views/enm_kiln/report.vue
@@ -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]
);
}
diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue
index 11c1cb2c..6322201d 100644
--- a/src/views/enm_kiln/workshopAnalysis.vue
+++ b/src/views/enm_kiln/workshopAnalysis.vue
@@ -71,12 +71,12 @@
:key="ind"
class="numCell"
>
-
+
↑▲
↓▼
▲
-
+
▲
-
▼
+
▲
+
▼
{{ item1 }}
@@ -177,13 +183,19 @@
:key="ind"
class="numCell"
>
-
+
▲
▼
+ ▲
+ ▼
{{ item1 }}
@@ -227,13 +239,19 @@
:key="ind"
class="numCell"
>
-
+
▲
▼
+ ▲
+ ▼
{{ item1 }}
@@ -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;
}
}
}
diff --git a/src/views/enm_mill/report.vue b/src/views/enm_mill/report.vue
index a214b2f0..3585642a 100644
--- a/src/views/enm_mill/report.vue
+++ b/src/views/enm_mill/report.vue
@@ -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]
);
}
diff --git a/src/views/enm_monthSet/goalSetting.vue b/src/views/enm_monthSet/goalSetting.vue
index a834ba27..a02380e3 100644
--- a/src/views/enm_monthSet/goalSetting.vue
+++ b/src/views/enm_monthSet/goalSetting.vue
@@ -42,14 +42,14 @@
@click="handleQuery"
>
-
+
-
+
diff --git a/src/views/enm_pack/report.vue b/src/views/enm_pack/report.vue
index c49129a0..f3bf2f7c 100644
--- a/src/views/enm_pack/report.vue
+++ b/src/views/enm_pack/report.vue
@@ -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]
);// 计算月完成度
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index a228539b..71b20f6f 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -61,10 +61,10 @@
>
↑▲
↓▼
▲ 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;
}
}
}
diff --git a/src/views/enm_rm/report.vue b/src/views/enm_rm/report.vue
index 86f3f4ce..12ac09ab 100644
--- a/src/views/enm_rm/report.vue
+++ b/src/views/enm_rm/report.vue
@@ -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]
);
}
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 39859936..a8baa811 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -61,10 +61,10 @@
>
↑▲
↓▼
▲ 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 = "/";
}
diff --git a/src/views/enm_slag/report.vue b/src/views/enm_slag/report.vue
index 6955cd2a..56728cef 100644
--- a/src/views/enm_slag/report.vue
+++ b/src/views/enm_slag/report.vue
@@ -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) {
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index a3ca9e4a..cb4e62a4 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -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,
diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue
index 2225396f..39975123 100644
--- a/src/views/enm_slag/workshopAnalysis.vue
+++ b/src/views/enm_slag/workshopAnalysis.vue
@@ -59,10 +59,10 @@
>
↑▲
↓▼
▲ 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;
}
}
}