From b4a6e3d811e49f670ec356d45009f64aea14e0d3 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 10:02:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=91=8Ar?= =?UTF-8?q?eport=E4=B8=AD=E5=9B=BE=E6=A0=87=E9=A2=9C=E8=89=B2=E5=8F=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enm_cogeneration/report.vue | 4 +- src/views/enm_limestone/report.vue | 4 +- src/views/enm_rmbase/report.vue | 222 +++----------------------- 3 files changed, 26 insertions(+), 204 deletions(-) diff --git a/src/views/enm_cogeneration/report.vue b/src/views/enm_cogeneration/report.vue index 20da4af1..4d482a59 100644 --- a/src/views/enm_cogeneration/report.vue +++ b/src/views/enm_cogeneration/report.vue @@ -298,7 +298,7 @@ let yAxis = [ axisLine: { show: true, lineStyle: { - color: colors[2], + color: colors[3], }, }, axisLabel: { @@ -313,7 +313,7 @@ let yAxis = [ axisLine: { show: true, lineStyle: { - color: colors[4], + color: colors[2], }, }, axisLabel: { diff --git a/src/views/enm_limestone/report.vue b/src/views/enm_limestone/report.vue index 1f329d49..a540ff70 100644 --- a/src/views/enm_limestone/report.vue +++ b/src/views/enm_limestone/report.vue @@ -279,13 +279,13 @@ let yAxis = [ }, { type: "value", - name: "分布电耗(KW.h)", + name: "分布电耗(KW.h/t)", position: "right", alignTicks: true, axisLine: { show: true, lineStyle: { - color: colors[3], + color: colors[1], }, }, axisLabel: { diff --git a/src/views/enm_rmbase/report.vue b/src/views/enm_rmbase/report.vue index d458b86e..932cf244 100644 --- a/src/views/enm_rmbase/report.vue +++ b/src/views/enm_rmbase/report.vue @@ -279,10 +279,10 @@ let yAxis = [ }, { type: "value", - name: "运转率 (%)", - position: "right", + name: "台时产量(t/h)", + position: "left", alignTicks: true, - offset: 80, + offset: 70, axisLine: { show: true, lineStyle: { @@ -295,9 +295,10 @@ let yAxis = [ }, { type: "value", - name: "分布电耗(KW.h/t)", + name: "运转率 (%)", position: "right", alignTicks: true, + offset: 80, axisLine: { show: true, lineStyle: { @@ -310,10 +311,9 @@ let yAxis = [ }, { type: "value", - name: "台时产量(t/h)", - position: "left", + name: "分布电耗(KW.h/t)", + position: "right", alignTicks: true, - offset: 70, axisLine: { show: true, lineStyle: { @@ -391,19 +391,19 @@ export default { data: [], }, { - name: "运转率", - type: "line", + name: "台时产量", + type: "bar", yAxisIndex: 1, data: [], }, { - name: "分布电耗", - type: "bar", + name: "运转率", + type: "line", yAxisIndex: 2, data: [], }, { - name: "台时产量", + name: "分布电耗", type: "bar", yAxisIndex: 3, data: [], @@ -434,19 +434,19 @@ export default { data: [], }, { - name: "运转率", - type: "line", + name: "台时产量", + type: "bar", yAxisIndex: 1, data: [], }, { - name: "分布电耗", - type: "bar", + name: "运转率", + type: "line", yAxisIndex: 2, data: [], }, { - name: "台时产量", + name: "分布电耗", type: "bar", yAxisIndex: 3, data: [], @@ -490,203 +490,25 @@ export default { data: [], }, { - name: "运转率", - type: "line", + name: "台时产量", + type: "bar", yAxisIndex: 1, data: [], }, { - name: "分布电耗", - type: "bar", + name: "运转率", + type: "line", yAxisIndex: 2, data: [], }, { - name: "台时产量", + name: "分布电耗", type: "bar", yAxisIndex: 3, data: [], }, ], }, - dataX: [], - dataY: [], - dataY2: [], - option: { - color: [ - "#647bfe", - "#8698fe", - "#a9b6fe", - "#cbd3fe", - "#91CC75", - "#EE6666", - ], - tooltip: { - trigger: "axis", - axisPointer: { - type: "cross", - }, - }, - grid: { - right: "20%", - left: "20%", - }, - toolbox: { - feature: { - dataView: { show: true, readOnly: false }, - restore: { show: true }, - saveAsImage: { show: true }, - }, - }, - legend: { - data: [ - "总产量", - "台时产量", - "运转率", - "分布电耗", - "单位产品标煤耗", - "成本", - ], - }, - xAxis: [ - { - type: "category", - axisTick: { - alignWithLabel: true, - }, - // prettier-ignore - data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'], - }, - ], - yAxis: [ - { - type: "value", - name: "产量 (t)", - position: "right", - alignTicks: true, - axisLine: { - show: true, - lineStyle: { - color: colors[0], - }, - }, - axisLabel: { - formatter: "{value}", - }, - }, - { - type: "value", - name: "运转率 (%)", - position: "right", - alignTicks: true, - offset: 80, - axisLine: { - show: true, - lineStyle: { - color: colors[1], - }, - }, - axisLabel: { - formatter: "{value}", - }, - }, - { - type: "value", - name: "成本(元)", - position: "right", - alignTicks: true, - offset: 160, - axisLine: { - show: true, - lineStyle: { - color: colors[2], - }, - }, - axisLabel: { - formatter: "{value}", - }, - }, - { - type: "value", - name: "分布电耗(KW.h)", - position: "left", - alignTicks: true, - axisLine: { - show: true, - lineStyle: { - color: colors[3], - }, - }, - axisLabel: { - formatter: "{value} ", - }, - }, - { - type: "value", - name: "标煤耗 (t)", - position: "left", - alignTicks: true, - offset: 80, - min: 0, - max: 180, - axisLine: { - show: true, - lineStyle: { - color: colors[4], - }, - }, - axisLabel: { - formatter: "{value}", - }, - }, - ], - series: [ - { - name: "总产量", - type: "bar", - yAxisIndex: 0, - data: [ - 100, 120, 110, 130, 140, 120, 110, 120, 100, 150, - 120, 160, - ], - }, - { - name: "台时产量", - type: "bar", - data: [ - 2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, - 20.0, 6.4, 3.3, - ], - }, - { - name: "运转率", - type: "bar", - yAxisIndex: 1, - data: [ - 2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, - 18.8, 6.0, 2.3, - ], - }, - { - name: "分布电耗", - type: "line", - yAxisIndex: 2, - data: [ - 2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, - 16.5, 12.0, 6.2, - ], - }, - { - name: "单位产品标煤耗", - type: "bar", - yAxisIndex: 2, - data: [ - 2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, - 16.5, 12.0, 6.2, - ], - }, - ], - }, }; }, From 72cab70f23576d79c1d474989cf226d50eda8fa6 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 11:20:42 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:em=E4=B8=AD=E8=AE=A1=E9=87=8F?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=96=E6=B6=88=E7=B1=BB=E5=9E=8B=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/mpoint_form.vue | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index aaec0640..2701037d 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -160,7 +160,10 @@ - + - + - + - @@ -243,21 +249,19 @@ label="影响测点编号" label-width="100" > - - + - + @@ -378,11 +382,9 @@ export default { methods: { //获取集合列表 getMgroup() { - this.$API.mtm.mgroup.list - .req({ page: 0 }) - .then((res) => { - this.mgroupOptions = res; - }); + this.$API.mtm.mgroup.list.req({ page: 0 }).then((res) => { + this.mgroupOptions = res; + }); }, //获取设备列表 getEquipment() { @@ -394,11 +396,9 @@ export default { }, //获取产品列表 getMaterial() { - this.$API.mtm.material.list - .req({ page: 0, type__in: "0, 30" }) - .then((res) => { - this.materials = res; - }); + this.$API.mtm.material.list.req({ page: 0 }).then((res) => { + this.materials = res; + }); }, mgroupChange(e) { this.form.mgroups_allocate.push({ mgroup: e, ratio: 1 }); From bf8812452ff6d020a3969f9161d531c7835fdb25 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 14:46:47 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=E5=A4=A7=E5=B1=8F=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 11 - src/views/bigScreen/index_enm.vue | 3050 ++++++++++++++++------------- 2 files changed, 1716 insertions(+), 1345 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index fa716293..772bef1e 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -227,17 +227,6 @@ const routes = [ }, "component": "enm_limestone/handoverLog" }, - { - "name": "limestone_logDetail", - "path": "/enm_limestone/logDetail", - "meta": { - "title": "日志详情", - "icon": "el-icon-document-copy", - "perms": ["enm_limestone"], - "hidden": true - }, - "component": "enm_limestone/logDetail" - }, ] }, //原料磨 diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue index a7f3b02a..a61a0630 100644 --- a/src/views/bigScreen/index_enm.vue +++ b/src/views/bigScreen/index_enm.vue @@ -1,1410 +1,1792 @@ \ No newline at end of file + From 56b2d8de891f6d686fef3430510e0bbcac7286bd Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 14:48:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/config/route.js b/src/config/route.js index 772bef1e..9d3b3a73 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -296,7 +296,6 @@ const routes = [ "meta": { "title": "日志详情", "icon": "el-icon-document-copy", - "perms": ["enm_rm"], "hidden": true }, "component": "enm_rm/logDetail" From 44f3e3fc682bd5aef9b5d47d5d421e6a8736199f Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 16:27:52 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/ecate.vue | 296 +++++++++++++++++++++--------------- src/views/em/ecate_form.vue | 167 ++++++++++++++++++++ 2 files changed, 342 insertions(+), 121 deletions(-) create mode 100644 src/views/em/ecate_form.vue diff --git a/src/views/em/ecate.vue b/src/views/em/ecate.vue index 8832f9e4..b479e502 100644 --- a/src/views/em/ecate.vue +++ b/src/views/em/ecate.vue @@ -1,126 +1,180 @@ \ No newline at end of file + diff --git a/src/views/em/ecate_form.vue b/src/views/em/ecate_form.vue new file mode 100644 index 00000000..2a7ec819 --- /dev/null +++ b/src/views/em/ecate_form.vue @@ -0,0 +1,167 @@ + + + + + From 267cfe4733b43702bc1b8d13760cfb0d8ed69071 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 17:10:48 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 10 +++ src/views/enm_base/formulaSetting.vue | 104 ++++++++++++++++++++++ src/views/enm_base/settings/calculate.vue | 52 +++++++++++ 3 files changed, 166 insertions(+) create mode 100644 src/views/enm_base/formulaSetting.vue create mode 100644 src/views/enm_base/settings/calculate.vue diff --git a/src/config/route.js b/src/config/route.js index 9d3b3a73..3bf60ab7 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2366,6 +2366,16 @@ const routes = [ "perms": ["enm_base"] }, "component": "enm_base/material" + }, + { + "name": "formula", + "path": "/enm_base/formula", + "meta": { + "title": "计算公式", + "icon": "el-icon-grid", + "perms": ["enm_base"] + }, + "component": "enm_base/formulaSetting" } ] }, diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue new file mode 100644 index 00000000..d208b984 --- /dev/null +++ b/src/views/enm_base/formulaSetting.vue @@ -0,0 +1,104 @@ + + + + diff --git a/src/views/enm_base/settings/calculate.vue b/src/views/enm_base/settings/calculate.vue new file mode 100644 index 00000000..92788481 --- /dev/null +++ b/src/views/enm_base/settings/calculate.vue @@ -0,0 +1,52 @@ + + From 09e83c9fc04f71f89cf8423fd0730e64eef5c4c8 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 6 May 2024 17:10:48 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix:=E5=9B=9E=E8=BD=AC=E7=AA=91=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E7=8F=AD=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 10 +++ src/views/enm_base/formulaSetting.vue | 104 ++++++++++++++++++++++ src/views/enm_base/settings/calculate.vue | 52 +++++++++++ src/views/enm_kilnbase/handoverLog.vue | 2 +- 4 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 src/views/enm_base/formulaSetting.vue create mode 100644 src/views/enm_base/settings/calculate.vue diff --git a/src/config/route.js b/src/config/route.js index 9d3b3a73..3bf60ab7 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2366,6 +2366,16 @@ const routes = [ "perms": ["enm_base"] }, "component": "enm_base/material" + }, + { + "name": "formula", + "path": "/enm_base/formula", + "meta": { + "title": "计算公式", + "icon": "el-icon-grid", + "perms": ["enm_base"] + }, + "component": "enm_base/formulaSetting" } ] }, diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue new file mode 100644 index 00000000..d208b984 --- /dev/null +++ b/src/views/enm_base/formulaSetting.vue @@ -0,0 +1,104 @@ + + + + diff --git a/src/views/enm_base/settings/calculate.vue b/src/views/enm_base/settings/calculate.vue new file mode 100644 index 00000000..92788481 --- /dev/null +++ b/src/views/enm_base/settings/calculate.vue @@ -0,0 +1,52 @@ + + diff --git a/src/views/enm_kilnbase/handoverLog.vue b/src/views/enm_kilnbase/handoverLog.vue index d40cfbc4..bdb8db27 100644 --- a/src/views/enm_kilnbase/handoverLog.vue +++ b/src/views/enm_kilnbase/handoverLog.vue @@ -256,7 +256,7 @@ export default { name: "sflog", data() { return { - apiObj: this.$API.wpm.sflog.list, + apiObj: null, apiObj2: null, query: { shift: "", From d67ed6ce743a9ab3337121dec4359b0f57a34330 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 7 May 2024 11:19:08 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix:=E8=B7=AF=E7=94=B1=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E6=8F=90?= =?UTF-8?q?=E5=88=B0enm=5Fbase=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index 3bf60ab7..23b87b33 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -10,7 +10,8 @@ const routes = [ "meta": { "title": "工作台", "icon": "el-icon-home-filled", - "type": "menu" + "type": "menu", + "perms": ["home"] }, "children": [ //首页 @@ -290,16 +291,6 @@ const routes = [ }, "component": "enm_rm/handoverLog" }, - { - "name": "logDetail", - "path": "/enm_rm/logDetail", - "meta": { - "title": "日志详情", - "icon": "el-icon-document-copy", - "hidden": true - }, - "component": "enm_rm/logDetail" - }, ] }, //原料磨——基础 @@ -2367,6 +2358,16 @@ const routes = [ }, "component": "enm_base/material" }, + { + "name": "logDetail", + "path": "/enm_rm/logDetail", + "meta": { + "title": "日志详情", + "icon": "el-icon-document-copy", + "hidden": true + }, + "component": "enm_rm/logDetail" + }, { "name": "formula", "path": "/enm_base/formula", From e166bd7950907b181183eccec7dca35cea4d717a Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 7 May 2024 11:25:58 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix:=E8=B7=AF=E7=94=B1=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=88=E7=88=B6=E7=BA=A7=E4=B8=A5=E6=A0=BC=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E5=AD=90=E7=BA=A7=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 65e8bee7..7d46d67d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -114,9 +114,8 @@ router.sc_getMenu = () => { userMenu = treeFilter(userRoutes, node => { return node.meta.perms ? node.meta.perms.filter(item => permissions.indexOf(item) > -1).length > 0 : true }); - // let userMenu = checkRoute(userRoutes, permissions) - // var menu = [...userMenu, ...apiMenu] - return userMenu + let menus = checkRoute(userMenu, permissions) + return menus } //转换 @@ -229,19 +228,21 @@ function checkRoute(routes, perms) { } } } - } - else if (routes[i].children) { - for (var m = 0; m < routes[i].children.length; m++) { - let child = routes[i].children[m] - console.log(m, child) - if (child.meta && child.meta.perms) { - let has = hasPerm(child.meta.perms, perms) - if (!has) { - routes[i].children.splice(m, 1) - } - } + }else{ + routes.splice(i, 1) } - } + // else if (routes[i].children) { + // for (var m = 0; m < routes[i].children.length; m++) { + // let child = routes[i].children[m] + // console.log(m, child) + // if (child.meta && child.meta.perms) { + // let has = hasPerm(child.meta.perms, perms) + // if (!has) { + // routes[i].children.splice(m, 1) + // } + // } + // } + // } } return routes } From 248b15440ee36186f04690401e5b09ce11c6b3ed Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 7 May 2024 15:58:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index cbff7345..a49596e4 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2378,16 +2378,6 @@ const routes = [ }, "component": "enm_base/formulaSetting" }, - { - "name": "formula", - "path": "/enm_base/formula", - "meta": { - "title": "计算公式", - "icon": "el-icon-grid", - "perms": ["enm_base"] - }, - "component": "enm_base/formulaSetting" - } ] }, //每月配置 From a788587df42c5f809c6b2247b7afb2cf5d4c91eb Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 7 May 2024 15:59:05 +0800 Subject: [PATCH 11/11] =?UTF-8?q?feat:=E5=87=8C=E6=BA=90=E7=9A=84=E8=83=BD?= =?UTF-8?q?=E7=AE=A1=E5=A4=A7=E5=B1=8F=E5=9F=BA=E7=A1=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_enm_ly.vue | 1198 ++++++++++++++++++++++++++ 1 file changed, 1198 insertions(+) create mode 100644 src/views/bigScreen/index_enm_ly.vue diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue new file mode 100644 index 00000000..ee993b56 --- /dev/null +++ b/src/views/bigScreen/index_enm_ly.vue @@ -0,0 +1,1198 @@ + + +