From 02e63339ca097d62794caf8f2fd374c34b155b65 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 28 十月 2024 22:23:53 +0800
Subject: [PATCH] 一些更改
---
src/views/tigerprojects/tsk/tsk_job/index.vue | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/src/views/tigerprojects/tsk/tsk_job/index.vue b/src/views/tigerprojects/tsk/tsk_job/index.vue
index 32b7d5c..4aae29a 100644
--- a/src/views/tigerprojects/tsk/tsk_job/index.vue
+++ b/src/views/tigerprojects/tsk/tsk_job/index.vue
@@ -14,10 +14,17 @@
name: undefined,
},
{
- //绔嬪嵆寮�濮�
- tooltip: '绔嬪嵆寮�濮�',
- icon: 'start|svg',
+ //寮�濮嬭鍒�
+ tooltip: '寮�濮嬭鍒�',
+ icon: 'startplan|svg',
onClick: handleStart.bind(null, record),
+ name: undefined,
+ },
+ {
+ //绔嬪嵆杩愯
+ tooltip: '绔嬪嵆杩愯',
+ icon: 'start|svg',
+ onClick: RunImmediately.bind(null, record),
name: undefined,
},
{
@@ -56,7 +63,7 @@
import jobDrawer from './jobDrawer.vue';
import { FluentJobParam } from '/@/api/tigerapi/model/tskModel';
import { getListByPage } from '/@/api/tigerapi/system';
- import { AddTskJob, DeleteTsk_Job, StopTsk_Job } from '/@/api/tigerapi/tsk/tsk_job';
+ import { AddTskJob, DeleteTsk_Job, ImmediateRun, StopTsk_Job } from '/@/api/tigerapi/tsk/tsk_job';
import { useDrawer } from '/@/components/Drawer';
import { BasicTable, TableAction, useTable } from '/@/components/Table';
import { useMessage } from '/@/hooks/web/useMessage';
@@ -81,7 +88,7 @@
// },
NeedInclude: true,
},
- // afterFetch: afterFetch,
+ afterFetch: afterFetch,
columns,
formConfig: {
labelWidth: 120,
@@ -100,6 +107,19 @@
fixed: undefined,
},
});
+
+ /**
+ * @description: 璇锋眰涔嬪悗瀵硅繑鍥炲�艰繘琛屽鐞�
+ * @param {*} t
+ * @return {*}
+ */
+ function afterFetch(t) {
+ console.log(t);
+ t.forEach((item) => {
+ item.NextRunTime = item.Triggers[0].NextRunTime;
+ });
+ return t;
+ }
/**
* 娣诲姞浠诲姟
@@ -126,7 +146,7 @@
go('/job_detail/' + record.ID + ',' + record.JobName + '');
}
/**
- * @description:
+ * @description: 寮�濮嬭鍒�
* @param {*} record
* @return {*}
*/
@@ -134,17 +154,42 @@
const param: FluentJobParam = {
AssemblyName: record.AssemblyName,
Args: JSON.parse(record.Triggers[0].Args),
- DataType: record.JobName,
+ DataType: record.JobType,
JobName: record.JobName,
+ Remark: record.Remark,
};
- const apiAction = AddTskJob(param);
- apiAction.then((action) => {
+ AddTskJob(param).then((action) => {
if (action.IsSuccessed) {
reload();
} else {
createErrorModal({
title: t('sys.api.errorTip'),
- content: apiAction.Message,
+ content: action.Message,
+ getContainer: () => document.body,
+ });
+ }
+ });
+ }
+ /**
+ * @description: 绔嬪嵆杩愯
+ * @param {*} record
+ * @return {*}
+ */
+ function RunImmediately(record: Recordable) {
+ const param: FluentJobParam = {
+ AssemblyName: record.AssemblyName,
+ Args: JSON.parse(record.Triggers[0].Args),
+ DataType: record.JobType,
+ JobName: record.JobName,
+ Remark: record.Remark,
+ };
+ ImmediateRun(param).then((action) => {
+ if (action.IsSuccessed) {
+ reload();
+ } else {
+ createErrorModal({
+ title: t('sys.api.errorTip'),
+ content: action.Message,
getContainer: () => document.body,
});
}
--
Gitblit v1.9.3