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/system/modules/QuartzJobListModal.vue | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/views/system/modules/QuartzJobListModal.vue b/src/views/system/modules/QuartzJobListModal.vue
index 89f4297..3910b90 100644
--- a/src/views/system/modules/QuartzJobListModal.vue
+++ b/src/views/system/modules/QuartzJobListModal.vue
@@ -67,7 +67,7 @@
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import {
deleteAction,
- requestPut,
+ requestPut,
getAction,
downFile,
postAction
@@ -193,6 +193,29 @@
title: '鎵ц鏃堕棿锛堟绉掞級',
align: 'center',
dataIndex: 'executionTime',
+ customRender:(t,r,index) =>{
+ var milliseconds = parseInt(t)
+ let hours = Math.floor(milliseconds / 3600000);
+ milliseconds = milliseconds % 3600000;
+ let minutes = Math.floor(milliseconds / 60000);
+ milliseconds = milliseconds % 60000;
+ let seconds = Math.floor(milliseconds / 1000);
+ milliseconds = milliseconds % 1000;
+ if(hours == 0){
+ if(minutes == 0){
+ if(seconds == 0) {
+ return `${milliseconds}姣`
+ }else{
+ return `${seconds}绉� ${milliseconds}姣`
+ }
+ }else{
+ return `${minutes}鍒嗛挓 ${seconds}绉� ${milliseconds}姣`;
+ }
+ }else{
+ return `${hours}灏忔椂 ${minutes}鍒嗛挓 ${seconds}绉� ${milliseconds}姣`;
+ }
+
+ }
},
{
--
Gitblit v1.9.3