From 00e3fde1d46ddcf69578d3a0bc092ccc47e7a904 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 24 Aug 2023 16:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B5=E9=87=8F=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E3=80=81=E6=97=A5=E3=80=81=E6=9C=88=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 30 ++ src/views/enm_rm/logDetail.vue | 102 ++++--- src/views/ungrouped/electric_day.vue | 354 ++++++++++++++++++++++++ src/views/ungrouped/electric_hour.vue | 364 +++++++++++++++++++++++++ src/views/ungrouped/electric_month.vue | 339 +++++++++++++++++++++++ 5 files changed, 1157 insertions(+), 32 deletions(-) create mode 100644 src/views/ungrouped/electric_day.vue create mode 100644 src/views/ungrouped/electric_hour.vue create mode 100644 src/views/ungrouped/electric_month.vue diff --git a/src/config/route.js b/src/config/route.js index 4513e2fd..5aa95747 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -544,6 +544,36 @@ const routes = [ "perms": ["enm"] }, "component": "ungrouped/electric" + }, + { + "name": "electricHour", + "path": "/ungrouped/electricHour", + "meta": { + "title": "全厂电量小时统计", + "icon": "el-icon-grid", + "perms": ["enm"] + }, + "component": "ungrouped/electric_hour" + }, + { + "name": "electricDay", + "path": "/ungrouped/electricDay", + "meta": { + "title": "全厂电量日统计", + "icon": "el-icon-grid", + "perms": ["enm"] + }, + "component": "ungrouped/electric_day" + }, + { + "name": "electricMonth", + "path": "/ungrouped/electricMonth", + "meta": { + "title": "全厂电量月统计", + "icon": "el-icon-grid", + "perms": ["enm"] + }, + "component": "ungrouped/electric_month" } ] }, diff --git a/src/views/enm_rm/logDetail.vue b/src/views/enm_rm/logDetail.vue index 676a26fa..dc4399b3 100644 --- a/src/views/enm_rm/logDetail.vue +++ b/src/views/enm_rm/logDetail.vue @@ -128,34 +128,75 @@ 保存 - - 其他能源输入 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + +
+
+ 无其他成本 +
- - - - - - - - - - - - + + + + + + + + + + + - @@ -261,6 +301,9 @@ import otherDialog from "./other_form.vue"; sflogItem:{}, form:{ + }, + thirdForm:{ + num:'' }, expForm:{ happen_time:'', @@ -287,18 +330,13 @@ import otherDialog from "./other_form.vue"; apiObj:this.$API.wpm.sflogexp.list }; }, - created(){ - let form = this.$TOOL.data.get("sflogItem") - this.form = JSON.parse(form); - query.stlog = this.form.id; - - }, mounted(){ this.deptId = this.$route.query.deptId; this.mgroupId = this.$route.query.mgroupId; let form = this.$TOOL.data.get("sflogItem") this.form = JSON.parse(form); this.getTeam(); + this.getSflogexp(); }, methods: { handleClick(e){ @@ -312,9 +350,9 @@ import otherDialog from "./other_form.vue"; let that = this; let form ={}; form.page = 0; - form.belong_dept = this.deptId; - this.$API.mtm.team.list.req(form).then(res=>{ - this.teamOptions = res; + form.belong_dept = that.deptId; + that.$API.mtm.team.list.req(form).then(res=>{ + that.teamOptions = res; }) }, teamChange(data){ @@ -374,7 +412,7 @@ import otherDialog from "./other_form.vue"; getSflogexp(){ let obj = {}; obj.page = 0; - obj.stlog = this.form.id; + obj.sflog = this.form.id; this.$API.wpm.sflogexp.list.req(obj).then(res=>{ this.sflogexpList = res; }) diff --git a/src/views/ungrouped/electric_day.vue b/src/views/ungrouped/electric_day.vue new file mode 100644 index 00000000..8965f884 --- /dev/null +++ b/src/views/ungrouped/electric_day.vue @@ -0,0 +1,354 @@ + + + + \ No newline at end of file diff --git a/src/views/ungrouped/electric_hour.vue b/src/views/ungrouped/electric_hour.vue new file mode 100644 index 00000000..aba53bc3 --- /dev/null +++ b/src/views/ungrouped/electric_hour.vue @@ -0,0 +1,364 @@ + + + + \ No newline at end of file diff --git a/src/views/ungrouped/electric_month.vue b/src/views/ungrouped/electric_month.vue new file mode 100644 index 00000000..4a747062 --- /dev/null +++ b/src/views/ungrouped/electric_month.vue @@ -0,0 +1,339 @@ + + + + \ No newline at end of file