bug修复

src/module/datasource/component/DatasourceLog.jsx

@@ -44,30 +44,12 @@ const DatasourceLog = ({ onRef, logId }) => {
       key: 'jobDesc',
     },
     {
-      title: '调度时间',
-      dataIndex: 'triggerTime',
-      key: 'triggerTime',
+      title: '开始时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
     },
     {
-      title: '调度结果',
-      dataIndex: 'triggerResult',
-      key: 'triggerResult',
-      render: code => (
-        <span
-          style={{
-            color: code === 0 ? '#FF4D4F' : '#52C41A',
-          }}>
-          {code === 0 ? '失败' : '成功'}
-        </span>
-      ),
-    },
-    {
-      title: '执行时间',
-      dataIndex: 'handleTime',
-      key: 'handleTime',
-    },
-    {
-      title: '执行结果',
+      title: '同步状态',
       dataIndex: 'handleResult',
       key: 'handleResult',
       render: code => (
@@ -136,18 +118,12 @@ const DatasourceLog = ({ onRef, logId }) => {
           jobDesc: item.job_desc,
           afJobId: item.af_job_id,
           runId: item.run_id,
-          triggerTime: item.trigger_time
-            ? moment(Math.round(item.trigger_time) * 1000).format(
-                'YYYY.MM.DD HH:mm:ss'
-              )
-            : '无',
-          triggerResult: item.trigger_result,
-          handleTime: item.execute_time
+          startTime: item.start_time
             ? moment(Math.round(item.execute_time) * 1000).format(
                 'YYYY.MM.DD HH:mm:ss'
               )
             : '无',
-          handleResult: item.execute_result,
+          handleResult: item.result,
         }
       })
       setLogList(list)

src/module/tasklog/component/LogTable.jsx

@@ -48,30 +48,12 @@ const LogTable = () => {
       key: 'taskTag',
     },
     {
-      title: '调度时间',
-      dataIndex: 'triggerTime',
-      key: 'triggerTime',
+      title: '开始时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
     },
     {
-      title: '调度结果',
-      dataIndex: 'triggerResult',
-      key: 'triggerResult',
-      render: code => (
-        <span
-          style={{
-            color: code === 0 ? '#FF4D4F' : code === 1 ? '#52C41A' : '#4A4A4A',
-          }}>
-          {code === 0 ? '失败' : code === 1 ? '成功' : '无'}
-        </span>
-      ),
-    },
-    {
-      title: '执行时间',
-      dataIndex: 'handleTime',
-      key: 'handleTime',
-    },
-    {
-      title: '执行结果',
+      title: '任务状态',
       dataIndex: 'handleResult',
       key: 'handleResult',
       render: code => (
@@ -134,14 +116,10 @@ const LogTable = () => {
         return {
           key: item.id,
           jobName: item.job_name,
-          triggerTime: moment(Math.round(item.trigger_time) * 1000).format(
-            'YYYY.MM.DD HH:mm:ss'
-          ),
-          triggerResult: item.trigger_result,
-          handleTime: moment(Math.round(item.execute_time) * 1000).format(
+          startTime: moment(Math.round(item.start_time) * 1000).format(
             'YYYY.MM.DD HH:mm:ss'
           ),
-          handleResult: item.execute_result,
+          handleResult: item.result,
           taskType: item.job_type,
           taskTag: item.job_tag,
           afJobId: item.af_job_id,

src/module/tasklog/component/TaskLogWatcher.jsx

@@ -72,18 +72,13 @@ const TaskLogWatcher = () => {
       render: code => (
         <span
           style={{
-            color:
-              code === 'failed'
-                ? '#FF4D4F'
-                : code === 'success'
-                ? '#52C41A'
-                : '#4A4A4A',
+            color: code === 3 ? '#FF4D4F' : code === 2 ? '#52C41A' : '#4A4A4A',
           }}>
-          {code === 'failed'
+          {code === 3
             ? '失败'
-            : code === 'success'
+            : code === 2
             ? '成功'
-            : code === 'running'
+            : code === 1
             ? '运行中'
             : '队列中'}
         </span>

src/module/workmgmt/component/JobCreate.jsx

@@ -200,7 +200,8 @@ export default function JobCreate() {
     }
     const { data } = await getFileUri(params)
     if (data.code === 200) {
-      type === 'jave' ? setJavas(data.data) : setPythons(data.data)
+      console.log(type, data)
+      type === 'java' ? setJavas(data.data) : setPythons(data.data)
     } else {
       message.error(data.msg)
     }
@@ -772,7 +773,7 @@ export default function JobCreate() {
                         value={scriptFile}
                         onChange={onScriptFileChange}
                         disabled={radioValue === 'fromList' ? false : true}>
-                        {pythons.map(item => (
+                        {javas.map(item => (
                           <Option key={item.uri} value={item.name}>
                             {item.name}
                           </Option>
@@ -933,7 +934,7 @@ export default function JobCreate() {
                         value={scriptFile}
                         onChange={onScriptFileChange}
                         disabled={radioValue === 'fromList' ? false : true}>
-                        {javas.map(item => (
+                        {pythons.map(item => (
                           <Option key={item.uri} value={item.name}>
                             {item.name}
                           </Option>