From b66eab74b627b0e3746f5cb4f6a7d7cb142e9a6d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 01 八月 2024 10:36:42 +0800
Subject: [PATCH] OEE综合效率分析页面删除加工数量和标准加工时间字段

---
 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index acb9a04..67b8784 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)],
@@ -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: '鏃ユ湡',
@@ -292,18 +306,18 @@
             width: 110,
             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',
@@ -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