From d7a8405c0f57f8947f971b798d3e4713a8d1800f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 16:49:39 +0800
Subject: [PATCH] 1、利用率分段分析页面增加导出功能，默认进入页面的计算时间段修改为00:00至23:59 2、设备管理页面增加设备属性的维护（普通、重点）同时TEEP页面新增对应筛选条件 3、看板增加MES产量数据展示（饼图里面改为设备产量对比，饼图下方增加两行展示计划量和完成量数目，点击饼图出现弹窗展示对应车间或车间工段下产量列表）2h 4、设备管理页面新增字段展示权限（弹窗中设备状态字段增加菜单按钮权限控制显隐） 5、OEE计算弹窗新增loading提示与计算成功后刷新列表功能 6、删除用户管理冗余字段展示
---
src/views/mdc/base/WorkshopSignage.vue | 112 ++++++++-----------------------------------------------
1 files changed, 17 insertions(+), 95 deletions(-)
diff --git a/src/views/mdc/base/WorkshopSignage.vue b/src/views/mdc/base/WorkshopSignage.vue
index 83acb27..c6042b2 100644
--- a/src/views/mdc/base/WorkshopSignage.vue
+++ b/src/views/mdc/base/WorkshopSignage.vue
@@ -5,7 +5,8 @@
<div class="left-col">
<div class="col-content">
<div class="content-title">{{workshopDetails.workshopName}}#璁惧鎯呭喌</div>
- <workshop-device-overview ref="workshopDeviceOverviewRef" :currentProductionId="currentProductionId"
+ <workshop-device-overview ref="workshopDeviceOverviewRef" :workshopName="workshopDetails.workshopName"
+ :currentProductionId="currentProductionId"
:equipmentStatusList="equipmentStatusList" :toDecimal2NoZero="toDecimal2NoZero"/>
</div>
<div class="col-content">
@@ -169,7 +170,6 @@
<style lang="less">
.full-screen {
- width: 100%;
height: 1080px;
background-color: #000;
display: flex;
@@ -181,12 +181,15 @@
width: 100%;
height: 100%;
display: flex;
- justify-content: space-between;
+ /*justify-content: space-between;*/
align-items: center;
overflow: auto;
+ flex-wrap: nowrap;
.left-col {
- flex: 1;
+ width: 412px;
+ flex-shrink: 0;
+ /*flex: 1;*/
height: 100%;
display: flex;
padding: 0.5%;
@@ -206,15 +209,15 @@
padding: 1% 5%;
}
- .content-footer-container {
- height: 25%;
+ /*.content-footer-container {*/
+ /*height: 25%;*/
- .content-footer {
- font-size: 0.7vw;
- padding-left: 5%;
- height: 40%;
- }
- }
+ /*.content-footer {*/
+ /*font-size: 0.7vw;*/
+ /*padding-left: 5%;*/
+ /*height: 40%;*/
+ /*}*/
+ /*}*/
.chart-container {
flex: 1;
@@ -234,95 +237,14 @@
.right-col {
position: relative;
+ flex-shrink: 0;
width: 1500px;
- height: 1080px;
+ height: 100%;
/*background-image: url("../../../assets/WorskhopSignage/103.png");*/
background-color: #000;
background-size: 100% 100%;
background-repeat: no-repeat;
overflow: hidden;
-
- .single-device {
- position: absolute;
- border: 1px solid transparent;
- padding: 10px;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: space-between;
- cursor: default;
-
- &:active {
- border: 1px solid #1890ff;
- }
-
- .device-status {
- width: 100%;
- height: 100%;
- display: flex;
- -webkit-align-items: flex-end;
- -moz-align-items: flex-end;
- -ms-align-items: flex-end;
-
- .device-image {
- background-size: 100% 100%;
- background-repeat: no-repeat;
- width: 100%;
- height: 100%;
- position: relative;
- margin-bottom: 10px;
-
- .status-image {
- position: absolute;
- top: 25%;
- left: 25%;
- background-size: 100% 100%;
- background-repeat: no-repeat;
- width: 50%;
- height: 50%;
- }
- }
- }
-
- & > div:last-child {
- color: #fff;
- font-weight: bold;
- font-size: 0.6vw;
- }
- }
-
- .guideline {
- position: absolute;
- border: 1px dashed #fff;
- }
-
- .guidelineX {
- width: 9999px;
- left: 0;
- }
-
- .guidelineY {
- top: 0;
- height: 9999px;
- }
-
- form {
- position: absolute;
- right: 0;
- bottom: 0.5%;
-
- label {
- color: #fff;
- }
-
- .ant-switch {
- background-color: #999;
- }
-
- .ant-switch-checked {
- background-color: #1890FF;
- }
- }
}
}
}
--
Gitblit v1.9.3