李志伟 3 年之前
父節點
當前提交
064a2516cd

+ 1
- 1
src/pages/dashboard/components/OrgScollList/index.jsx 查看文件

@@ -1,4 +1,4 @@
1
-import { Card, Row, Col, List } from 'antd'
1
+import { Row, Col, List } from 'antd'
2 2
 import { useEffect, useState, useRef } from 'react';
3 3
 import moment from 'moment';
4 4
 

+ 1
- 1
src/pages/dashboard/index.jsx 查看文件

@@ -1,8 +1,8 @@
1 1
 import { useEffect, useState } from 'react';
2
+import { Card, Row, Col, Empty } from 'antd'
2 3
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
3 4
 import moment from 'moment';
4 5
 import { history } from 'umi';
5
-import { Card, Row, Col, Empty } from 'antd'
6 6
 import { getList as getOrgList } from '@/services/org'
7 7
 import { getList as getResumeWorkList } from '@/services/work'
8 8
 import { getcomm } from '@/services/comm';

+ 6
- 12
src/pages/resumework/abnormal/index.jsx 查看文件

@@ -1,18 +1,13 @@
1
-
2
-import React, { useRef } from 'react'
1
+import React from 'react'
3 2
 import moment from 'moment';
4
-import { Badge, Image, DatePicker } from 'antd';
3
+import { Badge, Image } from 'antd';
5 4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
-import { getList } from '@/services/work'
5
+import { getAbnormalList } from '@/services/work'
7 6
 import PageTable from '@/components/PageTable'
8
-import OrgSearch from '@/components/OrgSearch';
9
-
10
-const { RangePicker } = DatePicker;
11 7
 
12 8
 const formatterTime = (val) => {
13 9
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
14 10
 };
15
-
16 11
 export default (props) => {
17 12
   const columns = [
18 13
     {
@@ -29,7 +24,7 @@ export default (props) => {
29 24
       title: '抗原截图',
30 25
       dataIndex: 'antigenImage',
31 26
       key: 'antigenImage',
32
-      render: t => {t?<Image src={t} width="64px" height="64px" />:''}
27
+      render: t => { t ? <Image src={t} width="64px" height="64px" /> : '' }
33 28
     },
34 29
     {
35 30
       title: '抗原结果',
@@ -53,7 +48,7 @@ export default (props) => {
53 48
       key: 'nucleicIsNormal',
54 49
       render: t => (
55 50
         <span>
56
-        {t ? <Badge status="success" text="正常" /> : <Badge status="error" text="异常" />}
51
+          {t ? <Badge status="success" text="正常" /> : <Badge status="error" text="异常" />}
57 52
         </span>
58 53
       )
59 54
     },
@@ -65,12 +60,11 @@ export default (props) => {
65 60
     },
66 61
   ]
67 62
 
68
-
69 63
   return (
70 64
     <PageHeaderWrapper>
71 65
       <PageTable
72 66
         columns={columns}
73
-        request={getList}
67
+        request={getAbnormalList}
74 68
         search={false}
75 69
         options={false}
76 70
         rowKey="formId"

+ 1
- 1
src/pages/resumework/form/index.jsx 查看文件

@@ -3,9 +3,9 @@ import React, { useRef } from 'react'
3 3
 import moment from 'moment';
4 4
 import { Badge, Image, DatePicker } from 'antd';
5 5
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
-import { getList, exportList } from '@/services/work'
7 6
 import PageTable from '@/components/PageTable'
8 7
 import OrgSearch from '@/components/OrgSearch';
8
+import { getList, exportList } from '@/services/work'
9 9
 
10 10
 const { RangePicker } = DatePicker;
11 11
 

+ 9
- 0
src/services/work.js 查看文件

@@ -1,4 +1,5 @@
1 1
 import request from '@/utils/request';
2
+import moment from 'moment';
2 3
 
3 4
 // 获取列表
4 5
 export const getList = (params) => request('/resume-work-form', { params });
@@ -6,3 +7,11 @@ export const getList = (params) => request('/resume-work-form', { params });
6 7
 // 导出
7 8
 export const exportList = (params) => request('/resume-work-form/export', { params });
8 9
 
10
+// 获取异常列表
11
+export const getAbnormalList = (params) =>
12
+  request(
13
+    `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
14
+      Date.now(),
15
+    ).format('YYYY-MM-DD')}&isAll=true&isAbnormal=true`,
16
+    { params },
17
+  );