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/EquipmentList.vue | 75 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 6cc55f5..2c93341 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -20,23 +20,14 @@
<a-col :md="4" :sm="4">
<a-form-item label="杞﹂棿鍚嶇О">
- <!--<a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>-->
<a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="璇烽�夋嫨杞﹂棿"
:treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
- <a-form-item label="璁惧绾у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
- allow-clear/>
- </a-form-item>
- </a-col>
-
- <a-col :md="4" :sm="4">
- <a-form-item label="璁惧绉嶇被">
- <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
- allow-clear/>
+ <a-form-item label="璁惧鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧鐘舵��" :triggerChange="true" dictCode="mdc_equipment_status" v-model="queryParam.equipmentStatus" allow-clear/>
</a-form-item>
</a-col>
@@ -195,23 +186,16 @@
dataIndex: 'equipmentIp'
},
{
- title: '璁惧鍔熺巼',
+ title: '鏈哄簥绔彛',
align: 'center',
width: 200,
- dataIndex: 'devicePower'
+ dataIndex: 'dataPort'
},
{
title: '閮ㄩ棬',
align: 'center',
width: 200,
dataIndex: 'orgCodeTxt'
- },
-
- {
- title: '绯荤粺鐗堟湰',
- align: 'center',
- width: 200,
- dataIndex: 'systemVersion'
},
{
title: '鎿嶄綔',
@@ -260,52 +244,58 @@
title: '璁惧缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
- width: 200
+ width: 225
// sorter: true
},
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'equipmentName'
},
{
title: '杞﹂棿',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'productionName'
},
{
title: '璁惧绫诲瀷',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'equipmentType'
},
{
title: '椹卞姩绫诲瀷',
align: 'center',
- width: 200,
+ width: 225,
dataIndex: 'driveType'
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
+ title:'璁惧灞炴��',
+ align:'center',
+ width: 100,
+ dataIndex:'attribute_dicText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
- width: 200,
+ width: 150,
dataIndex: 'equipmentIp'
},
{
- title: '璁惧鍔熺巼',
+ title: '鏈哄簥绔彛',
align: 'center',
width: 200,
- dataIndex: 'devicePower'
- },
- {
- title: '绯荤粺鐗堟湰',
- align: 'center',
- width: 200,
- dataIndex: 'systemVersion'
+ dataIndex: 'dataPort'
},
{
title: '鎿嶄綔',
@@ -363,29 +353,28 @@
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
width: 200,
dataIndex: 'equipmentIp'
},
{
- title: '璁惧鍔熺巼',
+ title: '鏈哄簥绔彛',
align: 'center',
width: 200,
- dataIndex: 'devicePower'
+ dataIndex: 'dataPort'
},
{
title: '閮ㄩ棬',
align: 'center',
width: 200,
dataIndex: 'orgCodeTxt'
- },
-
- {
- title: '绯荤粺鐗堟湰',
- align: 'center',
- width: 200,
- dataIndex: 'systemVersion'
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.3