新增任务调度管理和查看任务日志组件

src/theme/media/drawer.scss

@@ -0,0 +1,10 @@
+@import './index.scss';
+
+/* 页面宽度小于800px
+------------------------------- */
+@media screen and (max-width: 800px) {
+  .el-drawer.ltr,
+  .el-drawer.rtl {
+    width: 90% !important;
+  }
+}

src/theme/media/media.scss

@@ -9,5 +9,6 @@
 @import './scrollbar.scss';
 @import './pagination.scss';
 @import './dialog.scss';
+@import './drawer.scss';
 @import './cityLinkage.scss';
 @import './date.scss';

src/theme/my-element.scss

@@ -14,3 +14,13 @@
 .el-color-predefine__color-selector {
   border: 1px solid var(--el-border-color);
 }
+
+/* Button 按钮
+------------------------------- */
+.el-button:not(.is-circle) i.el-icon,
+.el-button i.iconfont,
+.el-button i.fa,
+.el-button--default i.iconfont,
+.el-button--default i.fa {
+  margin-right: 0px;
+}

src/views/admin/task/components/task-logs.vue

@@ -0,0 +1,119 @@
+<template>
+  <el-drawer v-model="state.showDialog" :title="title" direction="ltr" size="780">
+    <div class="my-drawer-body-padding">
+      <el-table v-loading="state.loading" :data="state.taskLogListData" row-key="id" style="width: 100%">
+        <el-table-column prop="round" label="当前次数" width="80" />
+        <el-table-column prop="success" label="状态" width="80">
+          <template #default="{ row }">
+            <el-tag v-if="!row.success" type="danger" disable-transitions>失败</el-tag>
+            <el-tag v-else type="success" disable-transitions>成功</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="elapsedMilliseconds" label="耗时(ms)" width="100" />
+        <el-table-column prop="exception" label="异常" min-width="180" />
+
+        <el-table-column prop="createTime" label="创建时间" :formatter="formatterTime" width="160" />
+        <el-table-column prop="Remark" label="备注" min-width="180" />
+      </el-table>
+      <div class="my-flex my-flex-end" style="margin-top: 20px">
+        <el-pagination
+          v-model:currentPage="state.pageInput.currentPage"
+          v-model:page-size="state.pageInput.pageSize"
+          :total="state.total"
+          :page-sizes="[10, 20, 50, 100]"
+          small
+          background
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        />
+      </div>
+    </div>
+    <template #footer>
+      <div style="flex: auto; padding: 20px !important">
+        <el-button @click="onCancel" size="default">取 消</el-button>
+      </div>
+    </template>
+  </el-drawer>
+</template>
+
+<script lang="ts" setup>
+import { reactive } from 'vue'
+import { ResultOutputPageOutputTaskLog, PageInputTaskLogGetPageDto, TaskListOutput } from '/@/api/admin/data-contracts'
+import { TaskLog as TaskLogApi } from '/@/api/admin/TaskLog'
+import dayjs from 'dayjs'
+
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+})
+
+const state = reactive({
+  showDialog: false,
+  loading: false,
+  taskLogFormTitle: '',
+  total: 0,
+  pageInput: {
+    currentPage: 1,
+    pageSize: 20,
+    filter: {
+      taskId: null,
+    },
+  } as PageInputTaskLogGetPageDto,
+  taskLogListData: [] as Array<ResultOutputPageOutputTaskLog>,
+})
+
+const formatterTime = (row: any, column: any, cellValue: any) => {
+  return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss')
+}
+
+const onQuery = async () => {
+  state.loading = true
+  const res = await new TaskLogApi().getPage(state.pageInput)
+
+  state.taskLogListData = res?.data?.list ?? []
+  state.total = res.data?.total ?? 0
+  state.loading = false
+}
+const onSizeChange = (val: number) => {
+  state.pageInput.pageSize = val
+  onQuery()
+}
+
+const onCurrentChange = (val: number) => {
+  state.pageInput.currentPage = val
+  onQuery()
+}
+
+// 打开对话框
+const open = (row: TaskListOutput) => {
+  if (state.pageInput.filter) state.pageInput.filter.taskId = row.id
+  onQuery()
+  state.showDialog = true
+}
+
+// 取消
+const onCancel = () => {
+  state.showDialog = false
+}
+
+defineExpose({
+  open,
+})
+</script>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'admin/taskLog',
+})
+</script>
+
+<style scoped lang="scss">
+.my-drawer-body-padding {
+  padding: 10px;
+}
+</style>

src/views/admin/task/index.vue

@@ -0,0 +1,207 @@
+<template>
+  <div style="padding: 0px 0px 8px 8px">
+    <el-card shadow="never" :body-style="{ paddingBottom: '0' }" style="margin-top: 8px">
+      <el-form :model="state.filterModel" :inline="true">
+        <el-form-item prop="name">
+          <el-input v-model="state.filterModel.topic" placeholder="任务名称" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card shadow="never" style="margin-top: 8px">
+      <el-table v-loading="state.loading" :data="state.taskListData" row-key="id" style="width: 100%">
+        <el-table-column prop="id" label="任务编号" width="126" />
+        <el-table-column prop="topic" label="任务名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="status" label="任务状态" width="80">
+          <template #default="{ row }">
+            <el-tag v-if="row.status === 0 || row.status === 'Running'" disable-transitions>运行中</el-tag>
+            <el-tag v-if="row.status === 1 || row.status === 'Paused'" type="info" disable-transitions>暂停</el-tag>
+            <el-tag v-if="row.status === 2 || row.status === 'Completed'" type="success" disable-transitions>完成</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="round" label="运行次数" width="80" />
+        <el-table-column prop="currentRound" label="当前次数" width="80" />
+        <el-table-column prop="errorTimes" label="失败次数" width="80" />
+        <el-table-column prop="body" label="任务数据" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="interval" label="定时类型" width="100" :formatter="formatterInterval" />
+        <el-table-column prop="intervalArgument" label="定时参数" min-width="180" />
+        <el-table-column prop="createTime" label="创建时间" :formatter="formatterTime" width="100" />
+        <el-table-column prop="lastRunTime" label="最后运行时间" :formatter="formatterTime" width="120" />
+        <el-table-column label="操作" width="180" fixed="right" header-align="center" align="center">
+          <template #default="{ row }">
+            <el-button icon="ele-Tickets" size="small" text type="primary" @click="onShowLogs(row)">日志</el-button>
+            <el-button v-if="row.status === 1 || row.status === 'Paused'" icon="ele-VideoPause" size="small" text type="primary" @click="onPause(row)"
+              >暂停</el-button
+            >
+            <el-button
+              v-if="row.status === 0 || row.status === 'Running'"
+              icon="ele-CaretRight"
+              size="small"
+              text
+              type="primary"
+              @click="onStart(row)"
+              >启动</el-button
+            >
+            <el-button icon="ele-Promotion" size="small" text type="primary" @click="onRun(row)">执行</el-button>
+            <el-button icon="ele-Delete" size="small" text type="danger" @click="onDelete(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="my-flex my-flex-end" style="margin-top: 20px">
+        <el-pagination
+          v-model:currentPage="state.pageInput.currentPage"
+          v-model:page-size="state.pageInput.pageSize"
+          :total="state.total"
+          :page-sizes="[10, 20, 50, 100]"
+          small
+          background
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        />
+      </div>
+    </el-card>
+
+    <task-logs ref="taskLogsRef" :title="state.taskLogsTitle"></task-logs>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { TaskListOutput, PageInputTaskGetPageDto } from '/@/api/admin/data-contracts'
+import { Task as TaskApi } from '/@/api/admin/Task'
+import dayjs from 'dayjs'
+import TaskLogs from './components/task-logs.vue'
+
+const { proxy } = getCurrentInstance() as any
+
+const taskLogsRef = ref()
+
+const state = reactive({
+  loading: false,
+  taskFormTitle: '',
+  filterModel: {
+    topic: '',
+  },
+  total: 0,
+  pageInput: {
+    currentPage: 1,
+    pageSize: 20,
+  } as PageInputTaskGetPageDto,
+  taskListData: [] as Array<TaskListOutput>,
+  taskLogsTitle: '',
+})
+
+onMounted(() => {
+  onQuery()
+})
+
+const formatterInterval = (row: any, column: any, cellValue: any) => {
+  let label = ''
+  switch (cellValue) {
+    case 1:
+    case 'SEC':
+      label = '按秒触发'
+      break
+    case 11:
+    case 'RunOnDay':
+      label = '每天'
+      break
+    case 12:
+    case 'RunOnWeek':
+      label = '每星期几'
+      break
+    case 13:
+    case 'RunOnMonth':
+      label = '每月第几天'
+      break
+    case 21:
+    case 'Custom':
+      label = '自定义'
+      break
+  }
+  return label
+}
+
+const formatterTime = (row: any, column: any, cellValue: any) => {
+  return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss')
+}
+
+const onQuery = async () => {
+  state.loading = true
+  const res = await new TaskApi().getPage(state.pageInput)
+
+  state.taskListData = res?.data?.list ?? []
+  state.total = res.data?.total ?? 0
+  state.loading = false
+}
+
+// 查看日志
+const onShowLogs = (row: TaskListOutput) => {
+  state.taskLogsTitle = `${row.topic}${row.id}运行日志`
+  taskLogsRef.value.open(row)
+}
+
+const onRun = (row: TaskListOutput) => {
+  proxy.$modal
+    .confirmDelete(`确定要运行【${row.topic}】任务?`)
+    .then(async () => {
+      await new TaskApi().run({ id: row.id as string }, { loading: true, showSuccessMessage: true })
+      onQuery()
+    })
+    .catch(() => {})
+}
+
+const onPause = (row: TaskListOutput) => {
+  proxy.$modal
+    .confirmDelete(`确定要暂停【${row.topic}】任务?`)
+    .then(async () => {
+      await new TaskApi().pause({ id: row.id as string }, { loading: true, showSuccessMessage: true })
+      onQuery()
+    })
+    .catch(() => {})
+}
+
+const onStart = (row: TaskListOutput) => {
+  proxy.$modal
+    .confirmDelete(`确定要启动【${row.topic}】任务?`)
+    .then(async () => {
+      await new TaskApi().resume({ id: row.id as string }, { loading: true, showSuccessMessage: true })
+      onQuery()
+    })
+    .catch(() => {})
+}
+
+const onDelete = (row: TaskListOutput) => {
+  proxy.$modal
+    .confirmDelete(`确定要删除【${row.topic}】任务?`)
+    .then(async () => {
+      await new TaskApi().delete({ id: row.id as string }, { loading: true, showSuccessMessage: true })
+      onQuery()
+    })
+    .catch(() => {})
+}
+
+const onSizeChange = (val: number) => {
+  state.pageInput.pageSize = val
+  onQuery()
+}
+
+const onCurrentChange = (val: number) => {
+  state.pageInput.currentPage = val
+  onQuery()
+}
+</script>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+export default defineComponent({
+  name: 'admin/task',
+})
+</script>
+
+<style scoped lang="scss"></style>

src/views/admin/tenant/index.vue

@@ -77,9 +77,6 @@ const state = reactive({
   pageInput: {
     currentPage: 1,
     pageSize: 20,
-    filter: {
-      orgId: null,
-    },
   } as PageInputTenantGetPageDto,
   tenantListData: [] as Array<TenantListOutput>,
 })