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/modules/WorkshopSignage/WorkshopDeviceOverview.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue b/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
index 4bf22e8..6eade6e 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/WorkshopDeviceOverview.vue
@@ -1,6 +1,20 @@
<template>
<div style="flex:1;display: flex;">
- <div class="chart-container" :id="chartContainerId"></div>
+ <!--<div style="height: 100%">-->
+ <!--<div class="chart-container" :id="chartContainerId"></div>-->
+
+ <!--</div>-->
+ <div style="flex: 1;display: flex;flex-direction: column">
+ <div class="chart-container" :id="chartContainerId" style="flex: 1"></div>
+ <div class="pie-value-container">
+ <div>
+ <span class="color-square" style="background-color: #00923f"></span>瀹屾垚閲� {{equipmentStatusCountObj.qualifiedQty}}
+ </div>
+ <div>
+ <span class="color-square" style="background-color: #e67817"></span>浠诲姟閲� {{equipmentStatusCountObj.planQty}}
+ </div>
+ </div>
+ </div>
<div class="equipment-state-container">
<div>璁惧鎬绘暟锛歿{equipmentStatusCountObj.equipmentCount}}鍙�</div>
<div>澶т慨銆侀」淇暟閲忥細{{equipmentStatusCountObj.repairCount}}鍙�</div>
@@ -18,16 +32,22 @@
</div>
</div>
+
+ <SignageModal ref="signageModalRef" :modalTitle="modalTitle" :productionId="currentProductionId"/>
</div>
</template>
<script>
import signageApi from '@/api/signage'
+ import SignageModal from './SignageModal'
export default {
name: 'WorkshopDeviceOverview',
- components: {},
+ components: { SignageModal },
props: {
+ workshopName: {
+ type: String
+ },
currentProductionId: {
type: String
},
@@ -42,7 +62,8 @@
return {
chartContainer: null,
chartContainerId: 'left-col-chart1',
- equipmentStatusCountObj: {}
+ equipmentStatusCountObj: {},
+ modalTitle: ''
}
},
mounted() {
@@ -81,7 +102,7 @@
{
name: '绫荤洰',
type: 'pie',
- radius: '60%',
+ radius: '90%',
center: ['50%', '50%'],
hoverAnimation: false,
data: [
@@ -124,6 +145,12 @@
}
option.series[0].data[0].value = yAxisData1
option.series[0].data[1].value = yAxisData2
+
+ this.chartContainer.on('click', () => {
+ this.modalTitle = this.workshopName + '褰撴湀浠诲姟瀹屾垚鐧惧垎姣�'
+ this.$refs.signageModalRef.visible = true
+ })
+
this.chartContainer.setOption(option, true)
},
@@ -155,6 +182,22 @@
</script>
<style lang="less">
+ .pie-value-container {
+ > div {
+ text-align: center;
+ margin-bottom: 5px;
+ }
+
+ .color-square {
+ display: inline-block;
+ width: 0.625vw;
+ height: 0.45vw;
+ border-radius: 0.1vw;
+ background-color: #00ff80;
+ margin-right: 0.4vw;
+ }
+ }
+
.equipment-state-container {
display: flex;
flex-direction: column;
--
Gitblit v1.9.3