From 638c0e65b675c4c707166f44b789a82b4c4c9bc4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 15 Aug 2024 18:14:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style/dark.scss | 8 ++++++++ src/style/fix.scss | 24 ++++++++++++++++++++++++ src/views/bigScreen/index_enp_blue.vue | 25 ++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/style/dark.scss b/src/style/dark.scss index 805614cf..e02a6954 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -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; diff --git a/src/style/fix.scss b/src/style/fix.scss index ab8212f4..58629f17 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -375,4 +375,28 @@ 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; } \ No newline at end of file diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index dec3753f..84951eef 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -179,8 +179,14 @@ -
+
+
+
+ + +
@@ -635,6 +641,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); @@ -1150,6 +1167,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%; From 329bccb628c32287e4a354fae86c7a2a1e6f5f2e Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 16 Aug 2024 10:21:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pm/mtask_drawer.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/pm/mtask_drawer.vue b/src/views/pm/mtask_drawer.vue index 8ebbf455..ac124011 100644 --- a/src/views/pm/mtask_drawer.vue +++ b/src/views/pm/mtask_drawer.vue @@ -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() { From 33243307990dc785dcb1fb4bf6b52bc167d0bf1b Mon Sep 17 00:00:00 2001 From: zty Date: Fri, 16 Aug 2024 10:56:58 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20tkx/=E4=BF=AE=E6=94=B9=20=E7=8E=AF?= =?UTF-8?q?=E6=9C=9F=E5=80=BC=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 20 +++---- src/views/em/mpoint_form.vue | 7 +++ src/views/enm_coal/teamAnalysis.vue | 76 +++++++++++-------------- src/views/enm_coal/workshopAnalysis.vue | 20 ++++--- src/views/enm_energy/electric.vue | 1 - src/views/enm_kiln/workshopAnalysis.vue | 9 +-- src/views/enm_mill/workshopAnalysis.vue | 20 ++++--- src/views/enm_rm/workshopAnalysis.vue | 10 ++-- src/views/enm_slag/workshopAnalysis.vue | 4 +- 9 files changed, 86 insertions(+), 81 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index b750852b..20f6eb4c 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -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", diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 622367c8..2a999594 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -149,6 +149,13 @@ + + + + + { - 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: { getData(goalData) { @@ -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[5] = + item.出磨煤粉_细度_rate_pass !== undefined && item.出磨煤粉_细度_rate_pass !== null + ? item.出磨煤粉_细度_rate_pass + : "/"; + arr[6] = - item.煤粉_细度_rate_pass != null - ? item.煤粉_细度_rate_pass + item.出磨煤粉_水分_rate_pass !== undefined && item.出磨煤粉_水分_rate_pass !== null + ? item.出磨煤粉_水分_rate_pass : "/"; + //设备 arr[7] = - item.煤粉_水分_rate_pass != null - ? item.煤粉_水分_rate_pass - : "/"; - //设备 - arr[8] = - item.煤磨排风机_consume_unit != null + 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); diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue index 0dfd1469..0941abcd 100644 --- a/src/views/enm_coal/workshopAnalysis.vue +++ b/src/views/enm_coal/workshopAnalysis.vue @@ -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 = "/"; } diff --git a/src/views/enm_energy/electric.vue b/src/views/enm_energy/electric.vue index 90373e13..118cc609 100644 --- a/src/views/enm_energy/electric.vue +++ b/src/views/enm_energy/electric.vue @@ -1,4 +1,3 @@ -