.

config/routes.js

@@ -26,7 +26,7 @@ export default [
   },
   {
     path: '/',
-    name: '工作台',
+    name: '工作台',//暂定
     redirect: '/resume-work/form',
     hideInMenu: true,
   },
@@ -60,6 +60,12 @@ export default [
         name: '复工申请表',
         component: '@/pages/resumework/form/index.jsx',
       },
+      {
+        path: '/resume-work/abnormal',
+        name: '异常复工申请表',
+        component: '@/pages/resumework/abnormal/index.jsx',
+        hideInMenu:true,
+      },
     ],
   },
   // {

src/pages/dashboard/index.jsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
+import { history } from 'umi';
 import { Card, Row, Col, Empty } from 'antd'
 import { getList as getOrgList } from '@/services/org'
 import { getList as getResumeWorkList } from '@/services/work'
@@ -33,6 +34,9 @@ export default (props) => {
       <Col span={2} style={{ textAlign: 'right' }}>{nowDate()}</Col>
     </Row>
   )
+  const goDashboard=()=>{
+    history.push('../resume-work/abnormal');
+  }
 
   useEffect(() => {
     getcomm().then((res) => {
@@ -99,7 +103,7 @@ export default (props) => {
               {cardData?.todayNormalNum || 0}
             </div>
           </Card>
-          <Card className='dashboardCard' style={{ marginTop: '24px' }}>
+          <Card className='dashboardCard' style={{ marginTop: '24px' }} onClick={goDashboard}>
             <div>
               今日异常人数
             </div>
@@ -111,7 +115,7 @@ export default (props) => {
       </Row>
       <Row>
         <Col span={12}>
-          <Card style={{ marginTop: '16px', height: '736px' }} title='企业数据总览'>            
+          <Card style={{ marginTop: '16px', height: '736px' }} title='企业数据总览'>
             {orgList != [] ?
               <OrgScollList list={orgList} /> :
               <div style={{ height: '624px', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>

src/pages/resumework/abnormal/index.jsx

@@ -0,0 +1,80 @@
+
+import React, { useRef } from 'react'
+import moment from 'moment';
+import { Badge, Image, DatePicker } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { getList } from '@/services/work'
+import PageTable from '@/components/PageTable'
+import OrgSearch from '@/components/OrgSearch';
+
+const { RangePicker } = DatePicker;
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
+};
+
+export default (props) => {
+  const columns = [
+    {
+      title: '企业名称',
+      dataIndex: 'orgId',
+      key: 'orgId',
+    },
+    {
+      title: '申请人',
+      dataIndex: 'userName',
+      key: 'userName',
+    },
+    {
+      title: '抗原截图',
+      dataIndex: 'antigenImage',
+      key: 'antigenImage',
+      render: t => {t?<Image src={t} width="64px" height="64px" />:''}
+    },
+    {
+      title: '抗原结果',
+      dataIndex: 'antigenIsNormal',
+      key: 'antigenIsNormal',
+      render: t => (
+        <span>
+          {t ? <Badge status="success" text="正常" /> : <Badge status="error" text="异常" />}
+        </span>
+      )
+    },
+    {
+      title: '核酸截图',
+      dataIndex: 'nucleicImage',
+      key: 'nucleicImage',
+      render: t => <Image src={t} width="64px" height="64px" />
+    },
+    {
+      title: '核酸结果',
+      dataIndex: 'nucleicIsNormal',
+      key: 'nucleicIsNormal',
+      render: t => (
+        <span>
+        {t ? <Badge status="success" text="正常" /> : <Badge status="error" text="异常" />}
+        </span>
+      )
+    },
+    {
+      title: '申请时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t) => formatterTime(t),
+    },
+  ]
+
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        columns={columns}
+        request={getList}
+        search={false}
+        options={false}
+        rowKey="formId"
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/resumework/form/index.jsx

@@ -1,25 +1,21 @@
 
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useRef } from 'react'
 import moment from 'moment';
-import { Badge, Image, DatePicker, Select } from 'antd';
+import { Badge, Image, DatePicker } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getList, exportList } from '@/services/work'
 import PageTable from '@/components/PageTable'
-import useOrgList from '@/utils/hooks/useOrgList';
 import OrgSearch from '@/components/OrgSearch';
 
 const { RangePicker } = DatePicker;
-const { Option } = Select;
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
 };
 
-
 export default (props) => {
   const initDate = useRef(moment())
   const actionRef = useRef();
-  // const { orgList } = useOrgList()
 
   const handleBeforSearch = (params) => {
     const { createDate, ...others } = params;
@@ -43,25 +39,16 @@ export default (props) => {
       dataIndex: 'orgId',
       key: 'orgId',
       search: true,
-      // render: t => orgList.filter(x => x.orgId === t)[0]?.orgName,
+      hideInTable:true,
       renderFormItem: () => (
-        // <Select>
-        //   {orgList.map((item) => (
-        //     <Option value={item.orgId} key={item.orgId}>
-        //       {item.orgName}
-        //     </Option>
-        //   ))}
-        // </Select>
-        <OrgSearch />
-      ),
-      formItemProps: {
-        rules: [
-          {
-            required: true,
-            message: '请选择企业',
-          },
-        ],
-      },
+        <OrgSearch placeholder='请输入企业名称' />
+      )
+    },
+    {
+      title: '企业名称',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false,      
     },
     {
       title: '申请人',
@@ -123,7 +110,6 @@ export default (props) => {
         request={getList}
         expfunc={exportList}
         options={false}
-        // onReset={handleReset}
         form={{ ignoreRules: false }}
         manualRequest={true}
         revalidateOnFocus={false}