Merge branch 'master' of http://git.ycjcjy.com/medical-plat/pc-admin into master

config/routes.js

@@ -37,26 +37,6 @@ export default [
                 icon: 'smile',
                 component: './Welcome',
               },
-              {
-                path: '/admin',
-                name: 'admin',
-                icon: 'crown',
-                component: './Admin',
-                routes: [
-                  {
-                    path: '/admin/sub-page',
-                    name: 'sub-page',
-                    icon: 'smile',
-                    component: './Welcome',
-                  },
-                ],
-              },
-              {
-                name: 'list.table-list',
-                icon: 'table',
-                path: '/list',
-                component: './TableList',
-              },
               {
                 path: '/cms',
                 name: 'CMS管理',
@@ -112,6 +92,12 @@ export default [
                     component: './Post/Edit',
                     hideInMenu: true,
                   },
+                  {
+                    path: '/post/post-type',
+                    name: '分类管理',
+                    menuCode: 'post.post-type',
+                    component: './Post/Type',
+                  },
                 ],
               },
               {

src/components/ChangePassword/index.jsx

@@ -0,0 +1,54 @@
+import React, { useState } from 'react';
+import {
+  ModalForm,
+  ProFormText,
+} from '@ant-design/pro-form';
+import md5 from 'md5';
+import { notification } from 'antd';
+import request from '@/utils/request';
+
+export default (props) => {
+  const checkSame = ({ getFieldValue }) => ({
+    validator(_, value) {
+      if (!value || getFieldValue('nw1') === value) {
+        return Promise.resolve();
+      }
+
+      return Promise.reject(new Error('两次密码输入不一致!'));
+    }
+  })
+
+  const handleSubmit = (values) => {
+    const data = {
+      originPassword: md5(values.originPassword),
+      newPassword: md5(values.nw1),
+    }
+
+    return request('/change-password', { data, method: 'put' }).then(() => {
+      props.onFinish()
+      return true
+    }).catch((e) => {
+      notification.error({ message: e.message })
+    })
+  }
+
+  return (
+    <ModalForm width={480} visible={props.visible} onFinish={handleSubmit} onVisibleChange={props.onVisibleChange}>
+      <ProFormText.Password
+        label="原始密码"
+        name="originPassword"
+        rules={[{ required: true, message: '原始密码不能为空' }]}
+      />
+      <ProFormText.Password
+        label="新密码"
+        name="nw1"
+        rules={[{ required: true, message: '新密码不能为空' }]}
+      />
+      <ProFormText.Password
+        label="新密码"
+        name="nw2"
+        rules={[{ required: true, message: '新密码不能为空' }, checkSame ]}
+      />
+    </ModalForm>
+  )
+}

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -1,12 +1,17 @@
-import { LogoutOutlined } from '@ant-design/icons';
-import { Avatar, Menu, Spin } from 'antd';
 import React from 'react';
+import { Avatar, Menu, Spin } from 'antd';
+import { LogoutOutlined, FormOutlined } from '@ant-design/icons';
 import { history, connect } from 'umi';
 import { defaultAvatar } from '@/utils/utils';
+import ChangePassword from '@/components/ChangePassword'
 import HeaderDropdown from '../HeaderDropdown';
 import styles from './index.less';
 
 class AvatarDropdown extends React.Component {
+  state = {
+    showPassword: false,
+  }
+
   onMenuClick = (event) => {
     const { key } = event;
 
@@ -22,7 +27,9 @@ class AvatarDropdown extends React.Component {
       return;
     }
 
-    history.push(`/account/${key}`);
+    if (key === 'password') {
+      this.setState({ showPassword: true })
+    }
   };
 
   render() {
@@ -32,12 +39,22 @@ class AvatarDropdown extends React.Component {
         userName: '',
       },
     } = this.props;
+
     const menuHeaderDropdown = (
       <Menu className={styles.menu} selectedKeys={[]} onClick={this.onMenuClick}>
+        <Menu.Item key="password">
+          <FormOutlined />
+          修改密码
+        </Menu.Item>
         <Menu.Item key="logout">
           <LogoutOutlined />
           退出登录
         </Menu.Item>
+        <ChangePassword
+          visible={this.state.showPassword}
+          onVisibleChange={(v) => this.setState({ showPassword: v })}
+          onFinish={() => this.setState({ showPassword: false })}
+        />
       </Menu>
     );
     return currentUser && currentUser.userName ? (

src/components/School/index.jsx

@@ -7,6 +7,8 @@ export default (props) => {
   const [list, setList] = useState([])
   const [value, setValue] = useState()
 
+  const { autoDefault, ...selectProps } = props
+
   const filterFunc = (input, option) => {
     return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
   }
@@ -31,7 +33,7 @@ export default (props) => {
       setList(records)
       setLoading(false)
 
-      if (props.autoDefault !== false && records.length > 0) {
+      if (autoDefault !== false && records.length > 0) {
         setValue(records[0].schoolId)
         props.onChange(records[0].schoolId, records[0])
       }
@@ -51,7 +53,7 @@ export default (props) => {
         showSearch
         optionFilterProp="children"
         filterOption={filterFunc}
-        {...props}
+        {...selectProps}
         value={value}
         onChange={handleChange}
       >

src/pages/Admin.jsx

@@ -1,55 +0,0 @@
-import React from 'react';
-import { HeartTwoTone, SmileTwoTone } from '@ant-design/icons';
-import { Card, Typography, Alert } from 'antd';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-// import { useIntl } from 'umi';
-
-export default () => {
-  // const intl = useIntl();
-  return (
-    <PageHeaderWrapper
-      content="这个页面只有 admin 权限才能查看"
-      // content={intl.formatMessage({
-      //   id: 'pages.admin.subPage.title',
-      //   defaultMessage: ' 这个页面只有 admin 权限才能查看',
-      // })}
-    >
-      <Card>
-        <Alert
-          // message={intl.formatMessage({
-          //   id: 'pages.welcome.alertMessage',
-          //   defaultMessage: '更快更强的重型组件，已经发布。',
-          // })}
-          message="更快更强的重型组件，已经发布。"
-          type="success"
-          showIcon
-          banner
-          style={{
-            margin: -12,
-            marginBottom: 48,
-          }}
-        />
-        <Typography.Title
-          level={2}
-          style={{
-            textAlign: 'center',
-          }}
-        >
-          <SmileTwoTone /> Ant Design Pro <HeartTwoTone twoToneColor="#eb2f96" /> You
-        </Typography.Title>
-      </Card>
-      <p
-        style={{
-          textAlign: 'center',
-          marginTop: 24,
-        }}
-      >
-        Want to add more pages? Please refer to{' '}
-        <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
-          use block
-        </a>
-        。
-      </p>
-    </PageHeaderWrapper>
-  );
-};

src/pages/Post/Type/index.jsx

@@ -0,0 +1,140 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { connect } from 'umi';
+import { PageContainer } from '@ant-design/pro-layout';
+import ProTable from '@ant-design/pro-table';
+import { PlusOutlined } from '@ant-design/icons';
+import { Button, notification } from 'antd';
+import {
+  ModalForm,
+  ProFormText,
+} from '@ant-design/pro-form';
+import request, { queryTable } from '@/utils/request';
+
+const PostTypeList = (props) => {
+  const tableRef = useRef()
+  const form = useRef();
+  const [current, setCurrent] = useState({})
+  const [visible, setVisible] = useState(false)
+
+  const handleEdit = (postType) => {
+    const data = postType || {}
+    setCurrent(data)
+    setVisible(true)
+    if (form.current) {
+      form.current.setFieldsValue(data)
+    }
+  }
+
+  const emitPublishOrNot = (postType) => {
+    // 1 变成 0, 0 变成 1
+    const status = Math.abs(postType.status - 1)
+    request(`/post-type/${postType.typeId}`, { method: 'put', data: { ...postType, status } }).then(() => {
+      notification.success({ message: '操作成功' })
+      tableRef.current.reload()
+    }).catch((e) => {
+      notification.warn({ message: e.message })
+    })
+  }
+
+  const handleSubmit = (postType) => {
+    const method = current.typeId ? 'put' : 'post'
+    const api = current.typeId ? `/post-type/${current.typeId}` : '/post-type'
+    const data = { ...current, ...postType }
+    return request(api, { method, data }).then(() => {
+      notification.success({ message: '操作成功' })
+      tableRef.current.reload()
+      setVisible(false)
+    }).catch((e) => {
+      notification.warn({ message: e.message })
+    })
+  }
+
+  const actions = [
+    <Button key="button" icon={<PlusOutlined />} type="primary" onClick={handleEdit}>
+      新建
+    </Button>,
+  ];
+
+  const columns = [
+    {
+      title: '标题',
+      key: 'name',
+      dataIndex: 'name',
+    },
+    {
+      title: '状态',
+      key: 'status',
+      dataIndex: 'status',
+      width: 240,
+      valueType: 'select',
+      valueEnum: {
+        0: {
+          text: '下架',
+          status: 'Processing',
+        },
+        1: {
+          text: '上架',
+          status: 'Success',
+        },
+      },
+    },
+    {
+      title: '创建时间',
+      key: 'createDate',
+      dataIndex: 'createDate',
+      valueType: 'date',
+      width: 240,
+      hideInSearch: true,
+    },
+    {
+      title: '操作',
+      key: 'option',
+      valueType: 'option',
+      width: 160,
+      render: (_, item) => [
+        <a key="edit" onClick={() => handleEdit(item)}>
+          编辑
+        </a>,
+        <a key="up" onClick={() => emitPublishOrNot(item)}>
+          {item.status === 1 ? '下架' : '上架'}
+        </a>,
+      ],
+    },
+  ];
+
+  useEffect(() => {
+    if (!props.typeList || !props.typeList.length) {
+      props.dispatch({
+        type: 'post/getTypeList',
+        payload: { pageSize: 999 },
+      });
+    }
+  }, [props]);
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={tableRef}
+        columns={columns}
+        request={queryTable('/post-type')}
+        rowKey="typeId"
+        headerTitle="科普列表"
+        search={{
+          labelWidth: '4em',
+        }}
+        toolBarRender={() => actions}
+      />
+      <ModalForm formRef={form} width={600} visible={visible} onVisibleChange={setVisible} onFinish={handleSubmit}>
+        <ProFormText
+          label="名称"
+          name="name"
+          rules={[{ required: true, message: '请填写名称' }]}
+        />
+      </ModalForm>
+    </PageContainer>
+  );
+};
+
+export default connect((s) => ({
+  typeList: s.post.typeList,
+}))(PostTypeList);

src/pages/Statistic/StudentData.jsx

@@ -4,7 +4,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import request, { queryTable } from '@/utils/request';
 
-const StudentData = (props) => {
+const StudentData = () => {
   const tableRef = useRef()
   const [schoolDict, setSchoolDict] = useState({})
 

src/pages/TableList/components/UpdateForm.jsx

@@ -1,211 +0,0 @@
-import React from 'react';
-import { Modal } from 'antd';
-import {
-  ProFormSelect,
-  ProFormText,
-  ProFormTextArea,
-  StepsForm,
-  ProFormRadio,
-  ProFormDateTimePicker,
-} from '@ant-design/pro-form';
-// import { useIntl, FormattedMessage } from 'umi';
-
-const UpdateForm = (props) => {
-  // const intl = useIntl();
-  return (
-    <StepsForm
-      stepsProps={{
-        size: 'small',
-      }}
-      stepsFormRender={(dom, submitter) => {
-        return (
-          <Modal
-            width={640}
-            bodyStyle={{
-              padding: '32px 40px 48px',
-            }}
-            destroyOnClose
-            // title={intl.formatMessage({
-            //   id: 'pages.searchTable.updateForm.ruleConfig',
-            //   defaultMessage: '规则配置',
-            // })}
-            title="规则配置"
-            visible={props.updateModalVisible}
-            footer={submitter}
-            onCancel={() => {
-              props.onCancel();
-            }}
-          >
-            {dom}
-          </Modal>
-        );
-      }}
-      onFinish={props.onSubmit}
-    >
-      <StepsForm.StepForm
-        initialValues={{
-          name: props.values.name,
-          desc: props.values.desc,
-        }}
-        // title={intl.formatMessage({
-        //   id: 'pages.searchTable.updateForm.basicConfig',
-        //   defaultMessage: '基本信息',
-        // })}
-        title="基本信息"
-      >
-        <ProFormText
-          name="name"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.ruleName.nameLabel',
-          //   defaultMessage: '规则名称',
-          // })}
-          label="规则名称"
-          width="md"
-          rules={[
-            {
-              required: true,
-              message: '请输入规则名称！',
-              // message: (
-              //   <FormattedMessage
-              //     id="pages.searchTable.updateForm.ruleName.nameRules"
-              //     defaultMessage="请输入规则名称！"
-              //   />
-              // ),
-            },
-          ]}
-        />
-        <ProFormTextArea
-          name="desc"
-          width="md"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.ruleDesc.descLabel',
-          //   defaultMessage: '规则描述',
-          // })}
-          label="规则描述"
-          // placeholder={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.ruleDesc.descPlaceholder',
-          //   defaultMessage: '请输入至少五个字符',
-          // })}
-          placeholder="请输入至少五个字符"
-          rules={[
-            {
-              required: true,
-              message: '请输入至少五个字符的规则描述！',
-              // message: (
-              //   <FormattedMessage
-              //     id="pages.searchTable.updateForm.ruleDesc.descRules"
-              //     defaultMessage="请输入至少五个字符的规则描述！"
-              //   />
-              // ),
-              min: 5,
-            },
-          ]}
-        />
-      </StepsForm.StepForm>
-      <StepsForm.StepForm
-        initialValues={{
-          target: '0',
-          template: '0',
-        }}
-        // title={intl.formatMessage({
-        //   id: 'pages.searchTable.updateForm.ruleProps.title',
-        //   defaultMessage: '配置规则属性',
-        // })}
-        title="配置规则属性"
-      >
-        <ProFormSelect
-          name="target"
-          width="md"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.object',
-          //   defaultMessage: '监控对象',
-          // })}
-          label="监控对象"
-          valueEnum={{
-            0: '表一',
-            1: '表二',
-          }}
-        />
-        <ProFormSelect
-          name="template"
-          width="md"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.ruleProps.templateLabel',
-          //   defaultMessage: '规则模板',
-          // })}
-          label="规则模板"
-          valueEnum={{
-            0: '规则模板一',
-            1: '规则模板二',
-          }}
-        />
-        <ProFormRadio.Group
-          name="type"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.ruleProps.typeLabel',
-          //   defaultMessage: '规则类型',
-          // })}
-          label="规则类型"
-          options={[
-            {
-              value: '0',
-              label: '强',
-            },
-            {
-              value: '1',
-              label: '弱',
-            },
-          ]}
-        />
-      </StepsForm.StepForm>
-      <StepsForm.StepForm
-        initialValues={{
-          type: '1',
-          frequency: 'month',
-        }}
-        // title={intl.formatMessage({
-        //   id: 'pages.searchTable.updateForm.schedulingPeriod.title',
-        //   defaultMessage: '设定调度周期',
-        // })}
-        title="设定调度周期"
-      >
-        <ProFormDateTimePicker
-          name="time"
-          width="md"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.schedulingPeriod.timeLabel',
-          //   defaultMessage: '开始时间',
-          // })}
-          label="开始时间"
-          rules={[
-            {
-              required: true,
-              message: '请选择开始时间！',
-              // message: (
-              //   <FormattedMessage
-              //     id="pages.searchTable.updateForm.schedulingPeriod.timeRules"
-              //     defaultMessage="请选择开始时间！"
-              //   />
-              // ),
-            },
-          ]}
-        />
-        <ProFormSelect
-          name="frequency"
-          // label={intl.formatMessage({
-          //   id: 'pages.searchTable.updateForm.object',
-          //   defaultMessage: '监控对象',
-          // })}
-          label="监控对象"
-          width="md"
-          valueEnum={{
-            month: '月',
-            week: '周',
-          }}
-        />
-      </StepsForm.StepForm>
-    </StepsForm>
-  );
-};
-
-export default UpdateForm;

src/pages/TableList/index.jsx

@@ -1,388 +0,0 @@
-import { PlusOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer } from 'antd';
-import React, { useState, useRef } from 'react';
-// import { useIntl, FormattedMessage } from 'umi';
-import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
-import ProTable from '@ant-design/pro-table';
-import { ModalForm, ProFormText, ProFormTextArea } from '@ant-design/pro-form';
-import ProDescriptions from '@ant-design/pro-descriptions';
-import UpdateForm from './components/UpdateForm';
-import { queryRule, updateRule, addRule, removeRule } from './service';
-/**
- * 添加节点
- *
- * @param fields
- */
-
-const handleAdd = async (fields) => {
-  const hide = message.loading('正在添加');
-
-  try {
-    await addRule({ ...fields });
-    hide();
-    message.success('添加成功');
-    return true;
-  } catch (error) {
-    hide();
-    message.error('添加失败请重试！');
-    return false;
-  }
-};
-/**
- * 更新节点
- *
- * @param fields
- */
-
-const handleUpdate = async (fields) => {
-  const hide = message.loading('正在配置');
-
-  try {
-    await updateRule({
-      name: fields.name,
-      desc: fields.desc,
-      key: fields.key,
-    });
-    hide();
-    message.success('配置成功');
-    return true;
-  } catch (error) {
-    hide();
-    message.error('配置失败请重试！');
-    return false;
-  }
-};
-/**
- * 删除节点
- *
- * @param selectedRows
- */
-
-const handleRemove = async (selectedRows) => {
-  const hide = message.loading('正在删除');
-  if (!selectedRows) return true;
-
-  try {
-    await removeRule({
-      key: selectedRows.map((row) => row.key),
-    });
-    hide();
-    message.success('删除成功，即将刷新');
-    return true;
-  } catch (error) {
-    hide();
-    message.error('删除失败，请重试');
-    return false;
-  }
-};
-
-const TableList = () => {
-  /** 新建窗口的弹窗 */
-  const [createModalVisible, handleModalVisible] = useState(false);
-  /** 分布更新窗口的弹窗 */
-
-  const [updateModalVisible, handleUpdateModalVisible] = useState(false);
-  const [showDetail, setShowDetail] = useState(false);
-  const actionRef = useRef();
-  const [currentRow, setCurrentRow] = useState();
-  const [selectedRowsState, setSelectedRows] = useState([]);
-  /** 国际化配置 */
-
-  // const intl = useIntl();
-  const columns = [
-    {
-      // title: (
-      //   <FormattedMessage
-      //     id="pages.searchTable.updateForm.ruleName.nameLabel"
-      //     defaultMessage="规则名称"
-      //   />
-      // ),
-      title: '规则名称',
-      dataIndex: 'name',
-      tip: '规则名称是唯一的 key',
-      render: (dom, entity) => {
-        return (
-          <a
-            onClick={() => {
-              setCurrentRow(entity);
-              setShowDetail(true);
-            }}
-          >
-            {dom}
-          </a>
-        );
-      },
-    },
-    {
-      // title: <FormattedMessage id="pages.searchTable.titleDesc" defaultMessage="描述" />,
-      title: '描述',
-      dataIndex: 'desc',
-      valueType: 'textarea',
-    },
-    {
-      // title: <FormattedMessage id="pages.searchTable.titleCallNo" defaultMessage="服务调用次数" />,
-      title: '服务调用次数',
-      dataIndex: 'callNo',
-      sorter: true,
-      hideInForm: true,
-      // renderText: (val) =>
-      //   `${val}${intl.formatMessage({
-      //     id: 'pages.searchTable.tenThousand',
-      //     defaultMessage: ' 万 ',
-      //   })}`,
-      renderText: (val) => `${val} 万`,
-    },
-    {
-      // title: <FormattedMessage id="pages.searchTable.titleStatus" defaultMessage="状态" />,
-      title: '状态',
-      dataIndex: 'status',
-      hideInForm: true,
-      valueEnum: {
-        0: {
-          // text: (
-          //   <FormattedMessage id="pages.searchTable.nameStatus.default" defaultMessage="关闭" />
-          // ),
-          title: '关闭',
-          status: 'Default',
-        },
-        1: {
-          // text: (
-          //   <FormattedMessage id="pages.searchTable.nameStatus.running" defaultMessage="运行中" />
-          // ),
-          title: '运行中',
-          status: 'Processing',
-        },
-        2: {
-          // text: (
-          //   <FormattedMessage id="pages.searchTable.nameStatus.online" defaultMessage="已上线" />
-          // ),
-          title: '已上线',
-          status: 'Success',
-        },
-        3: {
-          // text: (
-          //   <FormattedMessage id="pages.searchTable.nameStatus.abnormal" defaultMessage="异常" />
-          // ),
-          title: '异常',
-          status: 'Error',
-        },
-      },
-    },
-    {
-      // title: (
-      //   <FormattedMessage id="pages.searchTable.titleUpdatedAt" defaultMessage="上次调度时间" />
-      // ),
-      title: '上次调度时间',
-      sorter: true,
-      dataIndex: 'updatedAt',
-      valueType: 'dateTime',
-      renderFormItem: (item, { defaultRender, ...rest }, form) => {
-        const status = form.getFieldValue('status');
-
-        if (`${status}` === '0') {
-          return false;
-        }
-
-        if (`${status}` === '3') {
-          return (
-            <Input
-              {...rest}
-              // placeholder={intl.formatMessage({
-              //   id: 'pages.searchTable.exception',
-              //   defaultMessage: '请输入异常原因！',
-              // })}
-              placeholder="请输入异常原因！"
-            />
-          );
-        }
-
-        return defaultRender(item);
-      },
-    },
-    {
-      // title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="操作" />,
-      title: '操作',
-      dataIndex: 'option',
-      valueType: 'option',
-      render: (_, record) => [
-        <a
-          key="config"
-          onClick={() => {
-            handleUpdateModalVisible(true);
-            setCurrentRow(record);
-          }}
-        >
-          {/* <FormattedMessage id="pages.searchTable.config" defaultMessage="配置" /> */}
-          配置
-        </a>,
-        <a key="subscribeAlert" href="https://procomponents.ant.design/">
-          {/* <FormattedMessage id="pages.searchTable.subscribeAlert" defaultMessage="订阅警报" /> */}
-          订阅警报
-        </a>,
-      ],
-    },
-  ];
-  return (
-    <PageContainer>
-      <ProTable
-        // headerTitle={intl.formatMessage({
-        //   id: 'pages.searchTable.title',
-        //   defaultMessage: '查询表格',
-        // })}
-        headerTitle="查询表格"
-        actionRef={actionRef}
-        rowKey="key"
-        search={{
-          labelWidth: 120,
-        }}
-        toolBarRender={() => [
-          <Button
-            type="primary"
-            key="primary"
-            onClick={() => {
-              handleModalVisible(true);
-            }}
-          >
-            <PlusOutlined /> 新建
-            {/* <FormattedMessage id="pages.searchTable.new" defaultMessage="新建" /> */}
-          </Button>,
-        ]}
-        request={(params, sorter, filter) => queryRule({ ...params, sorter, filter })}
-        columns={columns}
-        rowSelection={{
-          onChange: (_, selectedRows) => {
-            setSelectedRows(selectedRows);
-          },
-        }}
-      />
-      {selectedRowsState?.length > 0 && (
-        <FooterToolbar
-          extra={
-            <div>
-              {/* <FormattedMessage id="pages.searchTable.chosen" defaultMessage="已选择" /> */}
-              已选择{' '}
-              <a
-                style={{
-                  fontWeight: 600,
-                }}
-              >
-                {selectedRowsState.length}
-              </a>{' '}
-              项{/* <FormattedMessage id="pages.searchTable.item" defaultMessage="项" /> */}
-              &nbsp;&nbsp;
-              <span>
-                {/* <FormattedMessage
-                  id="pages.searchTable.totalServiceCalls"
-                  defaultMessage="服务调用次数总计"
-                /> */}
-                服务调用次数总计 {selectedRowsState.reduce((pre, item) => pre + item.callNo, 0)}{' '}
-                {/* <FormattedMessage id="pages.searchTable.tenThousand" defaultMessage="万" /> */}
-                万
-              </span>
-            </div>
-          }
-        >
-          <Button
-            onClick={async () => {
-              await handleRemove(selectedRowsState);
-              setSelectedRows([]);
-              actionRef.current?.reloadAndRest?.();
-            }}
-          >
-            {/* <FormattedMessage id="pages.searchTable.batchDeletion" defaultMessage="批量删除" /> */}
-            批量删除
-          </Button>
-          <Button type="primary">
-            {/* <FormattedMessage id="pages.searchTable.batchApproval" defaultMessage="批量审批" /> */}
-            批量审批
-          </Button>
-        </FooterToolbar>
-      )}
-      <ModalForm
-        // title={intl.formatMessage({
-        //   id: 'pages.searchTable.createForm.newRule',
-        //   defaultMessage: '新建规则',
-        // })}
-        title="新建规则"
-        width="400px"
-        visible={createModalVisible}
-        onVisibleChange={handleModalVisible}
-        onFinish={async (value) => {
-          const success = await handleAdd(value);
-
-          if (success) {
-            handleModalVisible(false);
-
-            if (actionRef.current) {
-              actionRef.current.reload();
-            }
-          }
-        }}
-      >
-        <ProFormText
-          rules={[
-            {
-              required: true,
-              message: '规则名称为必填项',
-              // message: (
-              //   <FormattedMessage
-              //     id="pages.searchTable.ruleName"
-              //     defaultMessage="规则名称为必填项"
-              //   />
-              // ),
-            },
-          ]}
-          width="md"
-          name="name"
-        />
-        <ProFormTextArea width="md" name="desc" />
-      </ModalForm>
-      <UpdateForm
-        onSubmit={async (value) => {
-          const success = await handleUpdate(value);
-
-          if (success) {
-            handleUpdateModalVisible(false);
-            setCurrentRow(undefined);
-
-            if (actionRef.current) {
-              actionRef.current.reload();
-            }
-          }
-        }}
-        onCancel={() => {
-          handleUpdateModalVisible(false);
-          setCurrentRow(undefined);
-        }}
-        updateModalVisible={updateModalVisible}
-        values={currentRow || {}}
-      />
-
-      <Drawer
-        width={600}
-        visible={showDetail}
-        onClose={() => {
-          setCurrentRow(undefined);
-          setShowDetail(false);
-        }}
-        closable={false}
-      >
-        {currentRow?.name && (
-          <ProDescriptions
-            column={2}
-            title={currentRow?.name}
-            request={async () => ({
-              data: currentRow || {},
-            })}
-            params={{
-              id: currentRow?.name,
-            }}
-            columns={columns}
-          />
-        )}
-      </Drawer>
-    </PageContainer>
-  );
-};
-
-export default TableList;

src/pages/TableList/service.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request';
-
-export async function queryRule(params) {
-  return request('/api/rule', {
-    params,
-  });
-}
-export async function removeRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'delete' },
-  });
-}
-export async function addRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'post' },
-  });
-}
-export async function updateRule(params) {
-  return request('/api/rule', {
-    method: 'POST',
-    data: { ...params, method: 'update' },
-  });
-}

src/pages/User/List/index.jsx

@@ -35,6 +35,14 @@ export default () => {
     })
   }
 
+  const handleResetPassword = (user) => {
+    request(`/reset-password/${user.userId}`, { method: 'put' }).then(() => {
+      notification.success({ message: '操作成功' })
+    }).catch((e) => {
+      notification.error({ message: e.message })
+    })
+  }
+
   const columns = [
     {
       title: '编号',
@@ -77,12 +85,15 @@ export default () => {
       key: 'option',
       valueType: 'option',
       // 不能操作超级管理员
-      render: (_, user) => [
-        user.userId !== '1' && <a key="edit" onClick={() => handleEdit(user)}>修改</a>,
-        user.userId !== '1' && <a key="disable" onClick={() => changeStatus(user)}>{user.status === 1 ? '禁用' : '启用'}</a>,
-        user.userId !== '1' && <Popconfirm key="delete" title="确定删除当前人员?" onConfirm={() => handleDelete(user)}>
+      render: (_, user) => user.userId === '1' ? [] : [
+        <a key="edit" onClick={() => handleEdit(user)}>修改</a>,
+        <a key="disable" onClick={() => changeStatus(user)}>{user.status === 1 ? '禁用' : '启用'}</a>,
+        <Popconfirm key="delete" title="确定删除当前人员?" onConfirm={() => handleDelete(user)}>
           <a href="#">删除</a>
         </Popconfirm>,
+        <Popconfirm key="reset" title="确定重置用户密码?" onConfirm={() => handleResetPassword(user)}>
+          <a href="#">重置密码</a>
+        </Popconfirm>,
       ].filter(Boolean)
     },
   ]

src/pages/Welcome/components/LineCard.jsx

@@ -84,7 +84,6 @@ export default (props) => {
   const [params, setParams] = useState()
 
   useEffect(() => {
-    console.log('-------->', dtRange)
     if (dtRange) {
       setParams({
         startDate: dtRange[0].format('YYYY-MM-DD'),      

src/pages/Welcome/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
-import { Card, Row, Col, Space, Button } from 'antd';
+import { Row, Col } from 'antd';
 import { LineChartOutlined, UserOutlined, ReadOutlined, BranchesOutlined } from '@ant-design/icons';
 // import { useIntl, FormattedMessage } from 'umi';
 import HeaderContent from './components/HeaderContent';
@@ -9,7 +9,7 @@ import NavCard from './components/NavCard';
 
 const navIconStyle = {
   fontSize: '5em',
-  color: 'rgba(0, 0, 0, 0.04)'
+  color: 'rgba(0, 0, 0, 0.06)'
 }
 
 const Text = (props) => (