feat：新增执行一次 任务详细 调度日志

@@ -174,6 +174,9 @@ export default {
     menu: 'Menu management',
     role: 'Role management',
   },
+  report: {
+    schedue_log: 'Schedue Log',
+  },
   table: {
     table: 'Table',
 

@@ -166,6 +166,9 @@ export default {
     menu: '菜单管理',
     role: '角色管理',
   },
+  report: {
+    schedue_log: '调度日志',
+  },
   table: {
     table: 'Table',
     basic: '基础表格',

@@ -53,12 +53,34 @@ export const AccountDetail: AppRouteRecordRaw = {
     },
   ],
 };
+// 调度日志静态路由
+export const SchedueLog: AppRouteRecordRaw = {
+  path: '/report',
+  name: '报表管理',
+  component: LAYOUT,
+  meta: {
+    title: '报表管理',
+    hideBreadcrumb: true,
+    hideChildrenInMenu: true,
+  },
+  children: [
+    {
+      path: 'schedue_log/:id',
+      name: 'Schedue_Log',
+      component: () => import('/@/views/report/config/SchedueLog.vue'),
+      meta: {
+        title: '调度日志',
+      },
+    },
+  ],
+};
 
 // Basic routing without permission
 export const basicRoutes = [
   LoginRoute,
   RootRoute,
   AccountDetail,
+  SchedueLog,
   ...mainOutRoutes,
   REDIRECT_ROUTE,
   PAGE_NOT_FOUND_ROUTE,

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="110rem"
+      :height="heightNum"
+      @register="register"
+      title="调度日志"
+      @cancel="handleCancel"
+      :showOkBtn="false"
+    >
+      <div>
+        <BasicTable @register="registerTable" :dataSource="tableData">
+          <template #toolbar>
+            <a-button type="primary"> 清空 </a-button>
+            <a-button type="primary"> 导出 </a-button>
+            <a-button type="primary"> 关闭 </a-button>
+            <Popconfirm title="您确定要批量删除数据" ok-text="确定" cancel-text="取消">
+              <a-button type="primary" color="error" :disabled="hasBatchDelete">
+                批量删除
+              </a-button>
+            </Popconfirm>
+          </template>
+          <template #action="{ record }">
+            <TableAction
+              :actions="[
+                {
+                  label: '查看',
+                  icon: 'clarity:note-edit-line',
+                },
+                {
+                  label: '删除',
+                  icon: 'ant-design:delete-outlined',
+                  color: 'error',
+                  popConfirm: {
+                    title: '是否确认删除',
+                    confirm: handleDeleteOrBatchDelete.bind(null, record),
+                  },
+                },
+              ]"
+            />
+          </template>
+        </BasicTable>
+      </div>
+    </BasicModal>
+  </div>
+</template>
+<script setup lang="ts">
+  import { ref, nextTick } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { columnSchedue, searchSchedueFormSchema } from './config.data';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { deleteReportManage, reportPage } from '/@/api/report/reportManager';
+  import { Popconfirm } from 'ant-design-vue';
+
+  const heightNum = ref(800);
+  const tableData: any = ref([]);
+  const [registerTable, { setProps, reload }] = useTable({
+    title: '调度日志表格列表',
+    api: reportPage,
+    columns: columnSchedue,
+    showIndexColumn: false,
+    clickToRowSelect: false,
+    useSearchForm: true,
+    ellipsis: true,
+    showTableSetting: true,
+    bordered: true,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchSchedueFormSchema,
+      fieldMapToTime: [['sendTime', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
+    },
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+  });
+  // 刷新
+  const handleSuccess = () => {
+    reload();
+  };
+  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+    deleteReportManage,
+    handleSuccess,
+    setProps
+  );
+
+  const [register] = useModalInner((data) => {
+    console.log(data);
+    const getTableData = () => {
+      for (let i = 0; i < 100; i++) {
+        tableData.value.push({
+          name: `${i}`,
+          organizationId: `${i}`,
+          dataCompare: `${i}`,
+          status: `${i}`,
+          executeWay: `${i}`,
+          devices: `${i}`,
+          creator: `${i}`,
+        });
+      }
+    };
+    nextTick(() => {
+      setProps(selectionOptions);
+      getTableData();
+    });
+  });
+  const handleCancel = () => {};
+</script>
+<style lang="less" scoped></style>

+<template>
+  <div>
+    <BasicModal
+      v-bind="$attrs"
+      width="62rem"
+      :height="heightNum"
+      @register="register"
+      title="任务详细"
+      @cancel="handleCancel"
+      :showOkBtn="false"
+    >
+      <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 { personSchema } from './config.data';
+  import { Description } from '/@/components/Description/index';
+  import { useDescription } from '/@/components/Description';
+
+  const heightNum = ref(800);
+  let personData = reactive({});
+  const [registeDesc, { setDescProps }] = useDescription({
+    title: '任务详细信息',
+    data: personData,
+    schema: personSchema,
+    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', '禁止');
+      setDescProps(personData);
+    });
+  });
+  const handleCancel = () => {};
+</script>
+<style></style>

 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';
@@ -19,7 +20,7 @@ import {
   isCountAll,
 } from './timeConfig';
 import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
-// import { JCronValidator } from '/@/components/Form';
+import { JCronValidator } from '/@/components/Form';
 
 export enum SchemaFiled {
   WAY = 'way',
@@ -208,13 +209,13 @@ export const formSchema: QFormSchema[] = [
       ],
     },
   },
-  // {
-  //   field: 'cronExpression',
-  //   label: 'Cron表达式',
-  //   component: 'JEasyCron',
-  //   defaultValue: '* * * * * ? *',
-  //   rules: [{ required: true, message: '请输入Cron表达式' }, { validator: JCronValidator }],
-  // },
+  {
+    field: 'cronExpression',
+    label: 'Cron表达式',
+    component: 'JEasyCron',
+    defaultValue: '* * * * * ? *',
+    rules: [{ required: true, message: '请输入Cron表达式' }, { validator: JCronValidator }],
+  },
   {
     field: 'timeWeek',
     component: 'Select',
@@ -609,3 +610,148 @@ export const formSchema: QFormSchema[] = [
       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 },
+  },
+];

@@ -45,25 +45,25 @@
             },
           ]"
           :dropDownActions="[
-              {
-                label: '执行一次',
-                popConfirm: {
-                  title: '是否执行一次？',
-                },
-              },
-              {
-                label: '任务详细',
-                popConfirm: {
-                  title: '任务详细',
-                },
-              },
-              {
-                label: '调度日志',
-                popConfirm: {
-                  title: '调度日志',
-                },
+            {
+              label: '执行一次',
+              icon: 'ant-design:caret-right-filled',
+              popConfirm: {
+                title: '确认要立即执行一次' + '“' + record.name + '”' + '任务吗？',
+                confirm: handleDeleteOrBatchDelete.bind(null, record),
               },
-            ]"
+            },
+            {
+              label: '任务详细',
+              icon: 'ant-design:eye-outlined',
+              onClick: handleTaskDetailModal.bind(null, record),
+            },
+            {
+              label: '调度日志',
+              icon: 'ant-design:insert-row-below-outlined',
+              onClick: handleSchedulingLogFunc.bind(null, record),
+            },
+          ]"
         />
       </template>
       <template #status="{ record }">
@@ -79,6 +79,8 @@
     </BasicTable>
     <ReportConfigDrawer @register="registerDrawer" @success="handleSuccess" />
     <DevicePreviewModal @register="registerModal" />
+    <TaskDetailPreviewModal @register="registerModalTaskDetail" />
+    <SchedueLog @register="registerModalSchedueLog" />
   </div>
 </template>
 
@@ -88,6 +90,8 @@
   import { useDrawer } from '/@/components/Drawer';
   import ReportConfigDrawer from './ReportConfigDrawer.vue';
   import DevicePreviewModal from './DevicePreviewModal.vue';
+  import TaskDetailPreviewModal from './TaskDetailPreviewModal.vue';
+  import SchedueLog from './SchedueLog.vue';
   import {
     reportPage,
     deleteReportManage,
@@ -162,6 +166,8 @@
 
   //查看设备
   const [registerModal, { openModal }] = useModal();
+  const [registerModalTaskDetail, { openModal: openModalTaskDetail }] = useModal();
+  const [registerModalSchedueLog, { openModal: openModalSchedueLog }] = useModal();
   const handleDeviceView = (record) => {
     openModal(true, {
       isUpdate: true,
@@ -192,4 +198,17 @@
     }
   };
   const go = useGo();
+  const handleSchedulingLogFunc = (record: Recordable) => {
+    // go('/report/schedue_log/' + record.id);
+    openModalSchedueLog(true, {
+      isUpdate: 2,
+      record,
+    });
+  };
+  const handleTaskDetailModal = (record: Recordable) => {
+    openModalTaskDetail(true, {
+      isUpdate: true,
+      record,
+    });
+  };
 </script>