feat：新增定时任务功能

+import { BasicPageParams } from '/@/api/model/baseModel';
+export type ReportQueryParam = BasicPageParams & SchedueParam;
+
+export type SchedueParam = {
+  status: true;
+  jobName: string;
+  jobGroup: string;
+  orderFiled: string;
+  orderType: string;
+  data?: any;
+  code?: number;
+};
+
+export interface ReportModel {
+  code?: number;
+  concurrent: number;
+  createTime: string;
+  creator: string;
+  cronExpression: string;
+  defaultConfig: string;
+  description: string;
+  enabled: true;
+  icon: string;
+  id: string;
+  invokeTarget: string;
+  jobGroup: string;
+  jobName: string;
+  misfirePolicy: number;
+  name: string;
+  roleIds: [string];
+  status: number;
+  tenantExpireTime: string;
+  tenantId: string;
+  tenantProfileId: string;
+  tenantStatus: string;
+  updateTime: string;
+  updater: string;
+}

+import { defHttp } from '/@/utils/http/axios';
+import { ReportModel, ReportQueryParam } from './model/schedueModel';
+
+enum ReportManagerApi {
+  GET_REPORT_API = '/monitor/job/page',
+  POST_REPORT_API = '/monitor/job/add',
+  DELETE_REPORT_API = '/monitor/job',
+  PUT_REPORT_API = '/monitor/job/update',
+  PUTID_REPORT_API = '/monitor/job',
+  RUN_REPORT_API = '/monitor/job/run',
+  JOB_LOG_DETAIL_API = '/monitor/jobLog/get/',
+  JOB_LOG_PAGE_API = '/monitor/jobLog/page',
+  DELETE_LOG_API = '/monitor/jobLog',
+  POST_LOG_CLEAN_API = '/monitor/jobLog/clean',
+}
+
+//分页
+export const scheduePage = (params: ReportQueryParam) => {
+  return defHttp.get<ReportQueryParam>({
+    url: ReportManagerApi.GET_REPORT_API,
+    params,
+  });
+};
+
+//删除
+export const deleteSchedueManage = (ids: string[]) => {
+  return defHttp.delete({
+    url: ReportManagerApi.DELETE_REPORT_API,
+    data: {
+      ids: ids,
+    },
+  });
+};
+
+// 创建
+export const createOrEditSchedueManage = (data) => {
+  return defHttp.post<ReportModel>({
+    url: ReportManagerApi.POST_REPORT_API,
+    data,
+  });
+};
+
+// 编辑
+export const putSchedueConfigManage = (data) => {
+  return defHttp.post<ReportModel>({
+    url: ReportManagerApi.PUT_REPORT_API,
+    data,
+  });
+};
+
+// 修改状态 id status
+export const putSchedueByidAndStatusManage = (id, status) => {
+  return defHttp.put<ReportModel>({
+    url: ReportManagerApi.PUTID_REPORT_API + '/changeStatus/' + id + '/' + status,
+  });
+};
+//执行一次
+export const postRunSchedueConfigManage = (id) => {
+  return defHttp.post<ReportModel>({
+    url: ReportManagerApi.RUN_REPORT_API+'/'+id,
+  });
+};
+
+/**
+ * 调度日志
+ */
+
+//分页
+export const schedueLogPage = (params: ReportQueryParam) => {
+  return defHttp.get<ReportQueryParam>({
+    url: ReportManagerApi.JOB_LOG_PAGE_API,
+    params,
+  });
+};
+
+//删除
+export const deleteSchedueLogManage = (ids: string[]) => {
+  return defHttp.delete({
+    url: ReportManagerApi.DELETE_LOG_API,
+    data: {
+      ids: ids,
+    },
+  });
+};
+
+// 清空
+export const schedueLogCleanPage = () => {
+  return defHttp.post<ReportModel>({
+    url: ReportManagerApi.POST_LOG_CLEAN_API,
+  });
+};
+
+//详情
+export const schedueLogDetailPage = (jobId, id) => {
+  return defHttp.get<ReportQueryParam>({
+    url: ReportManagerApi.JOB_LOG_DETAIL_API + '/' + jobId + '/' + id,
+  });
+};

@@ -135,7 +135,17 @@
   });
   const preTimeList = ref('执行预览，会忽略年份参数。');
 
-  // cron表达式
+  //fix 去除字符串里的'W' 当选择工作日 会自动在后面加上W 比如1W 2W corn解析会报错
+  function Letter(str) {
+    let result;
+    let reg = /[W]+/;
+    while ((result = str.match(reg))) {
+      //判断str.match(reg)是否没有字母了
+      str = str.replace(result[0], ''); //替换掉字母  result[0] 是 str.match(reg)匹配到的字母
+    }
+    return str;
+  }
+  // 最终生成的cron表达式
   const cronValueInner = computed(() => {
     let result: string[] = [];
     if (!props.hideSecond) {
@@ -143,7 +153,7 @@
     }
     result.push(minute.value ? minute.value : '*');
     result.push(hour.value ? hour.value : '*');
-    result.push(day.value ? day.value : '*');
+    result.push(day.value ? Letter(day.value) : '*');
     result.push(month.value ? month.value : '*');
     result.push(week.value ? week.value : '?');
     if (!props.hideYear && !props.hideSecond) result.push(year.value ? year.value : '*');
@@ -177,40 +187,6 @@
     emitValue(newValue);
     assignInput();
   });
-
-  // watch(minute, () => {
-  //   if (second.value === '*') {
-  //     second.value = '0'
-  //   }
-  // })
-  // watch(hour, () => {
-  //   if (minute.value === '*') {
-  //     minute.value = '0'
-  //   }
-  // })
-  // watch(day, () => {
-  //   if (day.value !== '?' && hour.value === '*') {
-  //     hour.value = '0'
-  //   }
-  // })
-  // watch(week, () => {
-  //   if (week.value !== '?' && hour.value === '*') {
-  //     hour.value = '0'
-  //   }
-  // })
-  // watch(month, () => {
-  //   if (day.value === '?' && week.value === '*') {
-  //     week.value = '1'
-  //   } else if (week.value === '?' && day.value === '*') {
-  //     day.value = '1'
-  //   }
-  // })
-  // watch(year, () => {
-  //   if (month.value === '*') {
-  //     month.value = '1'
-  //   }
-  // })
-
   assignInput();
   formatValue();
   calTriggerListInner();
@@ -219,7 +195,7 @@
     inputValues.second = second.value;
     inputValues.minute = minute.value;
     inputValues.hour = hour.value;
-    inputValues.day = day.value;
+    inputValues.day = Letter(day.value);
     inputValues.month = month.value;
     inputValues.week = week.value;
     inputValues.year = year.value;

 <template>
-  <BasicModal @register="registerModal" title="Cron表达式" width="800px" @ok="onOk">
+  <BasicModal
+    @register="registerModal"
+    title="Cron表达式"
+    width="800px"
+    @cancel="onCancel"
+    :footer="null"
+  >
     <EasyCron v-bind="attrs" />
+    <div style="float: right; margin-top: 2vh">
+      <Button type="default" @click="onCancel" class="mr-2">取消</Button>
+      <Button type="primary" @click="onOk" class="mr-2">确认</Button>
+    </div>
   </BasicModal>
 </template>
 
@@ -8,21 +18,29 @@
   import { defineComponent } from 'vue';
   import { useAttrs } from '/@/hooks/core/useAttrs';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import EasyCron from './EasyCronInner.vue'
+  import EasyCron from './EasyCronInner.vue';
+  import { Button } from '/@/components/Button';
 
   export default defineComponent({
     name: 'EasyCronModal',
     inheritAttrs: false,
-    components: { BasicModal, EasyCron },
+    components: { BasicModal, EasyCron, Button },
     setup() {
       const attrs = useAttrs();
       const [registerModal, { closeModal }] = useModalInner();
 
       function onOk() {
-        closeModal();
+        setTimeout(() => {
+          closeModal();
+        }, 500);
+      }
+      function onCancel() {
+        setTimeout(() => {
+          closeModal();
+        }, 500);
       }
 
-      return { attrs, registerModal, onOk };
+      return { attrs, registerModal, onOk, onCancel };
     },
   });
 </script>

@@ -36,7 +36,7 @@
         <a-radio :value="TypeEnum.specify" v-bind="beforeRadioAttrs">指定</a-radio>
         <div class="list list-cn">
           <a-checkbox-group v-model:value="valueList">
-            <template v-for="opt in weekOptions" :key="i">
+            <template v-for="opt in weekOptions" :key="opt.label">
               <a-checkbox :value="opt.value" v-bind="typeSpecifyAttrs">{{ opt.label }}</a-checkbox>
             </template>
           </a-checkbox-group>

@@ -107,7 +107,7 @@ const setting: ProjectConfig = {
     // Fold trigger position
     trigger: TriggerEnum.HEADER,
     // Turn on accordion mode, only show a menu
-    accordion: false,
+    accordion: true,
     // Switch page to close menu
     closeMixSidebarOnChange: false,
     // Module opening method ‘click’ |'hover'

 import { ref } from 'vue';
-import { DescItem } from '/@/components/Description/index';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import moment from 'moment';
@@ -13,11 +12,7 @@ import {
   isMonth,
   isEmpty,
   isDefultWeek,
-  isMin,
-  isMax,
-  isAvg,
-  isSum,
-  isCountAll,
+  isFixedWeek,
 } from './timeConfig';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
 
@@ -347,16 +342,6 @@ export const formSchema: QFormSchema[] = [
       };
     },
   },
-  // {
-  //   field: 'deviceAttr',
-  //   label: '设备属性',
-  //   component: 'Select',
-  //   componentProps: {
-  //     placeholder: '请选择设备属性',
-  //   },
-  //   colProps: { span: 24 },
-  //   slot: 'deviceAttr',
-  // },
   {
     field: 'dataCompare',
     label: '数据类型',
@@ -569,13 +554,7 @@ export const formSchema: QFormSchema[] = [
       };
     },
     colProps: { span: 24 },
-    ifShow: ({ values }) =>
-      (!isEmpty(values.agg) && !isDefultWeek(values.defaultWeek)) ||
-      isMin(values.agg) ||
-      isMax(values.agg) ||
-      isAvg(values.agg) ||
-      isSum(values.agg) ||
-      isCountAll(values.agg),
+    ifShow: ({ values }) => isFixedWeek(values.defaultWeek) && !isEmpty(values.agg),
   },
   {
     field: 'interval',
@@ -593,157 +572,6 @@ export const formSchema: QFormSchema[] = [
         },
       ],
     },
-    ifShow: ({ values }) =>
-      (!isEmpty(values.agg) && !isDefultWeek(values.defaultWeek)) ||
-      isMin(values.agg) ||
-      isMax(values.agg) ||
-      isAvg(values.agg) ||
-      isSum(values.agg) ||
-      isCountAll(values.agg),
-  },
-];
-
-export const personSchema: DescItem[] = [
-  {
-    field: 'b1',
-    label: '任务编号：',
-  },
-  {
-    field: 'b2',
-    label: '任务分组：',
-  },
-  {
-    field: 'b3',
-    label: '任务名称：',
-  },
-  {
-    field: 'b4',
-    label: '创建时间：',
-  },
-  {
-    field: 'b5',
-    label: 'cron表达式：',
-  },
-  {
-    field: 'b6',
-    label: '下次执行时间：',
-  },
-  {
-    field: 'b7',
-    label: '调用目标方法：',
-  },
-  {
-    field: 'b8',
-    label: '任务状态：',
-  },
-  {
-    field: 'b9',
-    label: '是否并发：',
-  },
-  {
-    field: 'b10',
-    label: '执行策略：',
-  },
-];
-
-// 调度日志表格配置
-export const columnSchedue: BasicColumn[] = [
-  {
-    title: '日志编号',
-    dataIndex: 'name',
-    width: 80,
-  },
-  {
-    title: '任务名称',
-    dataIndex: 'organizationId',
-    width: 120,
-  },
-  {
-    title: '任务组名',
-    dataIndex: 'dataCompare',
-    width: 120,
-  },
-  {
-    title: '调用目标字符串',
-    dataIndex: 'status',
-    width: 120,
-  },
-  {
-    title: '日志信息',
-    dataIndex: 'executeWay',
-    width: 160,
-  },
-  {
-    title: '执行状态',
-    dataIndex: 'devices',
-    width: 160,
-  },
-  {
-    title: '执行时间',
-    dataIndex: 'creator',
-    width: 180,
-  },
-];
-
-// 调度日志表格查询配置
-export const searchSchedueFormSchema: FormSchema[] = [
-  {
-    field: 'name',
-    label: '任务名称',
-    component: 'Input',
-    colProps: { span: 4 },
-    componentProps: {
-      maxLength: 36,
-      placeholder: '请输入任务名称',
-    },
-  },
-  {
-    field: 'status',
-    label: '任务组名',
-    component: 'Select',
-    colProps: { span: 4 },
-    componentProps: {
-      options: [
-        {
-          label: '默认',
-          value: 1,
-        },
-        {
-          label: '系统',
-          value: 0,
-        },
-      ],
-      placeholder: '请选择任务组名',
-    },
-  },
-  {
-    field: 'status1',
-    label: '执行状态',
-    component: 'Select',
-    colProps: { span: 4 },
-    componentProps: {
-      options: [
-        {
-          label: '成功',
-          value: 1,
-        },
-        {
-          label: '失败',
-          value: 0,
-        },
-      ],
-      placeholder: '请选择执行状态',
-    },
-  },
-  {
-    field: 'sendTime',
-    label: '执行时间',
-    component: 'RangePicker',
-    componentProps: {
-      showTime: {
-        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
-      },
-    },
-    colProps: { span: 4 },
+    ifShow: ({ values }) => isFixedWeek(values.defaultWeek) && !isEmpty(values.agg),
   },
 ];

@@ -8,11 +8,19 @@
       title="调度日志"
       @cancel="handleCancel"
       :showOkBtn="false"
+      destroyOnClose
     >
       <div>
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="primary"> 导出 </a-button>
+            <Popconfirm
+              title="您确定要清空全部数据"
+              ok-text="确定"
+              cancel-text="取消"
+              @confirm="handleClear"
+            >
+              <a-button type="primary"> 清空 </a-button>
+            </Popconfirm>
             <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消">
               <a-button type="primary" color="error" :disabled="hasBatchDelete">
                 批量删除
@@ -25,6 +33,7 @@
                 {
                   label: '查看',
                   icon: 'clarity:note-edit-line',
+                  onClick: handleView.bind(null, record),
                 },
                 {
                   label: '删除',
@@ -38,17 +47,8 @@
               ]"
             />
           </template>
-          <template #doStatus="{ record }">
-            <Switch
-              :disabled="disabledSwitch"
-              :checked="record.status === 1"
-              :loading="record.pendingStatus"
-              checkedChildren="启用"
-              unCheckedChildren="禁用"
-              @change="(checked:boolean)=>statusChange(checked,record)"
-            />
-          </template>
         </BasicTable>
+        <ScheduleLogViewModal @register="registerModalScheduleLogView" />
       </div>
     </BasicModal>
   </div>
@@ -57,16 +57,23 @@
   import { ref, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { columnSchedue, searchSchedueFormSchema } from '../../report/config/config.data';
+  import { columnSchedue, searchSchedueFormSchema } from './config.data';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { deleteReportManage, reportPage } from '/@/api/report/reportManager';
-  import { Popconfirm, Switch } from 'ant-design-vue';
+  import {
+    deleteSchedueLogManage,
+    schedueLogPage,
+    schedueLogCleanPage,
+  } from '/@/api/schedue/schedueManager';
+  import { Popconfirm } from 'ant-design-vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import ScheduleLogViewModal from './ScheduleLogViewModal.vue';
+  import { useModal } from '/@/components/Modal';
 
-  const disabledSwitch = ref(false);
+  const { createMessage } = useMessage();
   const heightNum = ref(800);
-  const [registerTable, { setProps, reload }] = useTable({
+  const [registerTable, { setProps, reload, getForm }] = useTable({
     title: '调度日志列表',
-    api: reportPage,
+    api: schedueLogPage,
     columns: columnSchedue,
     showIndexColumn: false,
     clickToRowSelect: false,
@@ -93,44 +100,34 @@
     reload();
   };
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteReportManage,
+    deleteSchedueLogManage,
     handleSuccess,
     setProps
   );
 
-  const [register] = useModalInner((data) => {
-    console.log(data);
+  const [register] = useModalInner(() => {
     nextTick(() => {
       setProps(selectionOptions);
       setProps({
         rowKey: 'id',
       });
+      //重置清空搜索表单
+      const { resetFields } = getForm();
+      resetFields();
     });
   });
   const handleCancel = () => {};
-  const statusChange = async (checked, record) => {
-    try {
-      setProps({
-        loading: true,
-      });
-      disabledSwitch.value = true;
-      const newStatus = checked ? 1 : 0;
-      console.log(checked, record, newStatus);
-      // const res = await putReportByidAndStatusManage(record.id, newStatus);
-      // if (res && newStatus) {
-      //   createMessage.success(`启用成功`);
-      // } else {
-      //   createMessage.success('禁用成功');
-      // }
-    } finally {
-      setTimeout(() => {
-        setProps({
-          loading: false,
-        });
-        disabledSwitch.value = false;
-      }, 500);
-      reload();
-    }
+  const handleClear = async () => {
+    await schedueLogCleanPage();
+    createMessage.success(`清空成功`);
+    handleSuccess();
+  };
+  const [registerModalScheduleLogView, { openModal: openModalLogView }] = useModal();
+  const handleView = (record: Recordable) => {
+    openModalLogView(true, {
+      isUpdate: true,
+      record,
+    });
   };
 </script>
 <style lang="less" scoped></style>

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="62rem"
+      :height="heightNum"
+      @register="register"
+      title="调度日志详细信息"
+      @cancel="handleCancel"
+      :showOkBtn="false"
+      style="font-size: 12px"
+    >
+      <div>
+        <Description :column="3" size="middle" @register="registeDesc" />
+      </div>
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { ref, nextTick, reactive } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { scheduleLogDetailSchema } from './config.data';
+  import { Description } from '/@/components/Description/index';
+  import { useDescription } from '/@/components/Description';
+  import { schedueLogDetailPage } from '/@/api/schedue/schedueManager';
+
+  const heightNum = ref(800);
+  let personData = reactive({});
+  const [registeDesc, { setDescProps }] = useDescription({
+    title: '调度日志详细信息',
+    data: personData,
+    schema: scheduleLogDetailSchema,
+    column: 3,
+  });
+  const [register] = useModalInner(async (data) => {
+    const res = await schedueLogDetailPage(data.record.jobId, data.record.id);
+    if (res.code === 200) {
+      nextTick(() => {
+        for (let i in res.data) {
+          Reflect.set(personData, i, res.data[i]);
+        }
+        setDescProps(personData);
+      });
+    }
+  });
+  const handleCancel = () => {};
+</script>
+<style lang="less" scoped>
+  :deep(.vben-basic-title-normal) {
+    font-size: 16px;
+    font-weight: 500;
+  }
+  :deep(.vben-collapse-container__header) {
+    border-bottom: none;
+  }
+</style>

@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { formSchema } from './config.form.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  // import { createOrEditReportManage, putReportConfigManage } from '/@/api/report/reportManager';
+  import { createOrEditSchedueManage, putSchedueConfigManage } from '/@/api/schedue/schedueManager';
   import { useMessage } from '/@/hooks/web/useMessage';
 
   const emit = defineEmits(['success', 'register']);
@@ -33,6 +33,7 @@
     isUpdate.value = !!data?.isUpdate;
     if (unref(isUpdate)) {
       //回显基础数据
+      editId.value = data.record.id;
       await setFieldsValue(data.record);
     } else {
       editId.value = '';
@@ -46,12 +47,15 @@
       const { createMessage } = useMessage();
       const values = await validate();
       if (!values) return;
-      postObj = {};
+      postObj = {
+        ...values,
+        ...{ id: editId.value !== '' ? editId.value : '' },
+      };
       let saveMessage = '添加成功';
       let updateMessage = '修改成功';
-      // editId.value !== ''
-      //   ? await putReportConfigManage(postObj)
-      //   : await createOrEditReportManage(postObj);
+      editId.value !== ''
+        ? await putSchedueConfigManage(postObj)
+        : await createOrEditSchedueManage(postObj);
 
       closeDrawer();
       emit('success');

@@ -19,7 +19,7 @@
 <script setup lang="ts">
   import { ref, nextTick, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { personSchema } from '../../report/config/config.data';
+  import { personSchema } from './config.data';
   import { Description } from '/@/components/Description/index';
   import { useDescription } from '/@/components/Description';
 
@@ -32,18 +32,11 @@
     column: 3,
   });
   const [register] = useModalInner((data) => {
-    console.log(data);
     nextTick(() => {
-      Reflect.set(personData, 'b1', '1');
-      Reflect.set(personData, 'b2', '默认');
-      Reflect.set(personData, 'b3', '系统默认（无参）');
-      Reflect.set(personData, 'b4', '2022-08-01 12:01:58');
-      Reflect.set(personData, 'b5', '0/10 * * * * ?');
-      Reflect.set(personData, 'b6', '2022-08-08 10:25:00');
-      Reflect.set(personData, 'b7', 'ryTask.ryNoParams');
-      Reflect.set(personData, 'b8', '失败');
-      Reflect.set(personData, 'b9', '禁止');
-      Reflect.set(personData, 'b10', '禁止');
+      //回显
+      for (let i in data.record) {
+        Reflect.set(personData, i, data.record[i]);
+      }
       setDescProps(personData);
     });
   });

 import { DescItem } from '/@/components/Description/index';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import moment from 'moment';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
 
+//任务详细配置
 export const personSchema: DescItem[] = [
   {
-    field: 'b1',
-    label: '任务编号：',
-  },
-  {
-    field: 'b2',
+    field: 'jobGroup',
     label: '任务分组：',
+    render: (_, data) => {
+      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+    },
   },
   {
-    field: 'b3',
+    field: 'jobName',
     label: '任务名称：',
   },
   {
-    field: 'b4',
+    field: 'createTime',
     label: '创建时间：',
   },
   {
-    field: 'b5',
+    field: 'cronExpression',
     label: 'cron表达式：',
   },
   {
@@ -28,12 +30,15 @@ export const personSchema: DescItem[] = [
     label: '下次执行时间：',
   },
   {
-    field: 'b7',
+    field: 'invokeTarget',
     label: '调用目标方法：',
   },
   {
-    field: 'b8',
+    field: 'status',
     label: '任务状态：',
+    render: (_, data) => {
+      return data.status == 1 ? '启用' : '禁用';
+    },
   },
   {
     field: 'b9',
@@ -48,39 +53,49 @@ export const personSchema: DescItem[] = [
 // 调度日志表格配置
 export const columnSchedue: BasicColumn[] = [
   {
-    title: '日志编号',
-    dataIndex: 'name',
-    width: 80,
-  },
-  {
     title: '任务名称',
-    dataIndex: 'organizationId',
+    dataIndex: 'jobName',
     width: 120,
   },
   {
     title: '任务组名',
-    dataIndex: 'dataCompare',
+    dataIndex: 'jobGroup',
     width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record.jobGroup === 'Default'
+        ? '默认'
+        : record.jobGroup === 'System'
+        ? '系统'
+        : '报表';
+    },
   },
   {
     title: '调用目标字符串',
-    dataIndex: 'status',
+    dataIndex: 'invokeTarget',
     width: 120,
   },
   {
     title: '日志信息',
-    dataIndex: 'executeWay',
+    dataIndex: 'jobMessage',
     width: 160,
   },
   {
     title: '执行状态',
-    dataIndex: 'devices',
+    dataIndex: 'status',
     width: 160,
-    slots: { customRender: 'doStatus' },
+    customRender: ({ record }) => {
+      const status = record.status;
+      const success = status === 1;
+      const color = success ? 'green' : 'red';
+      const successText: string = '成功';
+      const failedText: string = '失败';
+      const text = success ? successText : failedText;
+      return h(Tag, { color: color }, () => text);
+    },
   },
   {
     title: '执行时间',
-    dataIndex: 'creator',
+    dataIndex: 'startTime',
     width: 180,
   },
 ];
@@ -88,7 +103,7 @@ export const columnSchedue: BasicColumn[] = [
 // 调度日志表格查询配置
 export const searchSchedueFormSchema: FormSchema[] = [
   {
-    field: 'name',
+    field: 'jobName',
     label: '任务名称',
     component: 'Input',
     colProps: { span: 4 },
@@ -98,7 +113,7 @@ export const searchSchedueFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'status',
+    field: 'jobGroup',
     label: '任务组名',
     component: 'Select',
     colProps: { span: 4 },
@@ -106,18 +121,22 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 1,
+          value: 'Default',
         },
         {
           label: '系统',
-          value: 0,
+          value: 'System',
+        },
+        {
+          label: '报表',
+          value: 'Report',
         },
       ],
       placeholder: '请选择任务组名',
     },
   },
   {
-    field: 'status1',
+    field: 'status',
     label: '执行状态',
     component: 'Select',
     colProps: { span: 4 },
@@ -147,3 +166,36 @@ export const searchSchedueFormSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
 ];
+// 调度日志详情
+export const scheduleLogDetailSchema: DescItem[] = [
+  {
+    field: 'jobName',
+    label: '任务名称：',
+  },
+  {
+    field: 'jobGroup',
+    label: '任务组名：',
+    render: (_, data) => {
+      return data.jobGroup == 'Default' ? '默认' : data.jobGroup == 'System' ? '系统' : '报表';
+    },
+  },
+  {
+    field: 'invokeTarget',
+    label: '调用目标字符串：',
+  },
+  {
+    field: 'jobMessage',
+    label: '日志信息：',
+  },
+  {
+    field: 'status',
+    label: '执行状态：',
+    render: (_, data) => {
+      return data.status == 1 ? '成功' : '失败';
+    },
+  },
+  {
+    field: 'startTime',
+    label: '执行时间：',
+  },
+];

@@ -2,40 +2,47 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import type { FormSchema as QFormSchema } from '/@/components/Form/index';
 import { JCronValidator } from '/@/components/Form';
 
-// 调度日志表格配置
+// 定时任务表格配置
 export const columnSchedue: BasicColumn[] = [
   {
-    title: '任务编号',
-    dataIndex: 'name',
-    width: 80,
+    title: '任务名称',
+    dataIndex: 'jobName',
+    width: 120,
   },
   {
     title: '任务组名',
-    dataIndex: 'organizationId',
+    dataIndex: 'jobGroup',
     width: 120,
+    format: (_text: string, record: Recordable) => {
+      return record.jobGroup === 'Default'
+        ? '默认'
+        : record.jobGroup === 'System'
+        ? '系统'
+        : '报表';
+    },
   },
   {
     title: '调用目标字符串',
-    dataIndex: 'status',
+    dataIndex: 'invokeTarget',
     width: 120,
   },
   {
     title: 'cron执行表达式',
-    dataIndex: 'executeWay',
+    dataIndex: 'cronExpression',
     width: 160,
   },
   {
     title: '状态',
-    dataIndex: 'devices',
+    dataIndex: 'status',
     width: 160,
     slots: { customRender: 'status' },
   },
 ];
 
-// 调度日志表格查询配置
+// 定时任务格查询配置
 export const searchSchedueFormSchema: FormSchema[] = [
   {
-    field: 'name',
+    field: 'jobName',
     label: '任务名称',
     component: 'Input',
     colProps: { span: 6 },
@@ -45,7 +52,7 @@ export const searchSchedueFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'status',
+    field: 'jobGroup',
     label: '任务组名',
     component: 'Select',
     colProps: { span: 6 },
@@ -53,18 +60,22 @@ export const searchSchedueFormSchema: FormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 1,
+          value: 'Default',
         },
         {
           label: '系统',
-          value: 0,
+          value: 'System',
+        },
+        {
+          label: '报表',
+          value: 'Report',
         },
       ],
       placeholder: '请选择任务组名',
     },
   },
   {
-    field: 'status1',
+    field: 'status',
     label: '任务状态',
     component: 'Select',
     colProps: { span: 6 },
@@ -87,7 +98,7 @@ export const searchSchedueFormSchema: FormSchema[] = [
 // 新增编辑配置
 export const formSchema: QFormSchema[] = [
   {
-    field: 'name',
+    field: 'jobName',
     label: '任务名称',
     colProps: { span: 24 },
     required: true,
@@ -98,7 +109,7 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
-    field: 'executeWay',
+    field: 'jobGroup',
     component: 'Select',
     label: '任务分组',
     colProps: {
@@ -109,20 +120,24 @@ export const formSchema: QFormSchema[] = [
       options: [
         {
           label: '默认',
-          value: 0,
+          value: 'Default',
         },
         {
           label: '系统',
-          value: 1,
+          value: 'System',
+        },
+        {
+          label: '报表',
+          value: 'Report',
         },
       ],
     },
   },
   {
-    field: 'name1',
+    field: 'invokeTarget',
     label: ' 调用方法',
     helpMessage: [
-      "Bean调用示例：ryTask.ryParams('ry')Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')参数说明：支持字符串，布尔类型，长整型，浮点型，整型",
+      'Bean调用示例：reportTask.noParams()Class类调用示例：reportTask.noParams()参数说明：支持字符串，布尔类型，长整型，浮点型，整型',
     ],
     colProps: { span: 24 },
     required: true,
@@ -189,22 +204,22 @@ export const formSchema: QFormSchema[] = [
     },
   },
   {
-    field: 'field7',
+    field: 'status',
     component: 'RadioGroup',
     label: '状态',
     colProps: {
       span: 24,
     },
-    defaultValue: '1',
+    defaultValue: 1,
     componentProps: {
       options: [
         {
           label: '正常',
-          value: '1',
+          value: 1,
         },
         {
           label: '暂停',
-          value: '2',
+          value: 0,
         },
       ],
     },

@@ -39,8 +39,8 @@
               label: '执行一次',
               icon: 'ant-design:caret-right-filled',
               popConfirm: {
-                title: '确认要立即执行一次' + '“' + record.name + '”' + '任务吗？',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
+                title: '确认要立即执行一次' + '“' + record.jobName + '”' + '任务吗？',
+                confirm: handleRunOne.bind(null, record),
               },
             },
             {
@@ -77,7 +77,12 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { columnSchedue, searchSchedueFormSchema } from './config.form.data';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { deleteReportManage, reportPage } from '/@/api/report/reportManager';
+  import {
+    deleteSchedueManage,
+    scheduePage,
+    putSchedueByidAndStatusManage,
+    postRunSchedueConfigManage,
+  } from '/@/api/schedue/schedueManager';
   import { Popconfirm, Switch } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import TaskDetailPreviewModal from './TaskDetailPreviewModal.vue';
@@ -85,11 +90,13 @@
   import ScheduledDrawer from './ScheduledDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { Authority } from '/@/components/Authority';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const disabledSwitch = ref(false);
+  const { createMessage } = useMessage();
   const [registerTable, { setProps, reload }] = useTable({
     title: '定时任务列表',
-    api: reportPage,
+    api: scheduePage,
     columns: columnSchedue,
     showIndexColumn: false,
     clickToRowSelect: false,
@@ -115,7 +122,7 @@
     reload();
   };
   const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteReportManage,
+    deleteSchedueManage,
     handleSuccess,
     setProps
   );
@@ -127,7 +134,6 @@
   const [registerModalTaskDetail, { openModal: openModalTaskDetail }] = useModal();
   const [registerModalSchedueLog, { openModal: openModalSchedueLog }] = useModal();
   const handleSchedulingLogFunc = (record: Recordable) => {
-    // go('/report/schedue_log/' + record.id);
     openModalSchedueLog(true, {
       isUpdate: 2,
       record,
@@ -160,13 +166,12 @@
       });
       disabledSwitch.value = true;
       const newStatus = checked ? 1 : 0;
-      console.log(checked, record, newStatus);
-      // const res = await putReportByidAndStatusManage(record.id, newStatus);
-      // if (res && newStatus) {
-      //   createMessage.success(`启用成功`);
-      // } else {
-      //   createMessage.success('禁用成功');
-      // }
+      const res = await putSchedueByidAndStatusManage(record.id, newStatus);
+      if (res && newStatus) {
+        createMessage.success(`启用成功`);
+      } else {
+        createMessage.success('禁用成功');
+      }
     } finally {
       setTimeout(() => {
         setProps({
@@ -177,5 +182,11 @@
       reload();
     }
   };
+  const handleRunOne = async (record: Recordable) => {
+    const res = await postRunSchedueConfigManage(record.id);
+    if (res?.code === 200) {
+      createMessage.success(`执行一次任务"${record.jobName}"成功`);
+    }
+  };
 </script>
 <style lang="less" scoped></style>