From 14e6fca4c624e161dae9b7e905f9fccb03ba0177 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 13 十一月 2023 10:42:08 +0800
Subject: [PATCH] 1、车间看板页面实现鼠标悬浮于设备上出现设备详细信息弹窗，鼠标移出弹窗消失 2、设备参数阈值管理页面新增至mdc模块设备基础配置菜单下并完成所有布局及功能实现
---
src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue b/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
index cfbf9a5..8e443b9 100644
--- a/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
+++ b/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
@@ -8,7 +8,7 @@
rowKey="id"
:columns="columns"
:dataSource="dataSource"
- :pagination=false
+ :pagination="ipagination"
:loading="loading"
@change="handleTableChange"
>
@@ -37,6 +37,17 @@
data() {
return {
description: '閫傞厤璁惧',
+ ipagination:{
+ current: 1,
+ pageSize: 10,
+ pageSizeOptions: ['10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
// 琛ㄥご
columns: [
{
@@ -55,16 +66,16 @@
dataIndex: 'batchNum',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitName',
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: "center",
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: "center",
dataIndex: 'auxiliaryUnitName',
@@ -73,7 +84,7 @@
title: '杈呮暟閲�',
align: "center",
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
title: '浠撳簱',
align: "center",
@@ -103,14 +114,14 @@
dataIndex: 'supplierName',
},
{
- title: '鏈夋晥鏃ユ湡',
+ title: '鏈夋晥鏈�',
align: "center",
dataIndex: 'validityPeriod',
},
{
title: '澶辨晥棰勮鎶�',
align: "center",
- dataIndex: 'constructorName5',
+ dataIndex: 'validityForecast',
},
],
url: {
--
Gitblit v1.9.3