任务报告

src/model/datamodel.js

@@ -504,6 +504,10 @@ export function* runCompareJob(payload) {
   return yield call(datamodelerService.runCompareJob, payload)
 }
 
+export function* reRunCompareJob(payload) {
+  return yield call(datamodelerService.reRunCompareJob, payload)
+}
+
 export function* cancelCompareJob(payload) {
   return yield call(datamodelerService.cancelCompareJob, payload)
 }

src/service/datamodeler.js

@@ -457,6 +457,10 @@ export function runCompareJob(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJob/runJob", payload)
 }
 
+export function reRunCompareJob(payload) {
+  return GetJSON("/datamodeler/easyDataModelModelCompareJob/reRunJob", payload)
+}
+
 export function cancelCompareJob(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJob/cancelJob", payload)
 }

src/view/Manage/ModelCompare/log.jsx

+import React from "react"
+import { Modal, Spin, Typography } from 'antd'
+
+const FC = ({ visible, item, onCancel }) => {
+  const close = (refresh = false) => {
+    onCancel?.()
+  }
+
+  return (
+    <Modal
+      title='任务执行日志'
+      width={600}
+      visible={visible}
+      footer={null}
+      onCancel={close}
+      bodyStyle={{ 
+        height: 400,
+        overflow: 'auto'
+      }}
+    >
+      {
+        (item?.errorMsg??'').split('\n').map((info, index) => {
+          return <Typography.Paragraph key={index}>{info}</Typography.Paragraph>
+        })
+      }
+    </Modal>
+  )
+}
+
+export default FC
\ No newline at end of file

src/view/Manage/ModelCompare/task-report.jsx

@@ -7,6 +7,7 @@ import { dispatch } from '../../../model'
 import Table from '../../../util/Component/Table'
 import UpdateTask from './update-task'
 import ResultDetail from './result-detail'
+import Log from './log'
 
 import '../AssetTask/index.less'
 import { showMessage } from '../../../util'
@@ -34,6 +35,10 @@ const FC = (props) => {
     visible: false,
     item: undefined,
   })
+  const [logParams, setLogParams] = React.useState({
+    visible: false,
+    item: undefined,
+  })
   const [rightRow, setRightRow] = React.useState()
 
   const [modal, contextHolder] = Modal.useModal()
@@ -152,14 +157,34 @@ const FC = (props) => {
 
   const onRightMenuItemClick = (key, record) => {
     if (key === '执行日志') {
-
+      setLogParams({
+        visible: true,
+        item: record,
+      })
     } else if (key === '执行结果') {
       setResultDetailParams({
         visible: true,
         item: record,
       })
     } else if (key === '重跑') {
-
+      modal.confirm({
+        title:'提示',
+        content: '您确定重跑该任务吗?',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          dispatch({
+            type: 'datamodel.reRunCompareJob',
+            payload: {
+              resultId: record?.id
+            },
+            callback: data => {
+              showMessage('success', '重跑成功')
+              getResults()
+            }
+          })
+        }
+      })
     } else if (key === '取消') {
       modal.confirm({
         title:'提示',
@@ -236,6 +261,15 @@ const FC = (props) => {
           onMenuItemClick={onRightMenuItemClick}
         />
       </div>
+      <Log
+        {...logParams}
+        onCancel={() => {
+          setLogParams({
+            visible: false,
+            item: undefined,
+          })
+        }}
+      />
       <UpdateTask
         {...updateTaskParams}
         onCancel={(refresh) => {