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/DeviceBaseInfo/EquipmentList.vue | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 07795c1..2724a0b 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -66,17 +66,17 @@
<template slot="oporationDict" slot-scope="text, record">
<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
</template>
- <template slot="equipmentStatus" slot-scope="text">
- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
- </template>
+<!-- <template slot="equipmentStatus" slot-scope="text">-->
+<!-- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>-->
+<!-- </template>-->
<template slot="collecttime" slot-scope="text, record">
<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
</template>
- <template slot="action" slot-scope="text, record">
- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
- <a>鐘舵�佸弽棣�</a>
- </a-popconfirm>
- </template>
+<!-- <template slot="action" slot-scope="text, record">-->
+<!-- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">-->
+<!-- <a>鐘舵�佸弽棣�</a>-->
+<!-- </a-popconfirm>-->
+<!-- </template>-->
</a-table>
</div>
@@ -101,7 +101,7 @@
align: "center",
dataIndex: 'equipmentId',
scopedSlots: {customRender: 'equipmentId'},
- width:210
+ width:300
},
{
title: '璁惧鍚嶇О',
@@ -117,13 +117,13 @@
scopedSlots: {customRender: 'oporationDict'},
width:200
},
- {
- title: '璁惧寮傚父',
- align: "center",
- dataIndex: 'equipmentStatus',
- scopedSlots: {customRender: 'equipmentStatus'},
- width:200
- },
+ // {
+ // title: '璁惧寮傚父',
+ // align: "center",
+ // dataIndex: 'equipmentStatus',
+ // scopedSlots: {customRender: 'equipmentStatus'},
+ // width:200
+ // },
{
title: '閲囬泦鏃堕棿',
align: "center",
@@ -131,16 +131,15 @@
defaultSortOrder:'descend',
sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
scopedSlots: {customRender: 'collecttime'},
- width:350
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150,
- fixed:'right'
}
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // scopedSlots: {customRender: 'action'},
+ // align: "center",
+ // width: 150,
+ // fixed:'right'
+ // }
],
scrollY:465,
}
--
Gitblit v1.9.3