From d55fef9c7205b412cadc99c2bb2dea9329b7a2c9 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 31 七月 2024 09:39:19 +0800
Subject: [PATCH] 1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头 3、OEE综合效率分析页面新增车间字段
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index acb9a04..1fc1271 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: { EditableCell },
data() {
return {
dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
@@ -163,6 +170,12 @@
}
},
{
+ title: '杞﹂棿',
+ align: 'center',
+ dataIndex: 'productionName',
+ width: 200
+ },
+ {
title: '璁惧缁熶竴缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
@@ -177,8 +190,9 @@
{
title: '璁惧鍨嬪彿',
align: 'center',
- width: 110,
- dataIndex: 'equipmentModel'
+ width: 200,
+ dataIndex: 'equipmentModel',
+ scopedSlots: { customRender: 'equipmentModel' }
},
{
title: '鏃ユ湡',
@@ -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