From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
index 3f87906..f301ebf 100644
--- a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
+++ b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
@@ -41,23 +41,23 @@
</div>
<div class="container" id="EfficiencyShift" style="flex:1;overflow: hidden">
- <a-table :columns="columns" rowKey="equipmentId" :dataSource="dataSource.records" :scroll="{x:'max-content',y:scrollY}" :pagination="false" bordered>
+ <a-table :columns="columns" rowKey="equipmentId" :dataSource="dataSource" :scroll="{x:'max-content',y:scrollY}" :pagination="false" bordered>
<span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>
</a-table>
</div>
- <div class="pagination">
- <a-pagination
- :total=dataSource.total
- :show-total="(total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉"
- :page-size="+queryParam.pageSize"
- :default-current="1"
- :current=+queryParam.pageNo
- show-size-changer
- :pageSizeOptions="['20','30','40','50']"
- @change="handlePageNoChange"
- @showSizeChange="handlePageSizeChange"
- />
- </div>
+ <!--<div class="pagination">-->
+ <!--<a-pagination-->
+ <!--:total=dataSource.total-->
+ <!--:show-total="(total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉"-->
+ <!--:page-size="+queryParam.pageSize"-->
+ <!--:default-current="1"-->
+ <!--:current=+queryParam.pageNo-->
+ <!--show-size-changer-->
+ <!--:pageSizeOptions="['20','30','40','50']"-->
+ <!--@change="handlePageNoChange"-->
+ <!--@showSizeChange="handlePageSizeChange"-->
+ <!--/>-->
+ <!--</div>-->
</div>
</template>
@@ -95,7 +95,7 @@
title: '搴忓彿',
dataIndex: '',
key: 'rowIndex',
- width: 70,
+ width: 60,
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
@@ -106,18 +106,18 @@
title: '璁惧缁熶竴缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
- width: 120
+ width: 200
},
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 150,
+ width: 200,
dataIndex: 'equipmentName'
},
{
title: '椹卞姩绫诲瀷',
align: 'center',
- width: 110,
+ width: 100,
dataIndex: 'driveType'
},
{
@@ -129,7 +129,7 @@
{
title: '鍔犲伐浠舵暟',
align: 'center',
- width: 80,
+ width: 100,
dataIndex: 'processCount'
},
{
@@ -137,14 +137,14 @@
dataIndex: 'duration',
align: 'center',
scopedSlots: { customRender: 'duration' },
- width: 110
+ width: 150
},
- {
- title: '鏃ユ湡',
- dataIndex: 'theDate',
- align: 'center',
- width: 110
- }
+ // {
+ // title: '鏃ユ湡',
+ // dataIndex: 'theDate',
+ // align: 'center',
+ // width: 110
+ // }
],
dataSource: [],
driveTypeList: [],
--
Gitblit v1.9.3