From f156d473fb0c4ba31671b169bdb5c3a61f933ebf Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 16 八月 2023 17:42:57 +0800
Subject: [PATCH] 定时任务的界面调整和日志界面调整
---
src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue | 1 -
src/views/system/QuartzJobList.vue | 16 +++++++++-------
src/views/system/modules/QuartzJobListModal.vue | 33 ++++++++++++++++++---------------
3 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index 050ac85..fc95775 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -230,7 +230,6 @@
containLabel: true
},
legend:{
- //璁剧疆榛樿涓嶆樉绀�
selected:{
"鏇茬嚎":false,
},
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index c418702..b025d43 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -76,8 +76,7 @@
<span slot="action" slot-scope="text, record">
- <a @click="resumeJob(record)" v-if="record.status==-1">鍚姩</a>
- <a @click="pauseJob(record)" v-if="record.status==0">鍋滄</a>
+ <a @click="executeImmediately(record)">绔嬪嵆鎵ц</a>
<a-divider type="vertical" />
<a @click="handlequartzLog(record)">鏃ュ織</a>
@@ -85,7 +84,11 @@
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
<a-menu slot="overlay">
- <a-menu-item><a @click="executeImmediately(record)">绔嬪嵆鎵ц</a></a-menu-item>
+ <a-menu-item>
+ <a @click="resumeJob(record)" v-if="record.status==-1">鍚姩</a>
+ <a @click="pauseJob(record)" v-if="record.status==0">鍋滄</a>
+
+ </a-menu-item>
<a-menu-item><a @click="handleEdit(record)">缂栬緫</a></a-menu-item>
<a-menu-item>
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
@@ -146,9 +149,9 @@
}
},
{
- title: '浠诲姟绫诲悕',
+ title: '浠诲姟鍚嶇О',
align:"center",
- dataIndex: 'jobClassName',
+ dataIndex: 'jobName',
sorter: true,
/* customRender:function (text) {
return "*"+text.substring(9,text.length);
@@ -167,9 +170,8 @@
scopedSlots: {customRender: 'parameterRender'},
},
{
- title: '鎻忚堪',
+ title: '璇存槑',
align:"center",
- width: 250,
dataIndex: 'description',
scopedSlots: {customRender: 'description'},
},
diff --git a/src/views/system/modules/QuartzJobListModal.vue b/src/views/system/modules/QuartzJobListModal.vue
index d695b19..8b3d76e 100644
--- a/src/views/system/modules/QuartzJobListModal.vue
+++ b/src/views/system/modules/QuartzJobListModal.vue
@@ -10,7 +10,7 @@
<a-col :md="6" :sm="6">
<a-form-item label="浠诲姟鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヤ换鍔″悕绉�" v-model="queryParam.jobClassName"></a-input>
+ <a-input placeholder="璇疯緭鍏ヤ换鍔″悕绉�" v-model="queryParam.jobName"></a-input>
</a-form-item>
</a-col>
@@ -19,8 +19,10 @@
<a-range-picker show-time @change="dateParamChange" :disabledDate="disabledDate" format="YYYY-MM-DD HH:mm:ss" v-model="dates"/>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="2">
+ <a-col :md="4" :sm="4">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+
</a-col>
<a-col :md="2" :sm="2">
<a-button type="primary" icon="download" @click="handleExportXls('鎵ц鏃ュ織瀵煎嚭')">瀵煎嚭</a-button>
@@ -137,6 +139,7 @@
superQueryParams: '',
/** 楂樼骇鏌ヨ鎷兼帴鏂瑰紡 */
superQueryMatchType: 'and',
+
columns: [
{
title: '#',
@@ -148,27 +151,27 @@
return parseInt(index) + 1;
}
},
+ // {
+ // title: '浠诲姟鍚嶇О',
+ // align: 'center',
+ // dataIndex: 'jobClassName',
+ // },
+ // {
+ // title: 'cron琛ㄨ揪寮�',
+ // align: 'center',
+ // dataIndex: 'cronExpression',
+ // },
{
-
title: '浠诲姟鍚嶇О',
align: 'center',
- dataIndex: 'jobClassName',
- },
- {
- title: 'cron琛ㄨ揪寮�',
- align: 'center',
- dataIndex: 'cronExpression',
+ dataIndex: 'jobName'
},
{
title: '鍙傛暟',
align: 'center',
dataIndex: 'parameter'
},
- {
- title: '鎻忚堪',
- align: 'center',
- dataIndex: 'description'
- },
+
{
title: '鎶ラ敊淇℃伅',
dataIndex: 'action',
@@ -193,7 +196,7 @@
},
{
- title: '鍒涘缓鏃堕棿',
+ title: '浠诲姟鎵ц鏃堕棿',
align: 'center',
dataIndex: 'createTime'
},
--
Gitblit v1.9.3