Skip to content

C
CivManage
Commit 55d9ad2f authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

修改用户管理界面UI

parent e610bdbf
Pipeline #30594 passed with stages
        in 28 minutes 26 seconds
        Expand all Hide whitespace changes
        Inline Side-by-side
        Showing with 200 additions and 12 deletions
        .env
        View file @ 55d9ad2f
        ......@@ -8,4 +8,4 @@ PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaCore:http://192.168.19.105
        HOST = 0.0.0.0
        # 本地应用启动的端口
        PORT = 3001
        \ No newline at end of file
        PORT = 3001
        src/assets/images/icons/3_新增.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
        <style type="text/css">
        .st0{fill:#46546D;}
        </style>
        <g>
        <g>
        <path class="st0" d="M6.81,0c0.263,0,0.526,0.087,0.702,0.261s0.263,0.435,0.263,0.696v4.957h5.261C13.562,5.913,14,6.348,14,6.87
        s-0.438,0.957-0.965,0.957H7.774v5.217C7.774,13.565,7.336,14,6.81,14s-0.965-0.435-0.965-0.957V7.826H0.934
        c-0.351,0-0.614-0.174-0.789-0.435C-0.03,6.957-0.03,6.696,0.058,6.348c0.175-0.261,0.526-0.435,0.877-0.435h4.998V0.957
        c0-0.261,0.088-0.522,0.263-0.696S6.547,0,6.81,0L6.81,0z"/>
        </g>
        </g>
        </svg>
        src/assets/images/icons/4_新增白色.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
        <style type="text/css">
        .st0{fill:#FFFFFF;}
        </style>
        <path class="st0" d="M13.16,6.16H7.84V0.84C7.84,0.376,7.464,0,7,0S6.16,0.376,6.16,0.84v5.32H0.84C0.376,6.16,0,6.536,0,7
        s0.376,0.84,0.84,0.84h5.32v5.32C6.16,13.624,6.536,14,7,14s0.84-0.376,0.84-0.84V7.84h5.32C13.624,7.84,14,7.464,14,7
        S13.624,6.16,13.16,6.16z"/>
        </svg>
        src/assets/images/icons/5_更多.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
        <style type="text/css">
        .st0{clip-path:url(#SVGID_2_);}
        .st1{fill:#46546D;}
        </style>
        <g>
        <defs>
        <rect id="SVGID_1_" x="0" width="14" height="14"/>
        </defs>
        <clipPath id="SVGID_2_">
        <use xlink:href="#SVGID_1_" style="overflow:visible;"/>
        </clipPath>
        <g class="st0">
        <circle class="st1" cx="1.5" cy="7" r="1.5"/>
        <circle class="st1" cx="7" cy="7" r="1.5"/>
        <circle class="st1" cx="12.5" cy="7" r="1.5"/>
        </g>
        </g>
        </svg>
        src/assets/images/icons/ok.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
        <style type="text/css">
        .st0{fill:#70C23B;}
        </style>
        <g>
        <path class="st0" d="M8,0C3.589,0,0,3.589,0,8c0,4.412,3.589,8,8,8c4.412,0,8-3.588,8-8C16,3.589,12.411,0,8,0z M14.809,8
        c0,3.754-3.055,6.809-6.809,6.809c-3.754,0-6.809-3.055-6.809-6.809c0-3.754,3.054-6.809,6.809-6.809
        C11.754,1.191,14.809,4.246,14.809,8z"/>
        </g>
        <path class="st0" d="M6.855,10.867c-0.176,0-0.345-0.07-0.469-0.194L4.27,8.556c-0.259-0.259-0.259-0.679,0-0.939
        s0.679-0.259,0.939,0l1.647,1.647l3.936-3.937c0.259-0.259,0.679-0.259,0.939,0s0.259,0.679,0,0.939l-4.405,4.406
        C7.2,10.797,7.031,10.867,6.855,10.867z"/>
        </svg>
        src/assets/images/icons/必填.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
        <style type="text/css">
        .st0{fill:#FF5C68;}
        </style>
        <g>
        <path class="st0" d="M8,0C3.589,0,0,3.589,0,8c0,4.412,3.589,8,8,8c4.412,0,8-3.588,8-8C16,3.589,12.411,0,8,0z M14.809,8
        c0,3.754-3.055,6.809-6.809,6.809c-3.754,0-6.809-3.055-6.809-6.809c0-3.754,3.054-6.809,6.809-6.809
        C11.754,1.191,14.809,4.246,14.809,8z"/>
        </g>
        <g>
        <path class="st0" d="M8,12.245c-0.212,0-0.402-0.08-0.57-0.239c-0.168-0.159-0.252-0.345-0.252-0.557
        c0-0.124,0.141-1.044,0.424-2.759L7.045,9.141c-1.044,0.849-1.592,1.282-1.645,1.3c-0.106,0.053-0.221,0.08-0.345,0.08
        c-0.283,0-0.531-0.133-0.743-0.398C4.241,9.981,4.206,9.831,4.206,9.671c0-0.301,0.133-0.522,0.398-0.663L7.178,8L4.604,6.992
        c-0.265-0.159-0.398-0.389-0.398-0.69c0-0.159,0.035-0.31,0.106-0.451c0.177-0.265,0.416-0.398,0.716-0.398
        c0.106,0,0.23,0.035,0.371,0.106c0.053,0.018,0.601,0.451,1.645,1.3L7.602,7.31C7.319,5.595,7.178,4.675,7.178,4.551
        c0-0.212,0.084-0.398,0.252-0.557C7.598,3.835,7.788,3.755,8,3.755c0.212,0,0.402,0.08,0.57,0.239
        c0.168,0.159,0.252,0.345,0.252,0.557c0,0.124-0.141,1.044-0.424,2.759l0.557-0.451l1.618-1.3c0.088-0.071,0.221-0.106,0.398-0.106
        c0.301,0,0.539,0.133,0.716,0.398c0.071,0.141,0.106,0.283,0.106,0.424c0,0.301-0.133,0.539-0.398,0.716L8.822,8l2.573,1.008
        c0.265,0.159,0.398,0.389,0.398,0.69c0,0.141-0.035,0.283-0.106,0.424c-0.212,0.265-0.46,0.398-0.743,0.398
        c-0.124,0-0.239-0.027-0.345-0.08c-0.053-0.018-0.601-0.451-1.645-1.3L8.398,8.69c0.283,1.716,0.424,2.635,0.424,2.759
        c0,0.212-0.084,0.398-0.252,0.557C8.402,12.165,8.212,12.245,8,12.245z"/>
        </g>
        </svg>
        src/assets/images/icons/提示.svg 0 → 100644
        View file @ 55d9ad2f
        <?xml version="1.0" encoding="utf-8"?>
        <!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
        <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
        viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
        <style type="text/css">
        .st0{fill:#FF5C68;}
        </style>
        <g>
        <path class="st0" d="M8,0C3.589,0,0,3.589,0,8c0,4.412,3.589,8,8,8c4.412,0,8-3.588,8-8C16,3.589,12.411,0,8,0z M14.809,8
        c0,3.754-3.055,6.809-6.809,6.809c-3.754,0-6.809-3.055-6.809-6.809c0-3.754,3.054-6.809,6.809-6.809
        C11.754,1.191,14.809,4.246,14.809,8z"/>
        <path class="st0" d="M8,3.308c-0.334,0-0.596,0.262-0.596,0.596v4.884c0,0.335,0.262,0.596,0.596,0.596
        c0.335,0,0.596-0.262,0.596-0.596V3.904C8.596,3.57,8.334,3.308,8,3.308z"/>
        <path class="st0" d="M8,10.823c-0.334,0-0.596,0.262-0.596,0.595v0.631c0,0.334,0.262,0.595,0.596,0.595
        c0.335,0,0.596-0.262,0.596-0.595v-0.631C8.596,11.085,8.334,10.823,8,10.823z"/>
        </g>
        </svg>
        src/pages/userCenter/userManage/AddUserModal.jsx
        View file @ 55d9ad2f
        import React, { useEffect } from 'react';
        import { Modal, Form, Input, notification, message } from 'antd';
        import { addUser } from '@/services/userCenter/userManage/api';
        import { ok } from '../../../assets/images/icons/ok.svg';
        const AddUserModal = props => {
        const { title, visible, orgID, onCancel, onSelect } = props;
        ......@@ -97,27 +98,42 @@ const AddUserModal = props => {
        >
        <Form form={addUserForm} labelCol={{ span: 4 }}>
        <Form.Item
        hasFeedback
        name="loginName"
        label="登录名称"
        rules={[{ required: true, message: '不能为空且不支持中文' }]}
        rules={[{
        pattern:new RegExp(/^[^\u4e00-\u9fa5]+$/),
        message: '不支持中文' },
        {
        pattern: new RegExp(/^[^\s]*$/),
        message: '不能为空' }
        ]}
        >
        <Input placeholder="登录名称不支持中文" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="password"
        label="账户密码"
        rules={[{ required: true, message: '不能为空' }]}
        rules={[{
        pattern: /^[^\s]*$/,
        message: '不能为空' }
        ]}
        >
        <Input placeholder="请输入账户密码,至少6位" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="userName"
        label="用户名称"
        rules={[{ required: true, message: '不能为空' }]}
        rules={[{
        pattern: /^[^\s]*$/,
        message: '不能为空' }]}
        >
        <Input placeholder="请输入用户姓名" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="phone"
        label="手机号码"
        rules={[
        ......@@ -130,6 +146,7 @@ const AddUserModal = props => {
        <Input placeholder="请输入11位手机号码" autoComplete="off" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="email"
        label="电子邮箱"
        rules={[
        ......
        src/pages/userCenter/userManage/EditUserModal.jsx
        View file @ 55d9ad2f
        ......@@ -120,20 +120,23 @@ const EditUserModal = props => {
        >
        <Form form={editUserForm} labelCol={{ span: 4 }}>
        <Form.Item
        hasFeedback
        name="loginName"
        label="登录名称"
        rules={[{ required: true, message: '不能为空' }]}
        rules={[{ message: '不能为空' }]}
        >
        <Input placeholder="请输入登录名称" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="userName"
        label="用户姓名"
        rules={[{ required: true, message: '不能为空' }]}
        rules={[{ message: '不能为空' }]}
        >
        <Input placeholder="请输入用户姓名" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="phone"
        label="手机号码"
        rules={[
        ......@@ -146,6 +149,7 @@ const EditUserModal = props => {
        <Input placeholder="请输入11位手机号码" autoComplete="off" />
        </Form.Item>
        <Form.Item
        hasFeedback
        name="email"
        label="电子邮箱"
        rules={[
        ......
        src/pages/userCenter/userManage/UserManage.less
        View file @ 55d9ad2f
        ......@@ -27,7 +27,8 @@
        overflow: hidden;
        text-overflow: ellipsis;
        white-space: nowrap;
        display: block;
        display: flex !important;
        justify-content: space-between;
        }
        }
        .ant-pagination-prev,.ant-pagination-next{
        ......@@ -52,6 +53,10 @@
        }
        .ant-tree-switcher-icon svg{
        font-size: 14px;
        color: #767777 !important;
        }
        .ant-card-body {
        padding: 12px 24px 24px 10px;
        }
        }
        .redText{
        ......@@ -64,7 +69,10 @@
        margin:12px !important;
        }
        }
        .ant-btn > .anticon + span, .ant-btn > span + .anticon {
        margin-left: 8px;
        vertical-align: middle;
        }
        .siteTitle{
        font-size: 16px;
        margin: 0 0 6px 0;
        ......@@ -100,7 +108,7 @@
        position: relative;
        .orgContainer{
        height: calc(100vh - 74px);
        width: 240px;
        width: 260px;
        left: 0;
        top: 0;
        overflow-x: hidden;
        ......@@ -214,4 +222,56 @@
        overflow: auto;
        height: 50vh;
        }
        }
        \ No newline at end of file
        }
        .ant-modal-body{
        padding-bottom:0px;
        padding-right:40px;
        padding-left:40px;
        .ant-form{
        width: 90%;
        }
        }
        .ant-modal-content{
        border-radius: 5px;
        }
        .ant-modal-header{
        border-radius: 5px 5px 0 0;
        padding: 28px 40px;
        }
        .ant-modal-close{
        top:14px;
        right:20px;
        }
        .ant-modal-footer{
        border:none;
        padding: 28px 40px;
        }
        .ant-modal-footer .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
        margin-bottom: 0;
        margin-left: 15px;
        }
        .ant-form-horizontal .ant-form-item-control {
        margin-left: 10px;
        }
        .title{
        display: flex;
        align-items: center;
        width: 100%;
        }
        .tip{
        display: none;
        }
        .fs{
        font-size: 18px;
        margin-left: 10px;
        }
        .title:hover{
        .tip{
        position: relative;
        z-index: 99;
        display: flex;
        align-items: center;
        justify-content: flex-end;
        width: 100%;
        }
        }
        \ No newline at end of file
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment