diff --git a/src/assets/icons/Elec.vue b/src/assets/icons/Elec.vue
new file mode 100644
index 00000000..567ddcc8
--- /dev/null
+++ b/src/assets/icons/Elec.vue
@@ -0,0 +1,5 @@
+
+
+
diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js
index d8fa74ea..fe8a6acb 100644
--- a/src/assets/icons/index.js
+++ b/src/assets/icons/index.js
@@ -22,4 +22,5 @@ export { default as Shebei } from './Shebei.vue'
export { default as Xiaoshou } from './Xiaoshou.vue'
export { default as Zhixing } from './Zhixing.vue'
export { default as Zhizao } from './Zhizao.vue'
-export { default as Env } from './Env.vue'
\ No newline at end of file
+export { default as Env } from './Env.vue'
+export { default as Elec } from './Elec.vue'
\ No newline at end of file
diff --git a/src/config/route.js b/src/config/route.js
index 7b563ac6..0c85fbfa 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -235,7 +235,7 @@ const routes = [
path: "/enm_slag",
meta: {
title: "电石渣",
- icon: "el-icon-opportunity",
+ icon: "el-icon-menu",
type: "menu",
perms: ["enm_slag"],
},
@@ -341,7 +341,7 @@ const routes = [
path: "/enm_rm",
meta: {
title: "原料磨",
- icon: "el-icon-list",
+ icon: "el-icon-menu",
type: "menu",
perms: ["enm_rm"],
},
@@ -404,7 +404,7 @@ const routes = [
path: "/enm_rmbase",
meta: {
title: "原料磨",
- icon: "el-icon-list",
+ icon: "el-icon-menu",
type: "menu",
perms: ["enm_rmbase"],
},
@@ -467,7 +467,7 @@ const routes = [
path: "/enm_coal",
meta: {
title: "煤磨",
- icon: "el-icon-brush-filled",
+ icon: "el-icon-menu",
type: "menu",
perms: ["enm_coal"],
},
@@ -530,7 +530,7 @@ const routes = [
path: "/enm_coalbase",
meta: {
title: "煤磨",
- icon: "el-icon-brush-filled",
+ icon: "el-icon-menu",
type: "menu",
perms: ["enm_coalbase"],
},
@@ -921,7 +921,7 @@ const routes = [
path: "/enm_energy",
meta: {
title: "电量报表",
- icon: "el-icon-share",
+ icon: "sc-icon-elec",
type: "menu",
perms: ["enm_energy"],
},
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index 53ee4bb2..fa5da65a 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -113,13 +113,12 @@ export default {
});
},
methods: {
- getData() {
+ getData(goalData) {
let that = this;
let query0 = {};
query0.page = 0;
query0.type = "month_st";
query0.year_s = that.query.year_s - 1;
- query0.mgroup = "3346520558031773696";
let wrapArr = [],
wrapArr0 = [],
wrapArrs = [];
@@ -167,7 +166,7 @@ export default {
arr[3] = item.elec_consume_unit; //当期值（KW·h/t）
let keyVale = "goal_val_" + n;
arr[4] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
- arr[5] = arr[3] - item.celec_consume_unit; //当期与目标差值（KW·h/t）
+ arr[5] = arr[3] - arr[4]; //当期与目标差值（KW·h/t）
let ind_pre = 0,
huanbi = 0;
if (item.month_s == 1) {
@@ -184,13 +183,35 @@ export default {
: "/";
}
arr[6] = huanbi; //环期值（KW·h/t）上个月的值
- arr[7] = item.celec_consume_unit; //当期与环期差值（KW·h/t）
- arr[8] = item.celec_consume_unit; //环比增长率（%）
- arr[9] = item.celec_consume_unit; //同比增长率（%）
- arr[10] = item.celec_consume_unit; //同比增长率（%）
+ let diff = 0;
+ if (arr[6] == "/"){
+ diff == "/";
+ }else{
+ diff = arr[3] - arr[6]; //当期与环期差值（KW·h/t）
+ }
+ arr[7] = diff;
+ if (arr[7]=="/" || arr[6]=="/" || arr[6]==0){
+ arr[8] = "/";
+ }else{
+ arr[8] = (arr[7]/arr[6])*100 //环比增长率（%）= 当期与环期差值（KW·h/t）/环期值（KW·h/t）*100%
+ }
+ let sameRate = 0;
+ if (
+ wrapArr0[ind] &&
+ wrapArr0[ind].elec_consume_unit
+ ) {
+ sameRate =
+ ((arrs[1] -
+ wrapArr0[ind].elec_consume_unit) /
+ wrapArr0[ind].elec_consume_unit) *
+ 100;
+ } else {
+ sameRate = "/";
+ }
+ arr[9] = sameRate; ///同比增长率（%）需要当前值/ 上一年同一个月的值即wrapArr0[ind].elec_consume_unit
+ // arr[10] = item.celec_consume_unit; //同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit
wrapArr[ind] = arr;
});
- console.log(wrapArr);
that.tableDatas = wrapArr;
} else {
}
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index 55ea4a51..9d129930 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -240,9 +240,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 = "/";
}
diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue
index 194a0d47..5f9ae29d 100644
--- a/src/views/enm_rm/logDetail.vue
+++ b/src/views/enm_rm/logDetail.vue
@@ -22,6 +22,7 @@
type="primary"
@click.stop="addStlog"
v-if="activeName == 'fourth'"
+ v-auth="'sflogexp.create'"
style="
position: absolute;
top: 6px;
@@ -129,7 +130,7 @@
保存
@@ -168,7 +169,7 @@
type="primary"
:loading="isSaveing"
@click="submit5(item)"
- style="margin-left: 20px"
+ style="margin-left: 20px" v-auth="'mpointstat.create'"
>保存
@@ -225,6 +226,7 @@
size="small"
@click="mpointStat_del(scope.row)"
type="danger"
+ v-auth="'mpointstat.delete'"
>删除
@@ -539,6 +541,7 @@
@click="
sflogexp_edit(scope.row)
"
+ v-auth="'sflogexp.update'"
type="primary"
>编辑
diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue
index 12e404a9..009fb214 100644
--- a/src/views/enm_slag/handoverLog.vue
+++ b/src/views/enm_slag/handoverLog.vue
@@ -104,7 +104,7 @@
size="small"
@click="sflog_edit(scope.row)"
type="primary"
- >编辑详情