.

config/proxy.js

@@ -11,11 +11,11 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.147:9000',
+      target: 'http://192.168.89.147:9001',
       changeOrigin: true,
       headers: {
-        origin: 'http://192.168.89.147:9000',
-        referer: 'http://192.168.89.147:9000',
+        origin: 'http://192.168.89.147:9001',
+        referer: 'http://192.168.89.147:9001',
       },
 
       // target: 'http://resumework-service.njyunzhi.com',

config/routes.js

@@ -18,6 +18,12 @@ export default [
       },
     ],
   },
+  {
+    path: '/dashboard',
+    name: '工作台',
+    icon: 'DashboardOutlined',
+    component: './dashboard',
+  },
   {
     path: '/',
     name: '工作台',

src/components/OrgSearch/index.jsx

@@ -0,0 +1,55 @@
+import { useEffect, useState } from 'react';
+import { Select } from 'antd'
+import { getDetail } from '@/services/org'
+import { getList } from '@/services/org'
+
+const Option = Select.Option;
+export default (props) => {
+  const { value, onChange, ...otherProps } = props;
+
+  const showType = 0; // 不显示报错
+
+  const [list, setList] = useState([])
+
+  const searchData = (val) => { 
+    getList({ pageSize: 999,orgName:val }, showType).then(res => {
+      setList(res.records || [])
+    })    
+  }
+
+  const handleSearch = (text) => {
+    if (text) {
+      searchData(text)
+    }
+  }
+
+  useEffect(() => {
+    if (value) {
+      getDetail(value).then((res) => {
+        setList([res])
+      })
+    }
+  }, [value])
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      defaultActiveFirstOption={false}
+      showArrow={false}
+      filterOption={false}
+      onSearch={handleSearch}
+      onChange={onChange}
+      notFoundContent={null}
+      {...otherProps}
+    >
+      {
+        list.map((item) => {
+          return (
+            <Option key={item.orgId} value={item.orgId}>{item.orgName}</Option>
+          )
+        })
+      }
+    </Select>
+  )
+}

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

@@ -0,0 +1,131 @@
+import { Card, 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

@@ -0,0 +1,26 @@
+.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/ResumeWorkScollList/index.jsx

@@ -0,0 +1,131 @@
+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

@@ -0,0 +1,26 @@
+.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/index.jsx

@@ -0,0 +1,136 @@
+import { useEffect, useState } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import moment from 'moment';
+import { Card, Row, Col, Empty } from 'antd'
+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'
+
+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>
+  )
+
+  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)
+      })
+  }, [])
+  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' }}>
+            <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>
+        <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>
+        </Col>
+      </Row>
+    </PageHeaderWrapper>
+  )
+}

src/pages/dashboard/style.less

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

src/pages/org/org/Edit.jsx

@@ -15,6 +15,7 @@ export default (props) => {
   useEffect(() => {
     if (id) {
       getDetail(id).then(res => {
+
         setFormData(res);
         form.setFieldsValue(res);
       })
@@ -65,6 +66,13 @@ export default (props) => {
             >
               <Input />
             </Form.Item>
+            <Form.Item
+              label="权重"
+              name="weight"
+              rules={[{ required: true, message: '请填写企业名称!' }]}
+            >
+              <Input type='number' min='0' />
+            </Form.Item>
             <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
               <Button type="primary" htmlType="submit" loading={loading}>
                 保存

src/pages/resumework/form/index.jsx

@@ -6,6 +6,7 @@ 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;
@@ -18,7 +19,7 @@ const formatterTime = (val) => {
 export default (props) => {
   const initDate = useRef(moment())
   const actionRef = useRef();
-  const { orgList } = useOrgList()
+  // const { orgList } = useOrgList()
 
   const handleBeforSearch = (params) => {
     const { createDate, ...others } = params;
@@ -42,15 +43,16 @@ export default (props) => {
       dataIndex: 'orgId',
       key: 'orgId',
       search: true,
-      render: t => orgList.filter(x => x.orgId === t)[0]?.orgName,
+      // render: t => orgList.filter(x => x.orgId === t)[0]?.orgName,
       renderFormItem: () => (
-        <Select>
-          {orgList.map((item) => (
-            <Option value={item.orgId} key={item.orgId}>
-              {item.orgName}
-            </Option>
-          ))}
-        </Select>
+        // <Select>
+        //   {orgList.map((item) => (
+        //     <Option value={item.orgId} key={item.orgId}>
+        //       {item.orgName}
+        //     </Option>
+        //   ))}
+        // </Select>
+        <OrgSearch />
       ),
       formItemProps: {
         rules: [

src/services/comm.js

@@ -0,0 +1,4 @@
+import request from '@/utils/request';
+
+// 获取首页卡片信息
+export const getcomm = (params) => request('/statis/comm', { params });