From e91ea94c5e06bd183c65999b49c7852205e1ac64 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 20 九月 2023 17:42:55 +0800
Subject: [PATCH] 1、工作日历管理页面增加表格单条数据删除功能 2、报警号管理页面与对比分析页面中的驱动类型数据不再使用数据字典，而采用调用接口获取数据方式 3、报警号管理页面的新增与编辑弹窗中的是否过滤选项切换器优化
---
src/views/system/modules/QuartzJobListModal.vue | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/views/system/modules/QuartzJobListModal.vue b/src/views/system/modules/QuartzJobListModal.vue
index 1ee3b3d..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}姣`;
+ }
+
+ }
},
{
@@ -300,6 +323,9 @@
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
+ param.jobId = this.queryParam.jobId;
+ param.startTime = this.queryParam.startTime;
+ param.endTime = this.queryParam.endTime;
//鑾峰彇鐢ㄦ埛瀹氬埗鐨勫弬鏁板睘鎬�
// if (this.getCustomQueryParams) {
// param = this.getCustomQueryParams(param);
--
Gitblit v1.9.3