任务报告

src/model/datamodel.js

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

src/service/datamodeler.js

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

src/view/Manage/ModelCompare/log.jsx

 import React from "react"
 import { Modal, Spin, Typography } from 'antd'
 
+import { dispatch } from '../../../model'
+
 const FC = ({ visible, item, onCancel }) => {
-  const close = (refresh = false) => {
+  const [loading, setLoading] = React.useState(false)
+  const [log, setLog] = React.useState(undefined)
+
+  React.useEffect(() => {
+    if (visible && item?.id) {
+      getLog()
+    }
+  }, [visible])
+
+  const getLog = () => {
+    setLoading(true)
+    dispatch({
+      type: 'datamodel.runCompareJobLog',
+      payload: {
+        resultId: item?.id
+      },
+      callback: data => {
+        setLoading(false)
+        setLog(data)
+      },
+      error: () => {
+        setLoading(false)
+      }
+    })
+  }
+
+  const close = () => {
+    setLoading(undefined)
+    setLog(undefined)
     onCancel?.()
   }
 
@@ -18,11 +48,13 @@ const FC = ({ visible, item, onCancel }) => {
         overflow: 'auto'
       }}
     >
+      <Spin spinning={loading}>
       {
-        (item?.errorMsg??'').split('\n').map((info, index) => {
+        log?.map((info, index) => {
           return <Typography.Paragraph key={index}>{info}</Typography.Paragraph>
         })
       }
+      </Spin>
     </Modal>
   )
 }

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

@@ -101,6 +101,7 @@ const FC = (props) => {
     {
       title: '匹配数/差异数/不匹数',
       dataIndex: 'count',
+      render: (_, record) => `${record?.modelPerfectMatchCount??0}/${record?.modelPartialMatchCount??0}/${(record?.modelNotMatchCount??0)+(record?.metadataNotMatchCount??0)}`,
     },
     {
       title: '开始时间',