zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:增加水泥包装

This commit is contained in:
zty 2024-08-21 17:54:28 +08:00
parent 2a7502d023
commit 11491e1394
8 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets/icons/Elec.vue Normal file
View File

@ -0,0 +1,5 @@
<template>
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
<path fill="currentColor" d="M19.836 10.486a.9.9 0 0 1-.21.47l-9.75 10.71a.94.94 0 0 1-.49.33q-.125.015-.25 0a1 1 0 0 1-.41-.09a.92.92 0 0 1-.45-.46a.9.9 0 0 1-.07-.58l.86-6.86h-3.63a1.7 1.7 0 0 1-.6-.15a1.29 1.29 0 0 1-.68-.99a1.3 1.3 0 0 1 .09-.62l3.78-9.45c.1-.239.266-.444.48-.59a1.3 1.3 0 0 1 .72-.21h7.24c.209.004.414.055.6.15c.188.105.349.253.47.43c.112.179.18.38.2.59a1.2 1.2 0 0 1-.1.61l-2.39 5.57h3.65a1 1 0 0 1 .51.16a1 1 0 0 1 .43 1z" />
</svg>
</template>

1
src/assets/icons/index.js
View File

@ -23,3 +23,4 @@ export { default as Xiaoshou } from './Xiaoshou.vue'
export { default as Zhixing } from './Zhixing.vue' export { default as Zhixing } from './Zhixing.vue'
export { default as Zhizao } from './Zhizao.vue' export { default as Zhizao } from './Zhizao.vue'
export { default as Env } from './Env.vue' export { default as Env } from './Env.vue'
export { default as Elec } from './Elec.vue'

12
src/config/route.js
View File

@ -235,7 +235,7 @@ const routes = [
path: "/enm_slag", path: "/enm_slag",
meta: { meta: {
title: "电石渣", title: "电石渣",
icon: "el-icon-opportunity", icon: "el-icon-menu",
type: "menu", type: "menu",
perms: ["enm_slag"], perms: ["enm_slag"],
}, },
@ -341,7 +341,7 @@ const routes = [
path: "/enm_rm", path: "/enm_rm",
meta: { meta: {
title: "原料磨", title: "原料磨",
icon: "el-icon-list", icon: "el-icon-menu",
type: "menu", type: "menu",
perms: ["enm_rm"], perms: ["enm_rm"],
}, },
@ -404,7 +404,7 @@ const routes = [
path: "/enm_rmbase", path: "/enm_rmbase",
meta: { meta: {
title: "原料磨", title: "原料磨",
icon: "el-icon-list", icon: "el-icon-menu",
type: "menu", type: "menu",
perms: ["enm_rmbase"], perms: ["enm_rmbase"],
}, },
@ -467,7 +467,7 @@ const routes = [
path: "/enm_coal", path: "/enm_coal",
meta: { meta: {
title: "煤磨", title: "煤磨",
icon: "el-icon-brush-filled", icon: "el-icon-menu",
type: "menu", type: "menu",
perms: ["enm_coal"], perms: ["enm_coal"],
}, },
@ -530,7 +530,7 @@ const routes = [
path: "/enm_coalbase", path: "/enm_coalbase",
meta: { meta: {
title: "煤磨", title: "煤磨",
icon: "el-icon-brush-filled", icon: "el-icon-menu",
type: "menu", type: "menu",
perms: ["enm_coalbase"], perms: ["enm_coalbase"],
}, },
@ -921,7 +921,7 @@ const routes = [
path: "/enm_energy", path: "/enm_energy",
meta: { meta: {
title: "电量报表", title: "电量报表",
icon: "el-icon-share", icon: "sc-icon-elec",
type: "menu", type: "menu",
perms: ["enm_energy"], perms: ["enm_energy"],
}, },

37
src/views/enm_pack/teamAnalysis.vue
View File

@ -113,13 +113,12 @@ export default {
}); });
}, },
methods: { methods: {
getData() { getData(goalData) {
let that = this; let that = this;
let query0 = {}; let query0 = {};
query0.page = 0; query0.page = 0;
query0.type = "month_st"; query0.type = "month_st";
query0.year_s = that.query.year_s - 1; query0.year_s = that.query.year_s - 1;
query0.mgroup = "3346520558031773696";
let wrapArr = [], let wrapArr = [],
wrapArr0 = [], wrapArr0 = [],
wrapArrs = []; wrapArrs = [];
@ -167,7 +166,7 @@ export default {
arr[3] = item.elec_consume_unit; //当期值（KW·h/t） arr[3] = item.elec_consume_unit; //当期值（KW·h/t）
let keyVale = "goal_val_" + n; let keyVale = "goal_val_" + n;
arr[4] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 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, let ind_pre = 0,
huanbi = 0; huanbi = 0;
if (item.month_s == 1) { if (item.month_s == 1) {
@ -184,13 +183,35 @@ export default {
: "/"; : "/";
} }
arr[6] = huanbi; //环期值（KW·h/t）上个月的值 arr[6] = huanbi; //环期值（KW·h/t）上个月的值
arr[7] = item.celec_consume_unit; //当期与环期差值（KW·h/t） let diff = 0;
arr[8] = item.celec_consume_unit; //环比增长率（%） if (arr[6] == "/"){
arr[9] = item.celec_consume_unit; //同比增长率（%） diff == "/";
arr[10] = item.celec_consume_unit; //同比增长率（%） }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; wrapArr[ind] = arr;
}); });
console.log(wrapArr);
that.tableDatas = wrapArr; that.tableDatas = wrapArr;
} else { } else {
} }

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

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

7
src/views/enm_rm/logDetail.vue
View File

@ -22,6 +22,7 @@
type="primary" type="primary"
@click.stop="addStlog" @click.stop="addStlog"
v-if="activeName == 'fourth'" v-if="activeName == 'fourth'"
v-auth="'sflogexp.create'"
style=" style="
position: absolute; position: absolute;
top: 6px; top: 6px;
@ -129,7 +130,7 @@
<el-button <el-button
type="primary" type="primary"
:loading="isSaveing" :loading="isSaveing"
@click="submit" @click="submit" v-auth="'sflog.update'"
>保存</el-button >保存</el-button
> >
</el-footer> </el-footer>
@ -168,7 +169,7 @@
type="primary" type="primary"
:loading="isSaveing" :loading="isSaveing"
@click="submit5(item)" @click="submit5(item)"
style="margin-left: 20px" style="margin-left: 20px" v-auth="'mpointstat.create'"
>保存</el-button >保存</el-button
> >
</el-col> </el-col>
@ -225,6 +226,7 @@
size="small" size="small"
@click="mpointStat_del(scope.row)" @click="mpointStat_del(scope.row)"
type="danger" type="danger"
v-auth="'mpointstat.delete'"
>删除</el-button >删除</el-button
> >
</template> </template>
@ -539,6 +541,7 @@
@click=" @click="
sflogexp_edit(scope.row) sflogexp_edit(scope.row)
" "
v-auth="'sflogexp.update'"
type="primary" type="primary"
>编辑</el-button >编辑</el-button
> >

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

@ -104,7 +104,7 @@
size="small" size="small"
@click="sflog_edit(scope.row)" @click="sflog_edit(scope.row)"
type="primary" type="primary"
>编辑</el-button >详情</el-button
> >
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-button <el-button

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

@ -227,11 +227,7 @@ export default {
data: [], data: [],
}, },
yAxis: yAxis, yAxis: yAxis,
series: { series: [],
name: "烘干破主电机",
type: "bar",
data: [],
},
}, },
option3: { option3: {
color: colors, color: colors,
@ -261,11 +257,7 @@ export default {
], ],
}, },
yAxis: yAxis, yAxis: yAxis,
series: { series: [],
name: "烘干破主电机",
type: "bar",
data: [],
},
}, },
mpoints: [], mpoints: [],
}; };