李志伟 преди 2 години
родител
ревизия
3b77213445

+ 2
- 2
src/pages/cardNoList/index.jsx Целия файл

@@ -48,8 +48,8 @@ export default (props) => {
48 48
     },
49 49
     {
50 50
       title: '二维码',
51
-      key: 'qrcode',
52
-      dataIndex: 'qrcode',
51
+      key: 'qrImage',
52
+      dataIndex: 'qrImage',
53 53
       render: (t) => <Image width={110} src={t} alt="" />,
54 54
       search:false
55 55
     },    

+ 1
- 1
src/pages/certificateIssuance/issuance.jsx Целия файл

@@ -123,7 +123,7 @@ export default (props) => {
123 123
               value={application.originCardNo}
124 124
               style={{ width: '350px' }}
125 125
               readOnly={application?.makeStatus != 0}
126
-              placeholder='请输入证件号或者点击自动生成(必填)'
126
+              placeholder='请输入证件号(必填)'
127 127
               onChange={e => setApplication({ ...application, originCardNo: e.target.value })} />
128 128
           </FormItem>
129 129
           {

+ 11
- 13
src/pages/dashboard/components/BannerStatis.jsx Целия файл

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
2 2
 import { history } from 'umi';
3 3
 import { Row, Col } from 'antd'
4 4
 import { AppstoreOutlined, AuditOutlined, FieldTimeOutlined } from '@ant-design/icons'
5
-// import { getcomm } from '@/services/statis';
5
+import { getcomm } from '@/services/statis';
6 6
 import StatisGroup from './StatisGroup';
7 7
 
8 8
 const colorList = [
@@ -12,7 +12,7 @@ const colorList = [
12 12
 ]
13 13
 
14 14
 export default (props) => {
15
-  const [cardData, setCardData] = useState({})
15
+  const [cardData, setCardData] = useState()
16 16
 
17 17
   const toApplichtion = () => {
18 18
     history.push('../../applicationList');
@@ -22,20 +22,18 @@ export default (props) => {
22 22
   }
23 23
 
24 24
   useEffect(() => {
25
-    // getcomm().then((res) => {
26
-    //   setCardData(res || {});
27
-    // })
25
+    getcomm().then((res) => {
26
+      setCardData(res || []);
27
+    })
28 28
   }, [])
29 29
 
30
-  const abnormalNum = (cardData.todayReportNum || 0) - (cardData.todayNormalNum || 0)
31
-
32 30
   return (
33 31
     <Row justify='space-around' gutter={24} >
34 32
       <Col span={8}>
35 33
         <StatisGroup
36 34
           title="总数"
37
-          data1={{ title: '总注册数', value: cardData.orgTotalNum || 857 }}
38
-          data2={{ title: '证牌发放数', value: cardData.noDataOrgNum || 364 }}
35
+          data1={{ title: '总注册数', value:cardData? cardData[0].value:0 }}
36
+          data2={{ title: '证牌发放数', value: cardData?cardData[1].value:0}}
39 37
           {...colorList[0]}
40 38
           icon={<AppstoreOutlined />}
41 39
         />
@@ -43,8 +41,8 @@ export default (props) => {
43 41
       <Col span={8}>
44 42
         <StatisGroup
45 43
           title="审核"
46
-          data1={{ title: '待审核数', value: cardData.todayReportNum || 20 }}
47
-          data2={{ title: '审核驳回数', value: cardData.yestodayReportNum || 1 }}
44
+          data1={{ title: '待审核数', value: cardData?cardData[2].value :0}}
45
+          data2={{ title: '审核驳回数', value:cardData? cardData[3].value :0}}
48 46
           {...colorList[1]}
49 47
           icon={<AuditOutlined />
50 48
           }
@@ -55,8 +53,8 @@ export default (props) => {
55 53
       <Col span={8}>
56 54
         <StatisGroup
57 55
           title="提交"
58
-          data1={{ title: '今日提交数', value: cardData.todayNormalNum || 25 }}
59
-          data2={{ title: '本月提交数', value: abnormalNum || 20 }}
56
+          data1={{ title: '今日提交数', value: cardData?cardData[4].value :0}}
57
+          data2={{ title: '本月提交数', value: cardData?cardData[5].value :0}}
60 58
           {...colorList[2]}
61 59
           icon={<FieldTimeOutlined />}
62 60
           onClick1={toApplichtion}

+ 14
- 54
src/pages/dashboard/components/OrgSummary.jsx Целия файл

@@ -1,6 +1,8 @@
1 1
 import { useEffect, useState, useCallback } from 'react';
2 2
 import Echart from '@/components/echart/echart'
3 3
 import { Card } from 'antd'
4
+import {getApplyDaily} from '@/services/statis'
5
+import moment from 'moment';
4 6
 
5 7
 const lineOption = {
6 8
   tooltip: {
@@ -49,48 +51,7 @@ const lineOption = {
49 51
 }
50 52
 export default (props) => {
51 53
   const [loading, setLoading] = useState(false)
52
-  const [list, setList] = useState([
53
-    {
54
-      date: '2022-9-9',
55
-      value: 20
56
-    },
57
-    {
58
-      date: '2022-9-10',
59
-      value: 205
60
-    },
61
-    {
62
-      date: '2022-9-11',
63
-      value: 200
64
-    },
65
-    {
66
-      date: '2022-9-12',
67
-      value: 210
68
-    },
69
-    {
70
-      date: '2022-9-13',
71
-      value: 10
72
-    },
73
-    {
74
-      date: '2022-9-14',
75
-      value: 50
76
-    },
77
-    {
78
-      date: '2022-9-15',
79
-      value: 80
80
-    },
81
-    {
82
-      date: '2022-9-16',
83
-      value: 27
84
-    },
85
-    {
86
-      date: '2022-9-19',
87
-      value: 99
88
-    },
89
-    {
90
-      date: '2022-9-20',
91
-      value: 5
92
-    },
93
-  ])
54
+  const [list, setList] = useState([])
94 55
 
95 56
   const option = {
96 57
     ...lineOption,
@@ -101,17 +62,16 @@ export default (props) => {
101 62
   }
102 63
 
103 64
   const queryList = useCallback(() => {
104
-    // setLoading(true)
105
-
106
-    // getAllOrgLine({
107
-    //   days: 7,
108
-    //   startDate: moment().subtract(7, 'day').format('YYYY-MM-DD'),
109
-    // }).then((res) => {
110
-    //   setLoading(false)
111
-    //   setList(res)
112
-    // }).catch(err => {
113
-    //   setLoading(false)
114
-    // })
65
+    setLoading(true)
66
+    getApplyDaily({
67
+      days: 10,
68
+      startDate: moment().subtract(10, 'day').format('YYYY-MM-DD'),
69
+    }).then((res) => {
70
+      setLoading(false)
71
+      setList(res)
72
+    }).catch(err => {
73
+      setLoading(false)
74
+    })
115 75
   }, [])
116 76
 
117 77
   useEffect(() => {
@@ -119,7 +79,7 @@ export default (props) => {
119 79
   }, [])
120 80
 
121 81
   return (
122
-    <Card title='近期提交趋势统计' loading={loading} bodyStyle={{ height: 600 }}>
82
+    <Card title='近期提交趋势统计' loading={loading} bodyStyle={{ height: 616 }}>
123 83
       <Echart option={option} />
124 84
     </Card>
125 85
   )

+ 30
- 99
src/pages/dashboard/components/ReportList.jsx Целия файл

@@ -1,24 +1,17 @@
1 1
 import moment from 'moment'
2
-import { Card, List, Badge, Space, Carousel } from 'antd'
2
+import { Card, List, Image, Space, Carousel } from 'antd'
3 3
 import { useEffect, useMemo, useState } from 'react'
4 4
 import { history } from 'umi';
5
+import { getApplicationList } from '@/services/application'
5 6
 
6 7
 const Avatar = (props) => {
7
-  const style = useMemo(() => {
8
-    const color = props.item.status == 'first' ? '#C5E0A9' :
9
-    props.item.status == 'renewal' ? '#87C5ED' : '#E9CB99';
8
+  const style = useMemo(() => {   
10 9
     return {
11
-      background: color,
12
-      color: '#fff',
13 10
       width: '48px',
14 11
       height: '48px',
15
-      fontSize: '1.8em',
16
-      lineHeight: '48px',
17
-      textAlign: 'center',
18 12
     }
19 13
   }, [])
20
-
21
-  return <div style={style}>{props.children}</div>
14
+  return <div style={style}><Image src={props.item.img1} width='100%' height='100%' /></div>
22 15
 }
23 16
 
24 17
 
@@ -37,95 +30,33 @@ const showNum = 8;
37 30
 export default (props) => {
38 31
   const [loading, setLoading] = useState(false)
39 32
   const [disabled, setDisabled] = useState(false)
40
-  const [list, setList] = useState([
41
-    {
42
-      orgName: '办证',
43
-      status: 'first',
44
-      userName: '俏如来',
45
-      formId: 0,
46
-      createDate: '2021-5-6 11:22:50'
47
-    },
48
-    {
49
-      orgName: '续期',
50
-      status: 'renewal',
51
-      userName: '雪山银燕',
52
-      formId: 1,
53
-      createDate: '2021-5-9 11:22:50'
54
-    },
55
-    {
56
-      orgName: '补办',
57
-      status: 'reissue',
58
-      userName: '史艳文',
59
-      formId: 2,
60
-      createDate: '2021-5-5 11:22:50'
61
-    },
62
-    {
63
-      orgName: '办证',
64
-      status: 'first',
65
-      userName: '南宫恨',
66
-      formId: 3,
67
-      createDate: '2021-5-7 11:22:50'
68
-    },
69
-    {
70
-      orgName: '补办',
71
-      status: 'reissue',
72
-      userName: '神蛊温皇',
73
-      formId: 4,
74
-      createDate: '2021-5-15 11:22:50'
75
-    },
76
-    {
77
-      orgName: '办证',
78
-      status: 'first',
79
-      userName: '燕驼龙',
80
-      formId: 5,
81
-      createDate: '2021-5-6 11:22:50'
82
-    },
83
-    {
84
-      orgName: '办证',
85
-      status: 'first',
86
-      userName: '忆无心',
87
-      formId: 6,
88
-      createDate: '2021-5-6 11:22:50'
89
-    },
90
-    {
91
-      orgName: '补办',
92
-      status: 'reissue',
93
-      userName: '史艳文',
94
-      formId: 7,
95
-      createDate: '2021-5-6 11:22:50'
96
-    },
97
-    {
98
-      orgName: '续期',
99
-      status: 'renewal',
100
-      userName: '宫本武藏',
101
-      formId: 8,
102
-      createDate: '2021-5-6 11:22:50'
103
-    },
104
-    {
105
-      orgName: '办证',
106
-      status: 'first',
107
-      userName: '素还真',
108
-      formId: 9,
109
-      createDate: '2021-5-6 11:22:50'
110
-    },
111
-    {
112
-      orgName: '续期',
113
-      status: 'renewal',
114
-      userName: '元邪皇',
115
-      formId: 10,
116
-      createDate: '2021-5-6 11:22:50'
117
-    },
118
-  ])
119
-  const toAudit = () => {
120
-    //审核详情
121
-    // history.push('../../examine');
122
-  }
33
+  const [list, setList] = useState([])
123 34
   useEffect(() => {
124 35
     setDisabled(!list || list.length <= showNum)
125 36
   }, [list])
37
+  useEffect(()=>{
38
+    setLoading(true)
39
+    getApplicationList({pageSize:50}).then((res)=>{
40
+      setList(res.records.map(item=>{
41
+        if (item.applyType=='first') {
42
+          item.applyTypeName='办证'
43
+        }else if(item.applyType=='renewal') {
44
+          item.applyTypeName='续期'
45
+        }else{
46
+          item.applyTypeName='补办'
47
+        }
48
+        return item
49
+      })
50
+      )
51
+      setLoading(false)
52
+    }).catch(err=>{
53
+      console.log(err);
54
+      setLoading(false)
55
+    })
56
+  },[])
126 57
 
127 58
   return (
128
-    <Card title="近期提交记录" loading={loading} bodyStyle={{ height: '600px' }}>
59
+    <Card title="近期提交记录" loading={loading} bodyStyle={{ height: '616px' }}>
129 60
       <List style={{ height: '100%', overflow: 'hidden' }} itemLayout="horizontal">
130 61
         <Carousel
131 62
           autoplay={!disabled}
@@ -140,11 +71,11 @@ export default (props) => {
140 71
           {
141 72
             list.map(item => (
142 73
               <div key={item.formId} style={{ display: 'flex' }}>
143
-                <List.Item onClick={()=>toAudit(item)}>
74
+                <List.Item>
144 75
                   <List.Item.Meta
145
-                    avatar={<Avatar item={item}>{item.orgName.substring(0, 1)}</Avatar>}
146
-                    title={item.userName}
147
-                    description={item.orgName}
76
+                    avatar={<Avatar item={item} />}
77
+                    title={item.petName}
78
+                    description={item.applyTypeName+`  申请人(`+item.personName+')'}
148 79
                   />
149 80
                   <Content item={item} />
150 81
                 </List.Item>

+ 4
- 3
src/services/statis.js Целия файл

@@ -1,10 +1,10 @@
1 1
 import request from '@/utils/request';
2 2
 
3 3
 // 获取首页卡片信息
4
-export const getcomm = (params) => request('/statis/comm', { params });
4
+export const getcomm = () => request('/statis/common');
5 5
 
6
-// 获取企业信息汇总
7
-export const getAllOrgPersonNum = () => request('/statis/org/total');
6
+// 获取近期提交
7
+export const getApplyDaily = (params) => request('/statis/applyDaily', { params });
8 8
 
9 9
 // org工作台--企业数据总览
10 10
 export const getAllOrgLine = (params) => request('/statis/org/daily', { params, method: 'GET' });
@@ -12,3 +12,4 @@ export const getAllOrgLine = (params) => request('/statis/org/daily', { params,
12 12
 
13 13
 // org工作台--企业工作台数据
14 14
 export const getOrgComm = (params) => request('/statis/org/comm', { params });
15
+