From f67b4c736c68cd3d1f75e5fc6b6e23189f12b979 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 19 十二月 2023 11:34:57 +0800
Subject: [PATCH] 设备管理增加按车间筛选条件

---
 src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index a68adbb..fd2560d 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -41,7 +41,7 @@
               <a-col :md="8" :sm="8" :xs="8">
                 <a-space>
                   <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
-                  <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+                  <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
                   <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
                 </a-space>
               </a-col>
@@ -54,7 +54,7 @@
       <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
         <div class="table2">
           <a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
-                   :scroll="{ x: 3000, y: false }">
+                   :scroll="{ x: 3200, y: false }">
           </a-table>
         </div>
       </div>
@@ -66,7 +66,7 @@
           :default-current="1"
           :current=+queryParam.pageNo
           show-size-changer
-          :pageSizeOptions="['10','15','20','25']"
+          :pageSizeOptions="['20','30','40','50']"
           @change="handlePageNoChange"
           @showSizeChange="handlePageSizeChange"
         />
@@ -95,7 +95,7 @@
         dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
         identifying: [],
         queryParam: {
-          pageSize: 10,
+          pageSize: 20,
           pageNo: 1
         },
         queryParamEquip: {},
@@ -129,7 +129,7 @@
           {
             title: '璁惧鍚嶇О',
             align: 'center',
-            width: 150,
+            width: 200,
             dataIndex: 'equipmentName'
             // fixed: 'left'
           },
@@ -148,8 +148,9 @@
           {
             title: '鐝',
             align: 'center',
-            width: 80,
-            dataIndex: 'shift'
+            width: 300,
+            dataIndex: 'shift',
+            ellipsis: true,
           },
           {
             title: '姣忕彮灏忔椂',
@@ -409,18 +410,11 @@
       },
 
       searchReset() {
-        this.typeTree = this.queryParam.typeTree
-        this.typeParent = this.queryParam.parentId
-        this.typeEquipment = this.queryParam.equipmentId
         this.queryParam = {
-          pageSize: 10,
+          pageSize: 20,
           pageNo: 1
         }
         this.dates = []
-        this.shiftSubList = []
-        this.queryParam.typeTree = this.typeTree
-        this.queryParam.parentId = this.typeParent
-        this.queryParam.equipmentId = this.typeEquipment
         this.loadData()
       },
 

--
Gitblit v1.9.3