Explorar o código

fix: call dispatch api

hi-cactus! %!s(int64=3) %!d(string=hai) anos
pai
achega
79423b5690

+ 22 - 8
app/containers/DataGovernanceQualityAudit/components/ScheduleFormModal.tsx

@@ -167,21 +167,35 @@ class ScheduleFormModal extends React.PureComponent<IScheduleFormModalProps> {
                   message: '请选择'
                 }
               ]
-            })(
-              <Switch
-                checkedChildren='开'
-                unCheckedChildren='关'
-              />
-            )}
+            })(<Switch checkedChildren="开" unCheckedChildren="关" />)}
           </FormItem>
         </Form>
         <p>
-          提示:您希望每 执行一次该任务, 从 时间开始到 时间停止周期调度,
-          并且当前任务状态 ${}
+          提示:您希望每 {this.props.form.getFieldValue('interval')}{' '}
+          {TIME_KEY_VALUE?.[this.props.form.getFieldValue('periodUnit')]}{' '}
+          执行一次该任务, 从{' '}
+          {this.props.form
+            .getFieldValue('startDate')?.[0]
+            ?.format('YYYY-MM-DD hh:mm:ss')}{' '}
+          时间开始到
+          {this.props.form
+            .getFieldValue('startDate')?.[1]
+            ?.format('YYYY-MM-DD hh:mm:ss')}{' '}
+          时间停止周期调度, 并且当前任务状态{' '}
+          {this.props.form.getFieldValue('jobStatus') ? '开启' : '关闭'}
         </p>
       </Modal>
     )
   }
 }
 
+const TIME_KEY_VALUE = {
+  Minute: '分钟',
+  Hour: '小时',
+  Day: '日',
+  Week: '周',
+  Month: '月',
+  Year: '年'
+}
+
 export default Form.create<IScheduleFormModalProps>()(ScheduleFormModal)

+ 40 - 30
app/containers/DataGovernanceQualityAudit/index.tsx

@@ -26,8 +26,11 @@ import ClassificationsFormModal from 'containers/DataGovernanceQualityAudit/comp
 import QualityTaskFormModal from 'containers/DataGovernanceQualityAudit/components/QualityTaskFormModal'
 import ScheduleFormModal from 'containers/DataGovernanceQualityAudit/components/ScheduleFormModal'
 import header from 'containers/Display/Editor/Header'
+import { RouteComponentProps, withRouter } from 'react-router-dom'
+
+function DataGovernanceQualityAudit(props: RouteComponentProps) {
+  const { match } = props
 
-export default function DataGovernanceQualityAudit() {
   const [tableLoading, setTableLoading] = useState(false)
 
   const [treeLoading, setTreeLoading] = useState(false)
@@ -73,12 +76,12 @@ export default function DataGovernanceQualityAudit() {
           >
             编辑
           </a>
-          <Divider type='vertical' />
+          <Divider type="vertical" />
           <Dropdown
             overlay={
               <Menu>
                 <Menu.Item
-                  key='0'
+                  key="0"
                   onClick={() => {
                     setQtForm(data)
                     setScVisible(true)
@@ -86,19 +89,19 @@ export default function DataGovernanceQualityAudit() {
                 >
                   设置调度
                 </Menu.Item>
-                <Menu.Item key='1'>
+                <Menu.Item key="1">
                   <Popconfirm
-                    title='确定立即稽查吗?'
-                    placement='bottom'
+                    title="确定立即稽查吗?"
+                    placement="bottom"
                     onConfirm={() => handleSetDispatchRightNow(data)}
                   >
                     <a>立即稽查</a>
                   </Popconfirm>
                 </Menu.Item>
-                <Menu.Item key='3'>
+                <Menu.Item key="3">
                   <Popconfirm
-                    title='确定删除?'
-                    placement='bottom'
+                    title="确定删除?"
+                    placement="bottom"
                     onConfirm={() => handleDeleteTask(data.id)}
                   >
                     <a>删除</a>
@@ -109,7 +112,7 @@ export default function DataGovernanceQualityAudit() {
           >
             <a>
               {' '}
-              更多 <Icon type='down' />
+              更多 <Icon type="down" />
             </a>
           </Dropdown>
         </>
@@ -122,7 +125,7 @@ export default function DataGovernanceQualityAudit() {
     setCfVisible(true)
   }
 
-  const handleDeleteTreeItem = async(c: IClassification) => {
+  const handleDeleteTreeItem = async (c: IClassification) => {
     try {
       setTreeLoading(true)
       const data = await request(`${api.deleteAuditClassification}${c.id}`, {
@@ -157,19 +160,19 @@ export default function DataGovernanceQualityAudit() {
               setSelectedKey(c.id)
             }}
           >
-            <Icon type='file' />
+            <Icon type="file" />
             {c.name}
           </span>
           <Dropdown
             overlay={() => (
               <Menu>
-                <Menu.Item key='0' onClick={() => handleEditTreeItem(c)}>
+                <Menu.Item key="0" onClick={() => handleEditTreeItem(c)}>
                   编辑
                 </Menu.Item>
-                <Menu.Item key='1'>
+                <Menu.Item key="1">
                   <Popconfirm
-                    title='确定删除?'
-                    placement='bottom'
+                    title="确定删除?"
+                    placement="bottom"
                     onConfirm={() => handleDeleteTreeItem(c)}
                   >
                     <a>删除</a>
@@ -179,14 +182,14 @@ export default function DataGovernanceQualityAudit() {
             )}
             trigger={['click']}
           >
-            <Icon type='more' />
+            <Icon type="more" />
           </Dropdown>
         </div>
       ))}
     </>
   )
 
-  const handleSetDispatchRightNow = async(data: IQualityTask) => {
+  const handleSetDispatchRightNow = async (data: IQualityTask) => {
     try {
       setTableLoading(true)
       const result = await request(`${api.setDispatchRightNow}${data.id}`, {
@@ -205,18 +208,23 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const handleDispatch = async(form) => {
+  const handleDispatch = async (form) => {
     try {
       setTableLoading(true)
       setSCLoading(true)
       const result = await request(`${api.setDispatch}${qtForm.id}`, {
         method: 'PUT',
         data: {
+          // @ts-ignore
+          projectId: match.params?.projectId,
+          name: qtForm.taskName,
+          // taskName: qtForm.taskName,
           cronExpression: form.cronExpression,
           startDate: form.startDate[0].format('YYYY-MM-DD hh:mm:ss'),
           endDate: form.startDate[1].format('YYYY-MM-DD hh:mm:ss'),
           periodUnit: form.periodUnit,
-          jobStatus: form.jobStatus ? 'started' : 'new'
+          jobStatus: form.jobStatus ? 'started' : 'new',
+          jobType: 'auditor'
         }
       })
       // @ts-ignore
@@ -230,7 +238,7 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const queryClassifications = async() => {
+  const queryClassifications = async () => {
     try {
       setTreeLoading(true)
       const data = await request(api.getAuditClassification, { method: 'GET' })
@@ -243,7 +251,7 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const queryQualityTasks = async() => {
+  const queryQualityTasks = async () => {
     try {
       setTableLoading(true)
       const data = await request(`${api.getQualityTask}?pId=${selectedKey}`, {
@@ -256,7 +264,7 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const handleSaveCfForm = async(form: IClassification) => {
+  const handleSaveCfForm = async (form: IClassification) => {
     try {
       setCfLoading(true)
       const url = cfForm.id
@@ -276,7 +284,7 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const handleSaveQtForm = async(view) => {
+  const handleSaveQtForm = async (view) => {
     try {
       setQtLoading(true)
       const url = qtForm?.id
@@ -296,7 +304,7 @@ export default function DataGovernanceQualityAudit() {
     }
   }
 
-  const handleDeleteTask = async(id: number) => {
+  const handleDeleteTask = async (id: number) => {
     try {
       setTableLoading(true)
       const data = await request(`${api.deleteQualityTask}${id}`, {
@@ -324,7 +332,7 @@ export default function DataGovernanceQualityAudit() {
 
   return (
     <Container>
-      <Helmet title='质量稽核' />
+      <Helmet title="质量稽核" />
       <ContainerBody>
         <Box>
           <Box.Header>
@@ -342,7 +350,7 @@ export default function DataGovernanceQualityAudit() {
                       setCfVisible(true)
                     }}
                   >
-                    <Icon type='plus' />
+                    <Icon type="plus" />
                   </div>
                 </div>
                 <div className={styles.treeContent}>
@@ -355,8 +363,8 @@ export default function DataGovernanceQualityAudit() {
               <div style={{ flex: 1 }}>
                 <div style={{ padding: '0 0 20px' }}>
                   <Button
-                    type='primary'
-                    icon='plus'
+                    type="primary"
+                    icon="plus"
                     onClick={() => {
                       setQtVisible(true)
                       setQtForm(null)
@@ -368,7 +376,7 @@ export default function DataGovernanceQualityAudit() {
                 <Table
                   style={{ flex: 1 }}
                   bordered
-                  rowKey='id'
+                  rowKey="id"
                   loading={tableLoading}
                   dataSource={qualityTasks}
                   columns={tableColumns}
@@ -406,3 +414,5 @@ export default function DataGovernanceQualityAudit() {
     </Container>
   )
 }
+
+export default withRouter(DataGovernanceQualityAudit)