From e4e076e6707f557a70264a06c1e57e67b753a224 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 13 十一月 2024 11:54:26 +0800
Subject: [PATCH] 1、定时任务页面增加字段 2、全局项目有关名称改为中国航发成发以及调整logo
---
src/views/system/QuartzJobList.vue | 82 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index 3e15fde..3f6c98a 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -7,13 +7,13 @@
<a-row :gutter="24">
<a-col :md="6" :sm="10">
- <a-form-model-item label="浠诲姟绫诲悕" prop="jobClassName">
- <a-input placeholder="璇疯緭鍏ヤ换鍔＄被鍚�" v-model="queryParam.jobClassName"></a-input>
+ <a-form-model-item label="浠诲姟鍚嶇О" prop="jobClassName">
+ <a-input placeholder="璇疯緭鍏ヤ换鍔″悕绉�" v-model="queryParam.jobName"></a-input>
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="10">
<a-form-model-item label="浠诲姟鐘舵��" prop="status">
- <a-select style="width: 220px" v-model="queryParam.status" placeholder="璇烽�夋嫨鐘舵��">
+ <a-select style="width: 100%" v-model="queryParam.status" placeholder="璇烽�夋嫨鐘舵��">
<a-select-option value="">鍏ㄩ儴</a-select-option>
<a-select-option value="0">姝ｅ父</a-select-option>
<a-select-option value="-1">鍋滄</a-select-option>
@@ -64,7 +64,6 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- :scroll="{x:true}"
@change="handleTableChange">
<!-- 瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
@@ -77,14 +76,19 @@
<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>
+ <a-divider type="vertical" />
<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)">
@@ -106,11 +110,15 @@
<!-- 琛ㄥ崟鍖哄煙 -->
<quartzJob-modal ref="modalForm" @ok="modalFormOk"></quartzJob-modal>
+
+ <!--鏃ュ織-->
+ <quartz-job-list-modal ref="modalFormList" @ok="modalFormOk"></quartz-job-list-modal>
</a-card>
</template>
<script>
import QuartzJobModal from './modules/QuartzJobModal'
+ import QuartzJobListModal from './modules/QuartzJobListModal'
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JEllipsis from "@/components/jeecg/JEllipsis";
@@ -120,6 +128,7 @@
mixins:[JeecgListMixin],
components: {
QuartzJobModal,
+ QuartzJobListModal,
JEllipsis
},
data () {
@@ -140,13 +149,13 @@
}
},
{
- title: '浠诲姟绫诲悕',
+ title: '浠诲姟鍚嶇О',
align:"center",
- dataIndex: 'jobClassName',
+ dataIndex: 'jobName',
sorter: true,
-/* customRender:function (text) {
- return "*"+text.substring(9,text.length);
- }*/
+ /* customRender:function (text) {
+ return "*"+text.substring(9,text.length);
+ }*/
},
{
title: 'cron琛ㄨ揪寮�',
@@ -161,9 +170,8 @@
scopedSlots: {customRender: 'parameterRender'},
},
{
- title: '鎻忚堪',
+ title: '璇存槑',
align:"center",
- width: 250,
dataIndex: 'description',
scopedSlots: {customRender: 'description'},
},
@@ -186,7 +194,7 @@
scopedSlots: { customRender: 'action' },
}
],
- url: {
+ url: {
list: "/sys/quartzJob/list",
delete: "/sys/quartzJob/delete",
deleteBatch: "/sys/quartzJob/deleteBatch",
@@ -205,7 +213,11 @@
},
methods: {
-
+ handlequartzLog: function (record) {
+ this.$refs.modalFormList.openPage(record);
+ this.$refs.modalFormList.title = "鎵ц鏃ュ織";
+ this.$refs.modalFormList.disableSubmit = false;
+ },
//绛涢�夐渶瑕侀噸鍐檋andleTableChange
handleTableChange(pagination, filters, sorter) {
//鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
@@ -215,7 +227,7 @@
this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
}
//杩欑绛涢�夋柟寮忓彧鏀寔鍗曢��
-
+
// update-begin-author:liusq date:20210624 for:鍓嶅彴瀹氭椂浠诲姟鏃犳硶缈婚〉 #2666
if(filters && Object.keys(filters).length>0 && filters.status){
this.filters.status = filters.status[0];
@@ -233,11 +245,19 @@
onOk: function(){
getAction(that.url.pause,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
@@ -253,11 +273,19 @@
onOk: function(){
getAction(that.url.resume,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
@@ -272,11 +300,19 @@
onOk: function(){
getAction(that.url.execute,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
--
Gitblit v1.9.3