From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue b/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
index 9bbf539..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: [
{
@@ -103,14 +114,14 @@
dataIndex: 'supplierName',
},
{
- title: '鏈夋晥鏃ユ湡',
+ title: '鏈夋晥鏈�',
align: "center",
dataIndex: 'validityPeriod',
},
{
title: '澶辨晥棰勮鎶�',
align: "center",
- dataIndex: 'constructorName5',
+ dataIndex: 'validityForecast',
},
],
url: {
--
Gitblit v1.9.3