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/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue |   45 +++++++++++++++++++++++++++++----------------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
index 7059019..a20afa7 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/DailyMaintenanceStandardDetail.vue
@@ -137,22 +137,27 @@
         //   scopedSlots: { customRender: 'photo' },
         // },
         {
-          title: '淇濆吇椤圭洰',
+          title: '缁翠慨淇濆吇瑙掕壊',
+          align: "center",
+          dataIndex: 'maintenanceRoleName',
+        },
+        {
+          title: '淇濆吇鍐呭',
           align: "center",
           dataIndex: 'name',
 
         },
-        {
-          title: '淇濆吇鏍囧噯',
-          align: "center",
-          dataIndex: 'standard',
+        // {
+        //   title: '淇濆吇鏍囧噯',
+        //   align: "center",
+        //   dataIndex: 'standard',
 
-        },
-        {
-          title: '閮ㄤ綅',
-          align: "center",
-          dataIndex: 'location',
-        },
+        // },
+        // {
+        //   title: '閮ㄤ綅',
+        //   align: "center",
+        //   dataIndex: 'location',
+        // },
         // {
         //   title: '鏂规硶',
         //   align: "center",
@@ -184,16 +189,24 @@
         //   align: "center",
         //   dataIndex: 'maintenanceSpecialtyName',
         // },
-        {
-          title: '缁翠慨淇濆吇瑙掕壊',
-          align: "center",
-          dataIndex: 'maintenanceRoleName',
-        },
+
 
       ],
       url: {
         list: "/eam/maintenanceStandardDetail/getMaintenanceStandardList",//鏁版嵁鏉ユ簮mom_eam_daily_inspection_standard_detail
       },
+      /* 鍒嗛〉鍙傛暟 */
+      ipagination: {
+        current: 1,
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
     }
   },
   created() {

--
Gitblit v1.9.3