From 3ce2d50102929e6e245249ce61bbadd300f3e24e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 14 八月 2024 16:12:28 +0800
Subject: [PATCH] 设备维护校验调整 OEE列表间距调整
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index acb9a04..0833281 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -102,8 +102,13 @@
</div>
<div id="EfficiencyShift" style="flex:1;overflow: hidden;height: inherit">
- <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records" :loading="tableLoading"
- :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
+ <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records?dataSource.records:[]"
+ :loading="tableLoading"
+ :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered>
+ <!--<template slot="equipmentModel" slot-scope="text, record">-->
+ <!--<editable-cell :text="text" @change="onCellChange(record.id, 'equipmentModel', $event)"/>-->
+ <!--</template>-->
+ </a-table>
</div>
<!--<div class="pagination">-->
<!--<a-pagination-->
@@ -129,9 +134,11 @@
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import api from '@api/mdc'
+ // import EditableCell from './EditableCell.vue'
+
export default {
name: 'OEEAnalysisList',
- components: {},
+ components: { },
data() {
return {
dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
@@ -156,14 +163,20 @@
title: '搴忓彿',
dataIndex: '',
key: 'rowIndex',
- width: 70,
+ width: 60,
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
}
},
{
- title: '璁惧缁熶竴缂栧彿',
+ title: '杞﹂棿',
+ align: 'center',
+ dataIndex: 'productionName',
+ width: 110
+ },
+ {
+ title: '璁惧缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
width: 120
@@ -171,14 +184,15 @@
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 200,
+ width: 120,
dataIndex: 'equipmentName'
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- width: 110,
- dataIndex: 'equipmentModel'
+ width: 120,
+ dataIndex: 'equipmentModel',
+ scopedSlots: { customRender: 'equipmentModel' }
},
{
title: '鏃ユ湡',
@@ -189,32 +203,32 @@
{
title: '鐝',
align: 'center',
- width: 300,
+ width: 100,
dataIndex: 'shift'
},
{
title: '姣忕彮灏忔椂',
dataIndex: 'shiftTimeCount',
align: 'center',
- width: 110
+ width: 100
},
{
title: '鍔犵彮鏃堕棿锛堝垎閽燂級',
dataIndex: 'overtime',
align: 'center',
- width: 110
+ width: 100
},
{
title: '瀹為檯鐝骇澶╂暟',
dataIndex: 'actualWorkDayCount',
align: 'center',
- width: 120
+ width: 100
},
{
title: '鏈堝害瀹為檯鐝骇鎬绘椂闂达紙鍒嗛挓锛�',
dataIndex: 'monthActualWorkDayTimeCount',
align: 'center',
- width: 110
+ width: 100
},
{
title: '闈炶鍒掑仠鏈烘崯澶憋紙鍒嗛挓锛夛紙涓�涓湀锛�',
@@ -241,7 +255,7 @@
title: '璁″垝绛変换鍔�',
dataIndex: 'plannedTaskDuration',
align: 'center',
- width: 110
+ width: 100
},
{
title: '妫�楠�',
@@ -270,45 +284,45 @@
title: '浼氳/鍩硅',
dataIndex: 'conferenceTrainingDuration',
align: 'center',
- width: 110
+ width: 100
},
{
title: '鍏朵粬浼戞伅绛�',
dataIndex: 'otherRestDuration',
align: 'center',
- width: 110
+ width: 100
}]
},
{
title: '璐熻嵎鏃堕棿锛堝皬鏃讹級',
dataIndex: 'loadTime',
align: 'center',
- width: 110
+ width: 100
},
{
title: '鏃堕棿寮�鍔ㄧ巼',
dataIndex: 'timeActuationRate',
align: 'center',
- width: 110,
+ width: 100,
customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
},
- {
- title: '鍔犲伐闆朵欢鏁帮紙浠讹級',
- dataIndex: 'processQuantity',
- align: 'center',
- width: 120
- },
- {
- title: '鏍囧噯鍔犲伐鏃堕棿锛堝垎閽燂級',
- dataIndex: 'standardProcessDuration',
- align: 'center',
- width: 120
- },
+ // {
+ // title: '鍔犲伐闆朵欢鏁帮紙浠讹級',
+ // dataIndex: 'processQuantity',
+ // align: 'center',
+ // width: 120
+ // },
+ // {
+ // title: '鏍囧噯鍔犲伐鏃堕棿锛堝垎閽燂級',
+ // dataIndex: 'standardProcessDuration',
+ // align: 'center',
+ // width: 120
+ // },
{
title: '鎬ц兘寮�鍔ㄧ巼',
dataIndex: 'performanceRate',
align: 'center',
- width: 110,
+ width: 100,
customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
},
{
@@ -328,7 +342,7 @@
title: '璁惧缁煎悎鏁堢巼',
dataIndex: 'overallEquipmentEfficiency',
align: 'center',
- width: 120,
+ width: 100,
customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
}
],
@@ -507,7 +521,7 @@
this.tableLoading = true
getAction(this.url.list, this.queryParam)
.then(res => {
- if (res.success) {
+ if (res.success && res.result) {
this.dataSource = res.result
this.tableLoading = false
}
@@ -538,6 +552,10 @@
this.loadData()
},
+ onCellChange(key, dataIndex, value) {
+ console.log('瑙﹀彂onCellChange', key, dataIndex, value)
+ },
+
/**
* 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
*/
--
Gitblit v1.9.3