.

src/pages/cardNoList/index.jsx

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

src/pages/certificateIssuance/issuance.jsx

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

src/pages/dashboard/components/BannerStatis.jsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { history } from 'umi';
 import { Row, Col } from 'antd'
 import { AppstoreOutlined, AuditOutlined, FieldTimeOutlined } from '@ant-design/icons'
-// import { getcomm } from '@/services/statis';
+import { getcomm } from '@/services/statis';
 import StatisGroup from './StatisGroup';
 
 const colorList = [
@@ -12,7 +12,7 @@ const colorList = [
 ]
 
 export default (props) => {
-  const [cardData, setCardData] = useState({})
+  const [cardData, setCardData] = useState()
 
   const toApplichtion = () => {
     history.push('../../applicationList');
@@ -22,20 +22,18 @@ export default (props) => {
   }
 
   useEffect(() => {
-    // getcomm().then((res) => {
-    //   setCardData(res || {});
-    // })
+    getcomm().then((res) => {
+      setCardData(res || []);
+    })
   }, [])
 
-  const abnormalNum = (cardData.todayReportNum || 0) - (cardData.todayNormalNum || 0)
-
   return (
     <Row justify='space-around' gutter={24} >
       <Col span={8}>
         <StatisGroup
           title="总数"
-          data1={{ title: '总注册数', value: cardData.orgTotalNum || 857 }}
-          data2={{ title: '证牌发放数', value: cardData.noDataOrgNum || 364 }}
+          data1={{ title: '总注册数', value:cardData? cardData[0].value:0 }}
+          data2={{ title: '证牌发放数', value: cardData?cardData[1].value:0}}
           {...colorList[0]}
           icon={<AppstoreOutlined />}
         />
@@ -43,8 +41,8 @@ export default (props) => {
       <Col span={8}>
         <StatisGroup
           title="审核"
-          data1={{ title: '待审核数', value: cardData.todayReportNum || 20 }}
-          data2={{ title: '审核驳回数', value: cardData.yestodayReportNum || 1 }}
+          data1={{ title: '待审核数', value: cardData?cardData[2].value :0}}
+          data2={{ title: '审核驳回数', value:cardData? cardData[3].value :0}}
           {...colorList[1]}
           icon={<AuditOutlined />
           }
@@ -55,8 +53,8 @@ export default (props) => {
       <Col span={8}>
         <StatisGroup
           title="提交"
-          data1={{ title: '今日提交数', value: cardData.todayNormalNum || 25 }}
-          data2={{ title: '本月提交数', value: abnormalNum || 20 }}
+          data1={{ title: '今日提交数', value: cardData?cardData[4].value :0}}
+          data2={{ title: '本月提交数', value: cardData?cardData[5].value :0}}
           {...colorList[2]}
           icon={<FieldTimeOutlined />}
           onClick1={toApplichtion}

src/pages/dashboard/components/OrgSummary.jsx

@@ -1,6 +1,8 @@
 import { useEffect, useState, useCallback } from 'react';
 import Echart from '@/components/echart/echart'
 import { Card } from 'antd'
+import {getApplyDaily} from '@/services/statis'
+import moment from 'moment';
 
 const lineOption = {
   tooltip: {
@@ -49,48 +51,7 @@ const lineOption = {
 }
 export default (props) => {
   const [loading, setLoading] = useState(false)
-  const [list, setList] = useState([
-    {
-      date: '2022-9-9',
-      value: 20
-    },
-    {
-      date: '2022-9-10',
-      value: 205
-    },
-    {
-      date: '2022-9-11',
-      value: 200
-    },
-    {
-      date: '2022-9-12',
-      value: 210
-    },
-    {
-      date: '2022-9-13',
-      value: 10
-    },
-    {
-      date: '2022-9-14',
-      value: 50
-    },
-    {
-      date: '2022-9-15',
-      value: 80
-    },
-    {
-      date: '2022-9-16',
-      value: 27
-    },
-    {
-      date: '2022-9-19',
-      value: 99
-    },
-    {
-      date: '2022-9-20',
-      value: 5
-    },
-  ])
+  const [list, setList] = useState([])
 
   const option = {
     ...lineOption,
@@ -101,17 +62,16 @@ export default (props) => {
   }
 
   const queryList = useCallback(() => {
-    // setLoading(true)
-
-    // getAllOrgLine({
-    //   days: 7,
-    //   startDate: moment().subtract(7, 'day').format('YYYY-MM-DD'),
-    // }).then((res) => {
-    //   setLoading(false)
-    //   setList(res)
-    // }).catch(err => {
-    //   setLoading(false)
-    // })
+    setLoading(true)
+    getApplyDaily({
+      days: 10,
+      startDate: moment().subtract(10, 'day').format('YYYY-MM-DD'),
+    }).then((res) => {
+      setLoading(false)
+      setList(res)
+    }).catch(err => {
+      setLoading(false)
+    })
   }, [])
 
   useEffect(() => {
@@ -119,7 +79,7 @@ export default (props) => {
   }, [])
 
   return (
-    <Card title='近期提交趋势统计' loading={loading} bodyStyle={{ height: 600 }}>
+    <Card title='近期提交趋势统计' loading={loading} bodyStyle={{ height: 616 }}>
       <Echart option={option} />
     </Card>
   )

src/pages/dashboard/components/ReportList.jsx

@@ -1,24 +1,17 @@
 import moment from 'moment'
-import { Card, List, Badge, Space, Carousel } from 'antd'
+import { Card, List, Image, Space, Carousel } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import { history } from 'umi';
+import { getApplicationList } from '@/services/application'
 
 const Avatar = (props) => {
-  const style = useMemo(() => {
-    const color = props.item.status == 'first' ? '#C5E0A9' :
-    props.item.status == 'renewal' ? '#87C5ED' : '#E9CB99';
+  const style = useMemo(() => {   
     return {
-      background: color,
-      color: '#fff',
       width: '48px',
       height: '48px',
-      fontSize: '1.8em',
-      lineHeight: '48px',
-      textAlign: 'center',
     }
   }, [])
-
-  return <div style={style}>{props.children}</div>
+  return <div style={style}><Image src={props.item.img1} width='100%' height='100%' /></div>
 }
 
 
@@ -37,95 +30,33 @@ const showNum = 8;
 export default (props) => {
   const [loading, setLoading] = useState(false)
   const [disabled, setDisabled] = useState(false)
-  const [list, setList] = useState([
-    {
-      orgName: '办证',
-      status: 'first',
-      userName: '俏如来',
-      formId: 0,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '续期',
-      status: 'renewal',
-      userName: '雪山银燕',
-      formId: 1,
-      createDate: '2021-5-9 11:22:50'
-    },
-    {
-      orgName: '补办',
-      status: 'reissue',
-      userName: '史艳文',
-      formId: 2,
-      createDate: '2021-5-5 11:22:50'
-    },
-    {
-      orgName: '办证',
-      status: 'first',
-      userName: '南宫恨',
-      formId: 3,
-      createDate: '2021-5-7 11:22:50'
-    },
-    {
-      orgName: '补办',
-      status: 'reissue',
-      userName: '神蛊温皇',
-      formId: 4,
-      createDate: '2021-5-15 11:22:50'
-    },
-    {
-      orgName: '办证',
-      status: 'first',
-      userName: '燕驼龙',
-      formId: 5,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '办证',
-      status: 'first',
-      userName: '忆无心',
-      formId: 6,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '补办',
-      status: 'reissue',
-      userName: '史艳文',
-      formId: 7,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '续期',
-      status: 'renewal',
-      userName: '宫本武藏',
-      formId: 8,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '办证',
-      status: 'first',
-      userName: '素还真',
-      formId: 9,
-      createDate: '2021-5-6 11:22:50'
-    },
-    {
-      orgName: '续期',
-      status: 'renewal',
-      userName: '元邪皇',
-      formId: 10,
-      createDate: '2021-5-6 11:22:50'
-    },
-  ])
-  const toAudit = () => {
-    //审核详情
-    // history.push('../../examine');
-  }
+  const [list, setList] = useState([])
   useEffect(() => {
     setDisabled(!list || list.length <= showNum)
   }, [list])
+  useEffect(()=>{
+    setLoading(true)
+    getApplicationList({pageSize:50}).then((res)=>{
+      setList(res.records.map(item=>{
+        if (item.applyType=='first') {
+          item.applyTypeName='办证'
+        }else if(item.applyType=='renewal') {
+          item.applyTypeName='续期'
+        }else{
+          item.applyTypeName='补办'
+        }
+        return item
+      })
+      )
+      setLoading(false)
+    }).catch(err=>{
+      console.log(err);
+      setLoading(false)
+    })
+  },[])
 
   return (
-    <Card title="近期提交记录" loading={loading} bodyStyle={{ height: '600px' }}>
+    <Card title="近期提交记录" loading={loading} bodyStyle={{ height: '616px' }}>
       <List style={{ height: '100%', overflow: 'hidden' }} itemLayout="horizontal">
         <Carousel
           autoplay={!disabled}
@@ -140,11 +71,11 @@ export default (props) => {
           {
             list.map(item => (
               <div key={item.formId} style={{ display: 'flex' }}>
-                <List.Item onClick={()=>toAudit(item)}>
+                <List.Item>
                   <List.Item.Meta
-                    avatar={<Avatar item={item}>{item.orgName.substring(0, 1)}</Avatar>}
-                    title={item.userName}
-                    description={item.orgName}
+                    avatar={<Avatar item={item} />}
+                    title={item.petName}
+                    description={item.applyTypeName+`  申请人（`+item.personName+'）'}
                   />
                   <Content item={item} />
                 </List.Item>

src/services/statis.js

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