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

src/pages/dashboard/components/BannerStatis.jsx

@@ -2,7 +2,7 @@ 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 { getcomm } from '@/services/statis';
 import StatisCard from './StatisCard';
 import StatisGroup from './StatisGroup';
 

src/pages/dashboard/components/OrgSummary.jsx

@@ -1,7 +1,7 @@
 import { useEffect, useState, useCallback } from 'react';
 import Echart from '@/components/echart/echart'
 import { Card } from 'antd'
-import { getList } from '@/services/org'
+import { getAllOrgPersonNum } from '@/services/statis'
 
 const barOption = {
   color: ['#08507b'],
@@ -83,9 +83,9 @@ export default (props) => {
   const queryList = useCallback(() => {
     setLoading(true)
 
-    getList({ pageSize: 500, qType: 'statis' }).then((res) => {
+    getAllOrgPersonNum().then((res) => {
       setLoading(false)
-      setList((res.records || []).reverse())
+      setList((res || []).reverse())
     }).catch(err => {
       setLoading(false)
     })

src/pages/dashboard/components/ReportList.jsx

@@ -54,9 +54,12 @@ const Content = (props) => {
   )
 }
 
+const showNum = 8;
+
 export default (props) => {
   const [loading, setLoading] = useState(false)
   const [list, setList] = useState([])
+  const [disabled, setDisabled] = useState(false)
 
   const queryList = useCallback(() => {
     setLoading(true)
@@ -78,14 +81,18 @@ export default (props) => {
     queryList()
   }, [])
 
+  useEffect(() => {
+    setDisabled(!list || list.length <= showNum)
+  }, [list])
+
   return (
     <Card title="今日提交记录" loading={loading} bodyStyle={{ height: '600px' }}>
       <List style={{ height: '100%', overflow: 'hidden' }} itemLayout="horizontal">
         <Carousel
-          autoplay
-          infinite
+          autoplay={!disabled}
+          infinite={!disabled}
           rtl
-          slidesToShow={8}
+          slidesToShow={showNum}
           slidesToScroll={1}
           dot={false}
           dotPosition="right"

src/services/comm.js → src/services/statis.js

@@ -2,3 +2,6 @@ import request from '@/utils/request';
 
 // 获取首页卡片信息
 export const getcomm = (params) => request('/statis/comm', { params });
+
+// 获取企业信息汇总
+export const getAllOrgPersonNum = () => request('/statis/org/total');