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/DeviceAlarmInfo.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue b/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
index 40af646..5a79cf0 100644
--- a/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
+++ b/src/views/mdc/base/modules/WorkshopSignage/DeviceAlarmInfo.vue
@@ -8,39 +8,41 @@
export default {
name: 'DeviceAlarmInfo',
components: {},
- data() {
- return {
- config: {},
- dataSource: []
+ props: {
+ currentProductionId: {
+ type: String
}
},
- mounted() {
+ data() {
+ return {
+ config: {}
+ }
+ },
+ created() {
+ if (!this.currentProductionId) return
this.getDeviceAlarmInfoByApi()
},
methods: {
getDeviceAlarmInfoByApi() {
const that = this
- that.initChart()
- // signageApi.getWorkshopAlarmInfoApi()
- // .then(res => {
- // if (res.success) {
- // that.dataSource = res.result
- // that.initChart()
- // }
- // })
+ signageApi.getWorkshopAlarmInfoApi(that.currentProductionId)
+ .then(res => {
+ if (!res.success) return
+ that.initChart(res.result)
+ })
},
- initChart() {
+ initChart(dataSource = []) {
this.config = {
// indexHeader: '搴忓彿',
header: ['璁惧缂栧彿', '鎶ヨ鏃堕棿', '鎶ヨ鍙�'],
headerBGC: '#333',
oddRowBGC: 'transparent',
evenRowBGC: 'transparent',
- // data: this.dataSource.map(item => {
- // return [item.equipmentId, item.collectTime, item.alarm]
- // }),
- data: [['516313', 'AASDASD', 'ASDADA'], ['ASDSA', '213ASD', '1651ZS'], ['DSXC42', 'SD5846', '2316SD'], ['dasd13', '213asd', '21558xc'], ['dasads522', 'dsa4812', 'asd233'], ['123124', 'zxc32695', '42352s']],
+ data: dataSource.map(item => {
+ return [item.equipmentId, item.collectTime, item.alarmNo]
+ }),
+ // data: [['516313', 'AASDASD', 'ASDADA'], ['ASDSA', '213ASD', '1651ZS'], ['DSXC42', 'SD5846', '2316SD'], ['dasd13', '213asd', '21558xc'], ['dasads522', 'dsa4812', 'asd233'], ['123124', 'zxc32695', '42352s']],
rowNum: 2,
index: false,
// columnWidth: [300, 300],
--
Gitblit v1.9.3