Merge branch 'dev' of http://git.ycjcjy.com/ubpa/pc-admin into dev

package.json

@@ -48,7 +48,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-card": "^1.18.34",
+    "@ant-design/pro-card": "^1.20.2",
     "@ant-design/pro-descriptions": "^1.10.0",
     "@ant-design/pro-form": "^1.52.0",
     "@ant-design/pro-layout": "^6.32.0",
@@ -58,6 +58,7 @@
     "ali-oss": "^6.17.1",
     "antd": "^4.17.0",
     "classnames": "^2.3.0",
+    "echarts": "^5.3.2",
     "lodash": "^4.17.0",
     "md5": "^2.3.0",
     "moment": "^2.29.1",

src/components/echart/echart.jsx

@@ -0,0 +1,62 @@
+import React, { useEffect, useRef } from 'react'
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
+import * as echarts from 'echarts/core';
+// 引入柱状图图表，图表后缀都为 Chart
+import { BarChart } from 'echarts/charts';
+// 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
+import {
+  TitleComponent,
+  TooltipComponent,
+  GridComponent,
+  DatasetComponent,
+  TransformComponent,
+  DataZoomComponent,
+} from 'echarts/components';
+// 标签自动布局，全局过渡动画等特性
+import { LabelLayout, UniversalTransition } from 'echarts/features';
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+import { CanvasRenderer } from 'echarts/renderers';
+
+// 注册必须的组件
+echarts.use([
+  TitleComponent,
+  TooltipComponent,
+  GridComponent,
+  DatasetComponent,
+  DataZoomComponent,
+  TransformComponent,
+  BarChart,
+  LabelLayout,
+  UniversalTransition,
+  CanvasRenderer
+]);
+
+export default (props) => {
+  const { className, style, option } = props
+
+  const chartRef = useRef()
+  const domRef = useRef()
+
+  const styleMerged = {
+    height: '100%',
+    ...style || {}
+  }
+
+  useEffect(() => {
+    chartRef.current = echarts.init(domRef.current)
+
+    return () => {
+      chartRef.current.dispose()
+    }
+  }, [])
+
+  useEffect(() => {
+    if (chartRef.current && option) {
+      chartRef.current.setOption(option)
+    }
+  }, [option])
+
+  return (
+    <div className={className} style={styleMerged} ref={domRef} />
+  )
+}

src/pages/dashboard/components/BannerStatis.jsx

@@ -0,0 +1,111 @@
+import { useEffect, useState } from 'react';
+import { history } from 'umi';
+import { Card, Row, Col } from 'antd'
+import { AppstoreOutlined, MacCommandOutlined, TeamOutlined, UsergroupDeleteOutlined, UsergroupAddOutlined } from '@ant-design/icons'
+import { getcomm } from '@/services/comm';
+import StatisCard from './StatisCard';
+import StatisGroup from './StatisGroup';
+
+const colorList = [
+  { backColor: '#126BAE', frontColor: '#fff' },
+  { backColor: '#66A9C9', frontColor: '#fff' },
+  { backColor: '#08507b', frontColor: '#fff' },
+]
+
+export default (props) => {
+  const [cardData, setCardData] = useState({})
+  
+  const toAbnormal = () => {
+    history.push('../resume-work/abnormal');
+  }
+
+  useEffect(() => {
+    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 || 0 }}
+          data2={{ title: '无数据企业', value: cardData.noDataOrgNum || 0 }}
+          {...colorList[0]}
+          icon={<AppstoreOutlined />}
+        />
+      </Col>
+      <Col span={8}>
+        <StatisGroup
+          title="上报人次"
+          data1={{ title: '今日提交', value: cardData.todayReportNum || 0 }}
+          data2={{ title: '昨日提交', value: cardData.yestodayReportNum || 0 }}
+          {...colorList[1]}
+          icon={<TeamOutlined />}
+        />
+      </Col>
+      <Col span={8}>
+        <StatisGroup
+          title="今日概况"
+          data1={{ title: '正常人次', value: cardData.todayNormalNum || 0 }}
+          data2={{ title: '异常人次', value: abnormalNum }}
+          {...colorList[2]}
+          icon={<UsergroupDeleteOutlined />}
+          onClick2={toAbnormal}
+        />
+      </Col>
+      {/* <Col span={4}>
+        <StatisCard
+          title="企业总数"
+          value={cardData?.orgTotalNum || 0}
+          icon={<AppstoreOutlined />}
+          {...colorList[0]}
+        />
+      </Col>
+      <Col span={4}>
+        <StatisCard
+          title="无数据企业"
+          value={`${cardData?.noDataOrgNum || 0} / ${cardData?.orgTotalNum || 0}`}
+          icon={<MacCommandOutlined />}
+          {...colorList[1]}
+        />
+      </Col>
+      <Col span={4}>
+        <StatisCard
+          title="今日提交总人数"
+          value={cardData?.todayReportNum || 0}
+          icon={<TeamOutlined />}
+          {...colorList[2]}
+        />
+      </Col>
+      <Col span={4}>
+        <StatisCard
+          title="昨日提交总人数"
+          value={cardData?.yestodayReportNum || 0}
+          icon={<TeamOutlined />}
+          {...colorList[3]}
+        />
+      </Col>
+      <Col span={4}>
+        <StatisCard
+          title="今日正常人数"
+          value={cardData?.todayNormalNum || 0}
+          icon={<UsergroupDeleteOutlined />}
+          {...colorList[4]}
+        />
+      </Col>
+      <Col span={4}>
+        <StatisCard
+          title="今日异常人数"
+          value={(cardData?.todayReportNum || 0) - (cardData?.todayNormalNum || 0)}
+          icon={<UsergroupAddOutlined />}
+          {...colorList[5]}
+          onClick={toAbnormal}
+        />
+      </Col> */}
+    </Row>
+  )
+}

src/pages/dashboard/components/OrgScollList/index.jsx

@@ -1,131 +0,0 @@
-import { Row, Col, List } from 'antd'
-import { useEffect, useState, useRef } from 'react';
-import moment from 'moment';
-
-import './style.less'
-
-export default (props) => {
-  const { list } = props
-  let scrollTimeout = null;
-  const [listHeight, setListHeight] = useState(0);
-  const [hoverState, setHoverState] = useState(false);
-  const scrollRef = useRef();
-  const formatterTime = (val) => {
-    return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
-  };
-  const computeHeight = () => {
-    scrollTimeout = setTimeout(() => {
-      setListHeight(scrollRef.current && scrollRef.current.offsetHeight || 0)
-    }, 0)
-  };
-  useEffect(() => {
-    if (list != []) {
-      computeHeight()
-    }
-  }, [list])
-
-  return (
-    <>
-      <Row>
-        <Col span={8} align='center'>
-          <span className='tableHead'>企业名称</span>
-        </Col>
-        <Col span={8} align='center'>
-          <span className='tableHead'>创建时间</span>
-        </Col>
-        <Col span={8} align='center'>
-          <span className='tableHead'>历史最多人次</span>
-        </Col>
-      </Row>
-      {
-        list?.length > 12 ?
-          <div
-            className={listHeight > 200 ? 'scroll' : ''}
-            style={{ marginLeft: '10px', marginTop: '20px' }}
-            onMouseEnter={() => setHoverState(true)}
-            onMouseLeave={() => setHoverState(false)}
-          >
-            <div className={`scroll-list ${hoverState ? 'hover' : ''}`}
-              style={{ animationDuration: `${list.length}s` }}
-              ref={scrollRef}>
-              <List
-                id="scrollList"
-                dataSource={list}
-                renderItem={(item, index) => (
-                  <List.Item>
-                    <Row style={{ width: '100%' }}>
-                      <Col span={8}>
-                        {item.orgName}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {formatterTime(item.createDate)}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {item.totalReportNum || <span style={{ color: 'red' }} >0</span>}
-                      </Col>
-                    </Row>
-                  </List.Item>
-                )}
-              />
-            </div>
-            {
-              list.length > 2 &&
-              <div
-                className={`scroll-list ${hoverState ? 'hover' : ''}`}
-                style={{ animationDuration: `${list.length}s` }}
-                ref={scrollRef}>
-                <List
-                  dataSource={list}
-                  renderItem={(item, index) => (
-                    <List.Item>
-                      <Row style={{ width: '100%' }}>
-                        <Col span={8}>
-                          {item.orgName}
-                        </Col>
-                        <Col span={8} align='center'>
-                          {formatterTime(item.createDate)}
-                        </Col>
-                        <Col span={8} align='center'>
-                          {item.totalReportNum || <span style={{ color: 'red' }} >0</span>}
-                        </Col>
-                      </Row>
-                    </List.Item>
-                  )}
-                />
-              </div>
-            }
-          </div>
-          : list?.length > 0 &&
-          <div
-            style={{ marginLeft: '10px', marginTop: '20px' }}
-            onMouseEnter={() => setHoverState(true)}
-            onMouseLeave={() => setHoverState(false)}
-          >
-            <div className={`scroll-list`}
-              style={{ animationDuration: `${list.length}s` }}
-              ref={scrollRef}>
-              <List
-                id="scrollList"
-                dataSource={list}
-                renderItem={(item, index) => (
-                  <List.Item>
-                    <Row style={{ width: '100%' }}>
-                      <Col span={8}>
-                        {item.orgName}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {formatterTime(item.createDate)}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {item.totalReportNum || <span style={{ color: 'red' }} >0</span>}
-                      </Col>
-                    </Row>
-                  </List.Item>
-                )}
-              />
-            </div>
-          </div>
-      }
-    </>
-  )
-}

src/pages/dashboard/components/OrgScollList/style.less

@@ -1,26 +0,0 @@
-.scroll {
-  height: 600px;  
-  overflow: hidden;  
-  .scroll-list {  
-    animation: moveup 7s linear infinite normal;
-
-    // 动画名称 执行时间 动画方式: 匀速 动画次数：无限次infinite 动画方向
-
-    &.hover {  
-      animation-play-state: paused;  
-    }  
-  }  
-}  
-
-@keyframes moveup {  
-  0% {  
-    transform: translateY(0);  
-  }  
-  100% {  
-    transform: translateY(-100%);  
-  }  
-}
-
-.tableHead{
-  color: rgb(40, 165, 255);
-}

src/pages/dashboard/components/OrgSummary.jsx

@@ -0,0 +1,103 @@
+import { useEffect, useState, useCallback } from 'react';
+import Echart from '@/components/echart/echart'
+import { Card } from 'antd'
+import { getList } from '@/services/org'
+
+const barOption = {
+  color: ['#08507b'],
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow'
+    },
+    formatter: (params) => `人次: ${params[0].data.totalReportNum || 0}`
+  },
+  grid: {
+    containLabel: true,
+    left: 0,
+    top: 0,
+    right: 60,
+    bottom: 0,
+  }, 
+  yAxis: {
+    type: 'category',
+    axisLabel: {
+      // rotate: 45,
+      formatter: (value) => value.length > 10 ? value.substring(0, 10) + '...' : value,
+      color: (value, index) => 'black'
+    },
+  },
+  xAxis: {
+    type: 'value',
+  },
+  dataZoom: [
+    {
+      type: 'slider',
+      yAxisIndex: [0],
+      start: 100,
+      end: 80,
+      // width: 10,
+      // fillerColor: '#08507b',
+      selectedDataBackground: {
+        areaStyle: { color: '#08507b', },
+        lineStyle: { color: '#08507b', width: 1 },
+      }
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 100,
+      end: 80
+    }
+  ],
+  dataset: {
+    dimensions: ['orgName', 'totalReportNum'],
+    source: [],
+  },
+  series: [
+    {
+      type: 'bar',
+    },
+  ]
+}
+
+export default (props) => {
+  const [loading, setLoading] = useState(false)
+  const [list, setList] = useState([])
+
+  const option = {
+    ...barOption,
+    dataset: {
+      ...barOption.dataset,
+      source: list
+    },
+    yAxis: {
+      ...barOption.yAxis,
+      axisLabel: {
+        ...barOption.yAxis.axisLabel,
+        color: value => list.filter(x => x.orgName === value)[0].totalReportNum ? 'black' : 'red'
+      }
+    }
+  }
+  
+  const queryList = useCallback(() => {
+    setLoading(true)
+
+    getList({ pageSize: 500, qType: 'statis' }).then((res) => {
+      setLoading(false)
+      setList((res.records || []).reverse())
+    }).catch(err => {
+      setLoading(false)
+    })
+  }, [])
+  
+  useEffect(() => {
+    queryList()
+  }, [])
+
+  return (
+    <Card title='企业数据总览' loading={loading} bodyStyle={{height: 600}}>
+      <Echart option={option} />
+    </Card>
+  )
+}

src/pages/dashboard/components/ReportList.jsx

@@ -0,0 +1,113 @@
+import moment from 'moment'
+import { Card, List, Badge, Space, Carousel } from 'antd'
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { getList } from '@/services/work'
+import { random } from '@/utils/number'
+
+const colorList = [
+  '#a8071a',
+  '#ad2102',
+  '#ad4e00',
+  '#ad6800',
+  '#ad8b00',
+  '#5b8c00',
+  '#237804',
+  '#006d75',
+  '#0050b3',
+  '#10239e',
+  '#391085',
+  '#9e1068',
+]
+
+const Avatar = (props) => {
+  const style = useMemo(() => {
+    let r = random(0, colorList.length)
+    if (r >= 12) r = 0;
+    const color = colorList[r];
+
+    return {
+      background: color,
+      color: '#fff',
+      width: '48px',
+      height: '48px',
+      fontSize: '1.8em',
+      lineHeight: '48px',
+      textAlign: 'center',
+    }
+  }, [])
+
+  return <div style={style}>{props.children}</div>
+}
+
+
+const Content = (props) => {
+  const { item } = props;
+
+  const abnormal = item.antigenIsNormal === 0 || item.nucleicIsNormal === 0
+  const status = abnormal ? 'error' : 'success'
+
+  return (
+    <Space size="large">
+      <span><Badge status={status} /> { abnormal ? '异常' : '正常' }</span>
+      <span>{moment(item.createDate).format('HH:mm')}</span>
+    </Space>
+  )
+}
+
+export default (props) => {
+  const [loading, setLoading] = useState(false)
+  const [list, setList] = useState([])
+
+  const queryList = useCallback(() => {
+    setLoading(true)
+    getList(
+      {
+        pageSize: 50, // 过多会很卡
+        start: moment().format('YYYY-MM-DD'),
+        end: moment().format('YYYY-MM-DD'),
+        isAll: true
+      }).then(res => {
+        setLoading(false)
+        setList((res.records || []).reverse())
+      }).catch(er => {
+        setLoading(false)
+      })
+  }, [])
+
+  useEffect(() => {
+    queryList()
+  }, [])
+
+  return (
+    <Card title="今日提交记录" loading={loading} bodyStyle={{ height: '600px' }}>
+      <List style={{ height: '100%', overflow: 'hidden' }} itemLayout="horizontal">
+        <Carousel
+          autoplay
+          infinite
+          rtl
+          slidesToShow={8}
+          slidesToScroll={1}
+          dot={false}
+          dotPosition="right"
+          style={{ height: '100%' }}
+        >
+          {
+            list.map(item => (
+              <div key={item.formId} style={{ display: 'flex' }}>
+                <List.Item>
+                  <List.Item.Meta
+                    avatar={<Avatar>{item.orgName.substring(0,1)}</Avatar>}
+                    title={item.userName}
+                    con
+                    description={item.orgName}
+                  />
+                  <Content item={item} />
+                </List.Item>
+              </div>
+            ))
+          }
+        </Carousel>
+      </List>
+    </Card>
+  )
+}

src/pages/dashboard/components/ResumeWorkScollList/index.jsx

@@ -1,131 +0,0 @@
-import { Row, Col, List } from 'antd'
-import { useEffect, useState, useRef } from 'react';
-import moment from 'moment';
-
-import './style.less'
-
-export default (props) => {
-  const { list } = props
-  let scrollTimeout = null;
-  const [listHeight, setListHeight] = useState(0);
-  const [hoverState, setHoverState] = useState(false);
-  const scrollRef = useRef();
-  const formatterTime = (val) => {
-    return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
-  };
-  const computeHeight = () => {
-    scrollTimeout = setTimeout(() => {
-      setListHeight(scrollRef.current && scrollRef.current.offsetHeight || 0)
-    }, 0)
-  };
-  useEffect(() => {
-    if (list != []) {
-      computeHeight()
-    }
-  }, [list])
-
-  return (
-    <>
-      <Row>
-        <Col span={8} align='center'>
-          <span className='tableHead'>企业名称</span>
-        </Col>
-        <Col span={8} align='center'>
-          <span className='tableHead'>姓名</span>
-        </Col>
-        <Col span={8} align='center'>
-          <span className='tableHead'>申请时间</span>
-        </Col>
-      </Row>
-      {list?.length > 12 ?
-        <div
-          className={listHeight > 200 ? 'scroll' : ''}
-          style={{ marginLeft: '10px', marginTop: '20px' }}
-          onMouseEnter={() => setHoverState(true)}
-          onMouseLeave={() => setHoverState(false)}
-        >
-          <div className={`scroll-list ${hoverState ? 'hover' : ''}`}
-            style={{ animationDuration: `${list.length}s` }}
-            ref={scrollRef}>
-            <List
-              id="scrollList"
-              dataSource={list}
-              renderItem={(item, index) => (
-                <List.Item>
-                  <Row style={{ width: '100%' }}>
-                    <Col span={8}>
-                      {item.orgName}
-                    </Col>
-                    <Col span={8} align='center'>
-                      {item.userName}
-                    </Col>
-                    <Col span={8} align='center'>
-                      {formatterTime(item.createDate)}
-                    </Col>
-                  </Row>
-                </List.Item>
-              )}
-            />
-          </div>
-          {
-            list.length > 2 &&
-            <div
-              className={`scroll-list ${hoverState ? 'hover' : ''}`}
-              style={{ animationDuration: `${list.length}s` }}
-              ref={scrollRef}>
-              <List
-                dataSource={list}
-                renderItem={(item, index) => (
-                  <List.Item>
-                    <Row style={{ width: '100%' }}>
-                      <Col span={8}>
-                        {item.orgName}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {item.userName}
-                      </Col>
-                      <Col span={8} align='center'>
-                        {formatterTime(item.createDate)}
-                      </Col>
-                    </Row>
-                  </List.Item>
-                )}
-              />
-            </div>
-          }
-        </div>
-        : list?.length > 0 &&
-        <div
-          style={{ marginLeft: '10px', marginTop: '20px' }}
-          onMouseEnter={() => setHoverState(true)}
-          onMouseLeave={() => setHoverState(false)}
-        >
-          <div className={`scroll-list`}
-            style={{ animationDuration: `${list.length}s` }}
-            ref={scrollRef}>
-            <List
-              id="scrollList"
-              dataSource={list}
-              renderItem={(item, index) => (
-                <List.Item>
-                  <Row style={{ width: '100%' }}>
-                    <Col span={8}>
-                      {item.orgName}
-                    </Col>
-                    <Col span={8} align='center'>
-                      {item.userName}
-                    </Col>
-                    <Col span={8} align='center'>
-                      {formatterTime(item.createDate)}
-                    </Col>
-                  </Row>
-                </List.Item>
-              )}
-            />
-          </div>
-        </div>
-
-      }
-    </>
-  )
-}

src/pages/dashboard/components/ResumeWorkScollList/style.less

@@ -1,26 +0,0 @@
-.scroll {
-  height: 600px;  
-  overflow: hidden;  
-  .scroll-list {  
-    animation: moveup 7s linear infinite normal;
-
-    // 动画名称 执行时间 动画方式: 匀速 动画次数：无限次infinite 动画方向
-
-    &.hover {  
-      animation-play-state: paused;  
-    }  
-  }  
-}  
-
-@keyframes moveup {  
-  0% {  
-    transform: translateY(0);  
-  }  
-  100% {  
-    transform: translateY(-100%);  
-  }  
-}
-
-.tableHead{
-  color: rgb(40, 165, 255);
-}

src/pages/dashboard/components/StatisCard.jsx

@@ -0,0 +1,41 @@
+import React from 'react'
+import { Statistic, Card } from 'antd';
+
+const iconDivStyle = {
+  position: 'absolute',
+  top: 20,
+  right: 20,
+}
+
+const iconStyle = {
+  fontSize: '5em',
+  color: '#fff',
+  opacity: 0.3,
+}
+
+export default (props) => {
+  const { title, value, icon, backColor = '#fff', frontColor='#000', onClick } = props
+
+  const bodyStyle = {
+    background: backColor,
+    overflow: 'hidden',
+    position: 'relative',
+  }
+
+  return (
+    <Card bodyStyle={bodyStyle} onClick={onClick}>
+      <Statistic
+        title={title}
+        value={value}
+        valueStyle={{ color: frontColor }}
+      />
+      {
+        icon && (
+          <div style={iconDivStyle}>
+            {React.cloneElement(icon, { style: iconStyle })}
+          </div>
+        )
+      }
+    </Card>
+  )
+}

src/pages/dashboard/components/StatisGroup.jsx

@@ -0,0 +1,74 @@
+import React, { useState } from 'react';
+import { StatisticCard } from '@ant-design/pro-card';
+
+const { Divider } = StatisticCard;
+const iconDivStyle = {
+  position: 'absolute',
+  top: '4px',
+  right: '-30px',
+}
+
+const iconStyle = {
+  fontSize: '10em',
+  color: '#fff',
+  opacity: 0.45,
+}
+
+export default (props) => {
+  const { title, data1, data2, icon, onClick1, onClick2, backColor = '#fff', frontColor='#000' } = props
+
+  const headStyle = {
+    background: backColor,
+    color: frontColor,
+  }
+
+  const bodyStyle = {
+    background: backColor,
+    color: frontColor,
+    position: 'relative',
+    overflow: 'hidden',
+  }
+
+  const groupBodyStyle = {
+    ...bodyStyle,
+    padding: 0,
+  }
+
+  const valueStyle = {
+    color: frontColor
+  }
+
+  const headTitleStyle = {
+    color: frontColor,
+    fontSize: '19px',
+    fontWeight: 700,
+    letterSpacing: '2px',
+  }
+
+  const titleStyle = {
+    color: frontColor,
+  }
+
+  return (
+    <StatisticCard.Group title={<div style={headTitleStyle}>{title}</div>} headStyle={headStyle} bodyStyle={groupBodyStyle}>
+      <StatisticCard
+        bodyStyle={bodyStyle}
+        statistic={{ ...data1, title: (<div style={titleStyle}>{data1.title}</div>), valueStyle }}
+        onClick={onClick1}
+      />
+      <Divider type="vertical" />
+      <StatisticCard
+        bodyStyle={bodyStyle}
+        statistic={{ ...data2, title: (<div style={titleStyle}>{data2.title}</div>), valueStyle }}
+        onClick={onClick2}
+      />
+      {
+        icon && (
+          <div style={iconDivStyle}>
+            {React.cloneElement(icon, { style: iconStyle })}
+          </div>
+        )
+      }
+    </StatisticCard.Group>
+  )
+}

src/pages/dashboard/index.jsx

@@ -1,140 +1,20 @@
-import { useEffect, useState } from 'react';
-import { Card, Row, Col, Empty } from 'antd'
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import moment from 'moment';
-import { history } from 'umi';
-import { getList as getOrgList } from '@/services/org'
-import { getList as getResumeWorkList } from '@/services/work'
-import { getcomm } from '@/services/comm';
-import ResumeWorkScollList from './components/ResumeWorkScollList';
-import OrgScollList from './components/OrgScollList';
-import './style.less'
+import React from 'react';
+import { Space, Row, Col } from 'antd'
+import ReportList from './components/ReportList';
+import OrgSummary from './components/OrgSummary';
+import BannerStatis from './components/BannerStatis';
 
-export default (props) => {
-  const [cardData, setCardData] = useState()
-  const [orgList, setOrgList] = useState([])
-  const [resumeWorkList, setResumeWorkList] = useState([])
-  const nowDate = () => {
-    var strArray = moment(Date.now()).format('YYYY/MM/DD').split("/");
-    strArray = strArray.map(function (val) {
-      if (val[0] == "0") {
-        return val.slice(1);
-      } else {
-        return val;
-      }
-    });
-    return strArray.join("/");
-  }
-  const header = (
-    <Row justify='space-between' align='middle' >
-      <Col span={2}>
-        <img src="./wordLogo.png" />
-      </Col>
-      <Col style={{ fontSize: '24px', fontWeight: 'bold' }}>ubpa-疫情防控管理平台</Col>
-      <Col span={2} style={{ textAlign: 'right' }}>{nowDate()}</Col>
-    </Row>
-  )
-  const goDashboard=()=>{
-    history.push('../resume-work/abnormal');
-  }
-
-  useEffect(() => {
-    getcomm().then((res) => {
-      setCardData(res);
-    })
-    getOrgList({ pageSize: 500 }).then((res) => {
-      setOrgList(res.records)
-    })
-    getResumeWorkList(
-      {
-        pageSize: 500,
-        start: moment(Date.now()).format('YYYY-MM-DD'),
-        end: moment(Date.now()).format('YYYY-MM-DD'),
-        isAll: true
-      }).then(res => {
-        setResumeWorkList(res.records)
-      })
-  }, [])
+export default (props) => {  
   return (
-    <PageHeaderWrapper content={header} className='dashboardPage'>
-      <Row justify='space-around' >
-        <Col span={4}>
-          <Card className='dashboardCard'>
-            <div>
-              企业总数
-            </div>
-            <div className='amount'>
-              {cardData?.orgTotalNum || 0}
-            </div>
-          </Card>
-          <Card className='dashboardCard' style={{ marginTop: '24px' }}>
-            <div>
-              无数据企业
-            </div>
-            <div className='amount'>
-              {cardData?.noDataOrgNum || 0}/{cardData?.orgTotalNum || 0}
-            </div>
-          </Card>
-        </Col>
-        <Col span={4}>
-          <Card className='dashboardCard'>
-            <div>
-              今日提交总人数
-            </div>
-            <div className='amount'>
-              {cardData?.todayReportNum || 0}
-            </div>
-          </Card>
-          <Card className='dashboardCard' style={{ marginTop: '24px' }}>
-            <div>
-              昨日提交总人数
-            </div>
-            <div className='amount'>
-              {cardData?.yestodayReportNum || 0}
-            </div>
-          </Card>
-        </Col>
-        <Col span={4}>
-          <Card className='dashboardCard'>
-            <div>
-              今日正常人数
-            </div>
-            <div className='amount' style={{ color: 'green' }}>
-              {cardData?.todayNormalNum || 0}
-            </div>
-          </Card>
-          <Card className='dashboardCard' style={{ marginTop: '24px' }} onClick={goDashboard}>
-            <div>
-              今日异常人数
-            </div>
-            <div className='amount' style={{ color: 'red' }}>
-              {(cardData?.todayReportNum || 0) - (cardData?.todayNormalNum || 0)}
-            </div>
-          </Card>
-        </Col>
-      </Row>
-      <Row>
-        <Col span={12}>
-          <Card style={{ marginTop: '16px', height: '736px' }} title='企业数据总览'>
-            {orgList != [] ?
-              <OrgScollList list={orgList} /> :
-              <div style={{ height: '624px', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-                <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-              </div>
-            }
-          </Card>
-        </Col>
+    <Space direction="vertical" size="large" style={{ width: '100%' }}>
+      <BannerStatis />
+
+      <Row gutter={24}>
+        <Col span={12}><OrgSummary /></Col>
         <Col span={12}>
-          <Card style={{ marginTop: '16px', height: '736px' }} title='今日数据提交记录'>
-            {resumeWorkList != [] ?
-              <ResumeWorkScollList list={resumeWorkList} /> :
-              <div style={{ height: '624px', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-                <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
-              </div>
-            }
-          </Card>
+          <ReportList />
         </Col>
       </Row>
-    </PageHeaderWrapper>
+    </Space>
   )
 }

src/pages/dashboard/style.less

@@ -1,7 +0,0 @@
-.dashboardPage{
-  .dashboardCard{
-    text-align: center;
-    font-size: 20px;
-    .amount{margin-top: 16px;}
-  }
-}

src/pages/resumework/abnormal/index.jsx

@@ -12,8 +12,8 @@ export default (props) => {
   const columns = [
     {
       title: '企业名称',
-      dataIndex: 'orgId',
-      key: 'orgId',
+      dataIndex: 'orgName',
+      key: 'orgName',
     },
     {
       title: '申请人',

src/utils/number.js

@@ -0,0 +1,7 @@
+
+
+export function random (min, max) {
+  const range = max - min;
+  const rand = Math.random()
+  return min + Math.floor(Math.round(rand * range))
+}