From 52bc38499c3471ca00c674819a22117d03239057 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 21 Sep 2023 10:37:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E5=A4=87=E6=95=88=E7=8E=87?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../efficiency/components/pieChart.vue | 234 ++++++++++++++-- .../equipment/analysis/efficiency/index.vue | 260 ++++++++++++++---- 2 files changed, 416 insertions(+), 78 deletions(-) diff --git a/src/views/equipment/analysis/efficiency/components/pieChart.vue b/src/views/equipment/analysis/efficiency/components/pieChart.vue index 74db4ada..e051f341 100644 --- a/src/views/equipment/analysis/efficiency/components/pieChart.vue +++ b/src/views/equipment/analysis/efficiency/components/pieChart.vue @@ -6,7 +6,34 @@ --> diff --git a/src/views/equipment/analysis/efficiency/index.vue b/src/views/equipment/analysis/efficiency/index.vue index c8ce739c..75309699 100644 --- a/src/views/equipment/analysis/efficiency/index.vue +++ b/src/views/equipment/analysis/efficiency/index.vue @@ -13,46 +13,64 @@ ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> - - - - - + + + + + + + + +
+
各设备加工数量
+
+
+ + 工作时长 +
+
+ + 停机时长 +
+
+ + 故障时长 +
+
+ + 速度开动率 +
+
+
+
+
+
- - - - - -
- -
-
-

查看趋势

-
-
+
+ + +
+
+
+
+
+
+
@@ -68,6 +86,7 @@ export default { props: {}, data() { return { + activeName: 'table', open: false, visualizationOpen: false, trendOpen: false, @@ -226,7 +245,7 @@ export default { parent: 'dateFilterType', // 时间段选择 type: 'datePicker', - label: '时间段', + // label: '时间段', dateType: 'daterange', format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd HH:mm:ss', @@ -240,7 +259,7 @@ export default { parent: 'dateFilterType', // 日期选择 type: 'datePicker', - label: '日期', + // label: '日期', dateType: 'date', placeholder: '选择日期', format: 'yyyy-MM-dd', @@ -255,16 +274,16 @@ export default { name: 'search', color: 'primary', }, - { - type: 'separate', - }, - { - type: 'button', - btnName: '设备可视化', - name: 'visualization', - plain: true, - color: 'success', - }, + // { + // type: 'separate', + // }, + // { + // type: 'button', + // btnName: '设备可视化', + // name: 'visualization', + // plain: true, + // color: 'success', + // }, // { // type: 'button', // btnName: 'OEE', @@ -393,6 +412,8 @@ export default { }, submitForm() {}, + + handleTabClick() {}, }, }; @@ -402,4 +423,141 @@ export default { display: grid; grid-template-columns: repeat(3, minmax(240px, 1fr)); } + +:deep(.custom-tabs) { + .el-tabs__header { + margin-bottom: 8px; + display: inline-block; + transform: translateY(-12px); + } + + .el-tabs__item { + padding-left: 0 !important; + padding-right: 0 !important; + line-height: 36px !important; + height: 36px; + } +} + +.blue-title { + position: relative; + padding: 4px 0; + padding-left: 12px; + font-size: 14px; + + &::before { + content: ''; + position: absolute; + left: 0; + top: 6px; + height: 16px; + width: 4px; + border-radius: 1px; + background: #0b58ff; + } +} + +.graph-grid { + margin-top: 8px; + padding: 12px; + position: relative; + border-radius: 12px; + border: 1px solid #ccc; + // background: #0003; +} +.bg-grid { + display: grid; + place-content: center; + grid-template-columns: repeat(4, minmax(280px, 1fr)); + grid-auto-columns: 280px; + grid-auto-rows: 290px; + overflow: hidden; + position: relative; +} + +.grid-line::after { + content: ''; + position: absolute; + top: -1px; + left: -1px; + width: calc(100% + 2px); + height: calc(100% + 2px); + display: inline-block; + border: 8px solid #fff; +} + +.grid-charts { + position: absolute; + width: calc(100% - 24px); + top: 12px; + left: 12px; +} + +.grid-item { + border: 1px solid #ccc; +} + +.grid-item:not(:first-child) { + border-left: 0; + border-top: 0; +} + +.legend { + position: absolute; + top: 8px; + right: 12px; + display: flex; +} + +.legend .legend-item { + display: flex; + align-items: center; + margin-left: 12px; +} + +.legend .legend-item .icon { + width: 10px; + height: 10px; + border-radius: 1px; + margin-right: 4px; + margin-top: 1px; +} + +.legend .legend-item .text { + color: #8c8c8c; +} + +.blue { + background-color: #3da8fd; +} + +.green { + background-color: #8ef0ab; +} + +.purple { + background-color: #6b5cfd; +} + +.yellow { + background-color: #ffc72a; +} + +@media screen and (max-width: 1390px) { + .bg-grid { + grid-template-columns: repeat(3, minmax(280px, 1fr)); + } +} + +@media screen and (max-width: 1190px) { + .bg-grid { + grid-template-columns: repeat(2, minmax(280px, 1fr)); + } +} + +@media screen and (max-width: 640px) { + .bg-grid { + grid-template-columns: repeat(1, minmax(280px, 1fr)); + } +}