.

config/routes.js

@@ -27,9 +27,8 @@ export default [
   },  
   {
     path: '/',
-    name: '工作台',//暂定
     access:'admin',
-    redirect: '/person',
+    redirect: '/dashboard',
     hideInMenu: true,
   },
   {

src/components/OrgSearch/index.jsx

@@ -1,63 +0,0 @@
-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)
-    }else{
-      getList({ pageSize: 999 }, showType).then(res => {
-        setList(res.records || [])
-      })
-    }
-  }
-
-  useEffect(() => {
-    if (value) {
-      getDetail(value).then((res) => {
-        setList([res])
-      })
-    }else{
-      getList({ pageSize: 999 }, showType).then(res => {
-        setList(res.records || [])
-      })
-    }
-  }, [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/components/QRCode/index.jsx

@@ -1,70 +0,0 @@
-import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useImperativeHandle } from 'react'
-import classNames from 'classnames'
-import QRCode from 'qrcode'
-import html2canvas from 'html2canvas'
-import styles from './style.less'
-
-export default forwardRef((props, ref) => {
-  const { className, width = 430, border, content, title, fileName, onError } = props
-
-  const rootRef = useRef()
-  const canvasRef = useRef()
-
-  const { style1, style2 } = useMemo(() => {
-    return {
-      style1: {
-        border: border ? '2px solid rgba(0,0,0)' : 'none',
-        borderRadius: border ? '8px' : 'none'
-      },
-      style2: {
-        width: `${width}px`,
-        height: `${width}px`,
-      }
-    }
-  }, [width, border])
-
-  const qrOption = useMemo(() => ({
-    margin: 0,
-    width: width,
-    errorCorrectionLevel: 'M'
-  }), [width])
-
-  useEffect(() => {
-    if (content) {
-      QRCode.toCanvas(canvasRef.current, content, qrOption, onError)
-    }
-  }, [content, qrOption, onError])
-
-  useImperativeHandle(ref, () => ({
-    download: () => {
-      return new Promise((resolve, reject) => {
-        html2canvas(rootRef.current).then((canvas) => {
-          const imageData = canvas.toDataURL('image/png', .8);
-          const link = document.createElement('a');
-          link.download = `${fileName || 'qrcode'}.png`
-          link.href = imageData
-          link.click()
-          resolve()
-        }).catch(reject)
-      })
-    },
-    getCanvas: () => {
-      return new Promise((resolve, reject) => {
-        html2canvas(rootRef.current).then((canvas) => {
-          resolve(canvas)
-        }).catch(reject)
-      })
-    }
-  }), [fileName])
-
-  return (
-    <div className={classNames(className, styles['qrcode-box'])} ref={rootRef}>
-      <div className={styles['qrcode-container']} style={style1}>
-        <canvas ref={canvasRef} style={style2}/>
-      </div>
-      {
-        title && <h3>{title}</h3>
-      }
-    </div>
-  )
-})

src/components/QRCode/style.less

@@ -1,18 +0,0 @@
-
-.qrcode-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-
-  .qrcode-container {
-    padding: 16px;
-    flex: none;
-  }
-
-  h3 {
-    font-size: 24px;
-    font-weight: bold;
-    line-height: 3em;
-  }
-}

src/components/echart/echart.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react'
 // 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
 import * as echarts from 'echarts/core';
 // 引入柱状图图表，图表后缀都为 Chart
-import { BarChart, LineChart } from 'echarts/charts';
+import { LineChart } from 'echarts/charts';
 // 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
 import {
   TitleComponent,
@@ -27,7 +27,6 @@ echarts.use([
   DatasetComponent,
   DataZoomComponent,
   TransformComponent,
-  BarChart,
   LineChart,//折线图
   LabelLayout,
   UniversalTransition,

src/pages/banner/edit.jsx

@@ -1,5 +1,5 @@
 import { history } from 'umi';
-import { Input, Card, Form, Button, message, InputNumber } from 'antd';
+import { Card, Form, Button, message, InputNumber } from 'antd';
 import { useEffect, useState } from 'react';
 import ProCard from '@ant-design/pro-card';
 import { UploadImage } from '@/components/Upload';

src/pages/cardList/index.jsx

@@ -33,8 +33,8 @@ export default (props) => {
       title: '有效期',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (t, record) => record.startDate + (record.expireDate!=null?'~' + record.expireDate:''),
-      search:false
+      render: (t, record) => record.startDate + (record.expireDate != null ? '~' + record.expireDate : ''),
+      search: false
     },
     {
       title: '操作',

src/pages/cardNoList/index.jsx

@@ -66,7 +66,7 @@ export default (props) => {
       <PageTable
         columns={columns}
         request={getCardNoList}
-        rowKey="bannerId"
+        rowKey="qrId"
         options={false}
         toolBarRender={actions}
         actionRef={actionRef}

src/pages/certificateIssuance/index.jsx

@@ -1,10 +1,10 @@
 import React, { useRef } from 'react'
 import moment from 'moment';
+import { history } from 'umi';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import { getMakeList } from '@/services/application'
-import { history } from 'umi';
 
 const { RangePicker } = DatePicker;
 

src/pages/certificateIssuance/issuance.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
+import { history } from 'umi';
 import { Card, Form, Button, message, Input, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getApplicationDetail, updateMake } from '@/services/application'
-import { history } from 'umi';
 
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };

src/pages/dashboard/components/BannerStatis.jsx

@@ -32,8 +32,8 @@ export default (props) => {
       <Col span={8}>
         <StatisGroup
           title="总数"
-          data1={{ title: '总注册数', value:cardData? cardData[0].value:0 }}
-          data2={{ title: '证牌发放数', value: cardData?cardData[1].value:0}}
+          data1={{ title: '总注册数', value: cardData ? cardData[0].value : 0 }}
+          data2={{ title: '证牌发放数', value: cardData ? cardData[1].value : 0 }}
           {...colorList[0]}
           icon={<AppstoreOutlined />}
         />
@@ -41,8 +41,8 @@ export default (props) => {
       <Col span={8}>
         <StatisGroup
           title="审核"
-          data1={{ title: '待审核数', value: cardData?cardData[2].value :0}}
-          data2={{ title: '审核驳回数', value:cardData? cardData[3].value :0}}
+          data1={{ title: '待审核数', value: cardData ? cardData[2].value : 0 }}
+          data2={{ title: '审核驳回数', value: cardData ? cardData[3].value : 0 }}
           {...colorList[1]}
           icon={<AuditOutlined />
           }
@@ -53,8 +53,8 @@ export default (props) => {
       <Col span={8}>
         <StatisGroup
           title="提交"
-          data1={{ title: '今日提交数', value: cardData?cardData[4].value :0}}
-          data2={{ title: '本月提交数', value: cardData?cardData[5].value :0}}
+          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,8 +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';
+import { getApplyDaily } from '@/services/statis'
 
 const lineOption = {
   tooltip: {

src/pages/dashboard/components/ReportList.jsx

@@ -1,11 +1,10 @@
 import moment from 'moment'
 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 style = useMemo(() => {
     return {
       width: '48px',
       height: '48px',
@@ -34,26 +33,26 @@ export default (props) => {
   useEffect(() => {
     setDisabled(!list || list.length <= showNum)
   }, [list])
-  useEffect(()=>{
+  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='补办'
+    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=>{
+    }).catch(err => {
       console.log(err);
       setLoading(false)
     })
-  },[])
+  }, [])
 
   return (
     <Card title="近期提交记录" loading={loading} bodyStyle={{ height: '616px' }}>
@@ -70,12 +69,12 @@ export default (props) => {
         >
           {
             list.map(item => (
-              <div key={item.formId} style={{ display: 'flex' }}>
+              <div key={item.applyId} style={{ display: 'flex' }}>
                 <List.Item>
                   <List.Item.Meta
                     avatar={<Avatar item={item} />}
                     title={item.petName}
-                    description={item.applyTypeName+`  申请人（`+item.personName+'）'}
+                    description={item.applyTypeName + `  申请人（` + item.personName + '）'}
                   />
                   <Content item={item} />
                 </List.Item>

src/pages/dashboard/components/StatisGroup.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { StatisticCard } from '@ant-design/pro-card';
 
 const { Divider } = StatisticCard;
@@ -15,7 +15,7 @@ const iconStyle = {
 }
 
 export default (props) => {
-  const { title, data1, data2, icon, onClick1, onClick2, backColor = '#fff', frontColor='#000' } = props
+  const { title, data1, data2, icon, onClick1, onClick2, backColor = '#fff', frontColor = '#000' } = props
 
   const headStyle = {
     background: backColor,

src/pages/dashboard/index.jsx

@@ -4,7 +4,7 @@ import ReportList from './components/ReportList';
 import OrgSummary from './components/OrgSummary';
 import BannerStatis from './components/BannerStatis';
 
-export default (props) => {  
+export default (props) => {
   return (
     <Space direction="vertical" size="large" style={{ width: '100%' }}>
       <BannerStatis />

src/pages/examine/detail.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Card, Form, Button, Image, Input, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getApplicationDetail, updateAudit,getPetCardNo } from '@/services/application'
+import { getApplicationDetail, updateAudit, getPetCardNo } from '@/services/application'
 import { history } from 'umi';
 
 const { TextArea } = Input;
@@ -17,28 +17,28 @@ export default (props) => {
   const [rejectReason, setRejectReason] = useState();
   const [loading, setLoading] = useState(false)
 
-  const getAudit=(val)=>{
+  const getAudit = (val) => {
     setLoading(true)
-      updateAudit(id, { rejectReason: rejectReason, verifyStatus: val }).then(() => {
-        message.success('操作成功');
-        goBack()
-        setLoading(false)
-      }).catch(err => {
-        console.log(err.message)
-        setLoading(false)
-      })
+    updateAudit(id, { rejectReason: rejectReason, verifyStatus: val }).then(() => {
+      message.success('操作成功');
+      goBack()
+      setLoading(false)
+    }).catch(err => {
+      console.log(err.message)
+      setLoading(false)
+    })
   }
   const handleAudit = (val) => {
     if ((val == 2 && rejectReason) || val == 1) {
-      if (val==1&&application.applyType == 'first') {
-        getPetCardNo(application.petId).then((res)=>{
-          if(!res){
+      if (val == 1 && application.applyType == 'first') {
+        getPetCardNo(application.petId).then((res) => {
+          if (!res) {
             getAudit(val);
-          }else{
+          } else {
             message.info('该宠物已有犬证，请驳回犬主申请');
           }
         })
-      }else{
+      } else {
         getAudit(val);
       }
     }
@@ -127,7 +127,7 @@ export default (props) => {
               <TextArea placeholder='请输入驳回原因' rows='3'
                 style={{ width: '350px' }}
                 value={rejectReason}
-                readOnly={application.verifyStatus==2}
+                readOnly={application.verifyStatus == 2}
                 onChange={(e) => setRejectReason(e.target.value)}
               />
             </FormItem>

src/pages/examine/index.jsx

@@ -1,10 +1,10 @@
 import React, { useRef } from 'react'
 import moment from 'moment';
+import { history } from 'umi';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import { getAuditList } from '@/services/application'
-import { history } from 'umi';
 
 
 const { RangePicker } = DatePicker;

src/pages/notice/edit.jsx

@@ -1,6 +1,6 @@
-import { Input, Card, Select, Button, Form, InputNumber, message } from 'antd';
 import { useEffect, useState, useRef } from 'react';
 import { history } from 'umi';
+import { Input, Card, Select, Button, Form, InputNumber, message } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import { addNotice, updateNotice, getNoticeDetail } from '@/services/notice'
 import RichEditor from "@/components/rich-editor";

src/pages/notice/index.jsx

@@ -1,10 +1,10 @@
 import React, { useRef } from 'react';
 import { history } from 'umi';
-import { Button, Popconfirm, message,  Modal } from 'antd';
+import moment from 'moment';
+import { Button, Popconfirm, message, Modal } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
-import moment from 'moment';
 import { getNoticeList, deleteNotice, updateNotice } from '@/services/notice';
 
 const formatterTime = (val) => {

src/pages/person/index.jsx

@@ -9,6 +9,9 @@ import {
   Select,
 } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import PageTable from '@/components/PageTable';
+import md5 from 'md5';
 import {
   getUserList,
   addUser,
@@ -16,10 +19,7 @@ import {
   updateUser,
   getUserDetail,
 } from '@/services/user';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import PageTable from '@/components/PageTable';
 import './index.less';
-import md5 from 'md5';
 
 const FormItem = Form.Item;
 const { Option } = Select;

src/pages/userList/index.jsx

@@ -1,7 +1,6 @@
 import React, { useRef } from 'react'
-import { useModel } from 'umi';
 import moment from 'moment';
-import { DatePicker, Button } from 'antd';
+import { DatePicker } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import { getPersonList } from '@/services/person'
@@ -15,7 +14,7 @@ const formatterTime = (val) => {
 export default (props) => {
 
   const actionRef = useRef();
-  const columns = [    
+  const columns = [
     {
       title: '姓名',
       dataIndex: 'nickName',

src/services/org.js

@@ -1,20 +0,0 @@
-import request from '@/utils/request';
-
-// 获取列表
-export const getList = (params, showType) => request('/org', { params, showType });
-
-// 获取详情
-export const getDetail = (id) => request(`/org/${id}`);
-
-// 新增保存
-export const saveOrg = (data) => request('/org', { data, method: 'post' });
-
-// 更新信息
-export const updateOrg = (id, data) => request(`/org/${id}`, { data, method: 'put' });
-
-
-// 新增管理员
-export const saveOrgUser = (id,data) => request(`/org/${id}/user`, { data, method: 'post' });
-
-// 获取企业管理员详情
-export const getOrgAdminDetail = (id) => request(`/org/${id}/admin`);

src/services/statis.js

@@ -5,11 +5,3 @@ export const getcomm = () => request('/statis/common');
 
 // 获取近期提交
 export const getApplyDaily = (params) => request('/statis/applyDaily', { params });
-
-// org工作台--企业数据总览
-export const getAllOrgLine = (params) => request('/statis/org/daily', { params, method: 'GET' });
-
-
-// org工作台--企业工作台数据
-export const getOrgComm = (params) => request('/statis/org/comm', { params });
-

src/services/withdrawal.js

@@ -1,19 +0,0 @@
-import request from '@/utils/request';
-
-/**
- * 审批
- * @param {*} data
- * @returns
- */
-export const updateWithdrawal = (id, data) => request(`/withdrawal/${id}`, { method: 'put', data });
-
-/**
- * 查询提现列表
- * @param {*} params
- * @returns
- */
-export const getWithdrawalList = (params) => request('/withdrawal', { params });
-/**
- * 查询提现详情
- */
-export const getWithdrawalDetail = (id) => request(`/withdrawal/${id}`);

src/services/work.js

@@ -1,32 +0,0 @@
-import request from '@/utils/request';
-import moment from 'moment';
-import { getIsAllParams } from '@/utils';
-
-// 获取列表
-export const getList = (params) => request('/resume-work-form', { params });
-
-// 导出
-export const exportList = (params) => request('/resume-work-form/export', { params });
-
-// 获取异常列表
-export const getAbnormalList = (params) =>{
-  return request(
-    `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
-      Date.now(),
-    ).format('YYYY-MM-DD')}&isAbnormal=true`,
-    {params:getIsAllParams(params)},
-  );
-    }
-// 获取删除列表
-export const getDeleteformList = (params) =>{
-  return request(`/resume-work-form?isDelete=true`, {
-    params:getIsAllParams(params),
-  });
-}
-
-/**
- * 删除提交记录
- * @param {*} data
- * @returns
- */
-export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });

src/utils/color.js

@@ -1,18 +0,0 @@
-export function hex2Rgb(hex) {
-  let color = hex.toLowerCase();
-
-  // 如果只有三位的值，需变成六位，如：#fff => #ffffff
-  if (color.length === 4) {
-    let colorNew = '#';
-    for (var i = 1; i < 4; i += 1) {
-      colorNew += color.slice(i, i + 1).concat(color.slice(i, i + 1));
-    }
-    color = colorNew;
-  }
-  // 处理六位的颜色值，转为RGB
-  const colors = [];
-  for (var i = 1; i < 7; i += 2) {
-    colors.push(parseInt('0x' + color.slice(i, i + 2)));
-  }
-  return colors;
-}

src/utils/hooks/useOrgList.js

@@ -1,15 +0,0 @@
-import { useState, useEffect } from "react";
-import { getList } from '@/services/org'
-
-export default function useOrgList() {
-  const showType = 0; // 不显示报错
-  const [orgList, setOrgList] = useState([])
-
-  useEffect(() => {
-    getList({ pageSize: 999 }, showType).then(res => {
-      setOrgList(res.records || [])
-    })
-  }, [])
-
-  return { orgList }
-}

src/utils/hooks/useResize.js

@@ -1,17 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-export default (fn) => {
-  const fnRef = useRef();
-  fnRef.current = fn;
-
-  useEffect(() => {
-    const resize = () => {
-      const { clientWidth, clientHeight } = document.documentElement;
-      fnRef.current(clientWidth, clientHeight);
-    };
-
-    window.addEventListener('resize', resize);
-
-    return () => window.removeEventListener('resize', resize);
-  }, []);
-};

src/utils/index.js

@@ -1,9 +0,0 @@
-
-export const getIsAllParams=(params)=>{
-  if (!params.myOrgId) {
-    params.isAll=true
-  } else {
-    params.orgId=params.myOrgId
-  }
-  return params
-}

src/utils/number.js

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