Skip to content

C
CivManage
Commit b803967b authored by shaoan123's avatar shaoan123
Browse files
Options

优化新运维中站点管理及角色管理的界面

parent aba3f653
Pipeline #26103 skipped with stages
        Hide whitespace changes
        Inline Side-by-side
        Showing with 85 additions and 71 deletions
        src/pages/platformCenter/schemeConfig/projectMessage/projectMessage.jsx
        View file @ b803967b
        ...@@ -64,7 +64,7 @@ const VectorData = props => { ...@@ -64,7 +64,7 @@ const VectorData = props => {
        } }
        return ( return (
        <> <>
        <Row> <div style={{ width: 'calc(100vw - 265px)' }}>
        <div className={styles.tileBtn}> <div className={styles.tileBtn}>
        <Button type="primary" onClick={() => { <Button type="primary" onClick={() => {
        handleAdd(); handleAdd();
        ...@@ -72,56 +72,56 @@ const VectorData = props => { ...@@ -72,56 +72,56 @@ const VectorData = props => {
        新增 新增
        </Button> </Button>
        </div> </div>
        </Row> <Row >
        <Row gutter={16}> {tileData && tileData.length ?
        {tileData && tileData.length ? tileData.map((item, index) => {
        tileData.map((item, index) => { return <Col key={index} span={5}> <Card title={<div><span className={styles.schemeName}>方案名</span>{item.schemename}</div>} extra={<a href="#">
        return <Col key={index} span={8}> <Card title={<div><span className={styles.schemeName}>方案名</span>{item.schemename}</div>} extra={<a href="#"> <Popconfirm
        <Popconfirm title="是否删除该方案？"
        title="是否删除该方案？" okText="确认"
        okText="确认" cancelText="取消"
        cancelText="取消" onConfirm={() => {
        onConfirm={() => { deleteTile(record);
        deleteTile(record); }}
        }} >
        > <CloseOutlined />
        <CloseOutlined /> </Popconfirm> </a>} style={{ width: 300 }}>
        </Popconfirm> </a>} style={{ width: 300 }}> <p><span className={styles.schemeName}>矢量</span> {item.servicename}</p>
        <p><span className={styles.schemeName}>矢量</span> {item.servicename}</p> <div className={styles.schemeItem}><span className={styles.schemeName}>瓦片</span>
        <div className={styles.schemeItem}><span className={styles.schemeName}>瓦片</span> <Button className={styles.schemeBtn} onClick={() => addTile(item, index)}> <PlusOutlined />添加瓦片</Button>
        <Button className={styles.schemeBtn} onClick={() => addTile(item, index)}> <PlusOutlined />添加瓦片</Button>
        </div>
        {item.baseMap && item.baseMap.length ? item.baseMap.map((baseMapItem, baseindex) => {
        return <div key={baseindex} className={styles.mapItem} >
        <div className={classnames({
        [styles.defaultTile]: true,
        [styles.activeTile]: baseindex == item.defaultBaseMap,
        })}>默认</div>
        <div className={styles.mapText}>{baseMapItem}</div>
        <div className={styles.mapIcon}>
        <Popconfirm
        title="是否删除该底图？"
        okText="确认"
        cancelText="取消"
        onConfirm={() => {
        deleteTile(record);
        }}
        >
        <CloseOutlined />
        </Popconfirm> </div>
        </div> </div>
        }) : ''} {item.baseMap && item.baseMap.length ? item.baseMap.map((baseMapItem, baseindex) => {
        </Card> return <div key={baseindex} className={styles.mapItem} >
        </Col> <div className={classnames({
        }) : ''} [styles.defaultTile]: true,
        </Row > [styles.activeTile]: baseindex == item.defaultBaseMap,
        <AddModal })}>默认</div>
        visible={visible} <div className={styles.mapText}>{baseMapItem}</div>
        onCancel={() => setVisible(false)} <div className={styles.mapIcon}>
        callBackSubmit={onSubmit} <Popconfirm
        type={type} title="是否删除该底图？"
        formObj={formObj} okText="确认"
        /> cancelText="取消"
        onConfirm={() => {
        deleteTile(record);
        }}
        >
        <CloseOutlined />
        </Popconfirm> </div>
        </div>
        }) : ''}
        </Card>
        </Col>
        }) : ''}
        </Row >
        <AddModal
        visible={visible}
        onCancel={() => setVisible(false)}
        callBackSubmit={onSubmit}
        type={type}
        formObj={formObj}
        />
        </div>
        </> </>
        ) )
        } }
        ......
        src/pages/userCenter/roleManage/UserModal.jsx
        View file @ b803967b
        ...@@ -4,7 +4,7 @@ import SiteModal from '@/components/Modal/SiteModa'; ...@@ -4,7 +4,7 @@ import SiteModal from '@/components/Modal/SiteModa';
        import classnames from 'classnames' import classnames from 'classnames'
        import styles from './UserModal.less'; import styles from './UserModal.less';
        import lodash, { clone } from 'lodash'; import lodash, { clone } from 'lodash';
        import { Card, Empty, Pagination, Checkbox, notification, Input,Row,Col } from 'antd' import { Card, Empty, Pagination, Checkbox, notification, Input, Row, Col } from 'antd'
        import { import {
        getWebModuleTree, getWebModuleTree,
        chooseUserToStation, chooseUserToStation,
        ...@@ -96,7 +96,7 @@ const UserModal = props => { ...@@ -96,7 +96,7 @@ const UserModal = props => {
        }).then( }).then(
        res => { res => {
        let list = [] let list = []
        if (res.data&&res.data.length > 0) { if (res.data && res.data.length > 0) {
        res.data.map((item, index) => { res.data.map((item, index) => {
        list.push({ list.push({
        ...@@ -355,16 +355,17 @@ const Panels2 = React.memo(props => { ...@@ -355,16 +355,17 @@ const Panels2 = React.memo(props => {
        {/* <UpOutlined className={styles.siteIcon} /> */} {/* <UpOutlined className={styles.siteIcon} /> */}
        <UserOutlined className={styles.siteIcon} /> <UserOutlined className={styles.siteIcon} />
        <p style={{ color }}>{GroupName}</p> <p style={{ color }}>{GroupName}</p>
        </div>
        <div className={styles.sitePanelCon}>
        <Checkbox <Checkbox
        key="0" key="0"
        className={styles.siteList} className={styles.siteListTitle}
        checked={isChecked} checked={isChecked}
        onClick={e => props.handleChangeAll(e, index)} onClick={e => props.handleChangeAll(e, index)}
        > >
        全选 全选
        </Checkbox> </Checkbox>
        </div>
        <div className={styles.sitePanelCon}>
        {Users.length > 0 && {Users.length > 0 &&
        Users.map((v, vIndex) => ( Users.map((v, vIndex) => (
        <CheckBoxRow <CheckBoxRow
        ......
        src/pages/userCenter/roleManage/UserModal.less
        View file @ b803967b
        ...@@ -52,14 +52,21 @@ ...@@ -52,14 +52,21 @@
        } }
        .siteList { .siteList {
        width: 120px;
        // margin:0 0 15px 0;
        padding: 0 0 15px 10px;
        overflow: hidden;
        white-space: nowrap;
        text-overflow: ellipsis;
        }
        .siteListTitle {
        width: 199px; width: 199px;
        // margin:0 0 15px 0; // margin:0 0 15px 0;
        padding: 0 0 15px 0; padding: 0 0 0 15px;
        overflow: hidden; overflow: hidden;
        white-space: nowrap; white-space: nowrap;
        text-overflow: ellipsis; text-overflow: ellipsis;
        } }
        .sitePanel { .sitePanel {
        margin: 0 0 10px 0; margin: 0 0 10px 0;
        } }
        ......
        src/pages/userCenter/siteManageV2/siteManage.jsx
        View file @ b803967b
        ...@@ -86,7 +86,7 @@ const SiteManageV2 = () => { ...@@ -86,7 +86,7 @@ const SiteManageV2 = () => {
        checkBoxLoading: false, checkBoxLoading: false,
        }); });
        const [total, setTotal] = useState(0); // 分页总数 const [total, setTotal] = useState(0); // 分页总数
        const [page, setPage] = useState({ pageNum: 1, pageSize: 5 }); const [page, setPage] = useState({ pageNum: 1, pageSize: 10 });
        const [selectList, setSelectList] = useState([]); // 选择列表数据 const [selectList, setSelectList] = useState([]); // 选择列表数据
        const [updatePageUser, setUpdatePageUser] = useState(1);// const [updatePageUser, setUpdatePageUser] = useState(1);//
        const [updateCheck, setUpdateCheck] = useState(1); const [updateCheck, setUpdateCheck] = useState(1);
        ...@@ -253,7 +253,7 @@ const SiteManageV2 = () => { ...@@ -253,7 +253,7 @@ const SiteManageV2 = () => {
        } else { } else {
        setCurrentStation(props[0]); setCurrentStation(props[0]);
        } }
        setPage({ pageNum: 1, pageSize: 5 }); setPage({ pageNum: 1, pageSize: 10 });
        } }
        // 弹出模态框 // 弹出模态框
        ...@@ -598,7 +598,7 @@ const SiteManageV2 = () => { ...@@ -598,7 +598,7 @@ const SiteManageV2 = () => {
        ) : ( ) : (
        <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} /> <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
        )} )}
        <Spin spinning={visibleParams.loading}> <Spin spinning={visibleParams.loading} >
        {dataList.map((item, index) => ( {dataList.map((item, index) => (
        <Panels <Panels
        {...item} {...item}
        ...@@ -617,9 +617,9 @@ const SiteManageV2 = () => { ...@@ -617,9 +617,9 @@ const SiteManageV2 = () => {
        size="small" size="small"
        total={total} total={total}
        current={page.pageNum} current={page.pageNum}
        defaultPageSize="5" defaultPageSize="10"
        onChange={handleChangePage} onChange={handleChangePage}
        pageSizeOptions={['5']} pageSizeOptions={['10']}
        /> />
        </div>) : '' </div>) : ''
        } }
        ......
        src/pages/userCenter/siteManageV2/siteManage.less
        View file @ b803967b
        ...@@ -87,6 +87,13 @@ ...@@ -87,6 +87,13 @@
        } }
        .siteManageContainer { .siteManageContainer {
        .ant-card-body{
        padding: 15px;
        }
        .ant-spin-container{
        overflow-y: scroll;
        height: calc(100vh - 410px);
        }
        .ant-tree-treenode { .ant-tree-treenode {
        width: 100% !important; width: 100% !important;
        ...@@ -243,7 +250,7 @@ ...@@ -243,7 +250,7 @@
        min-height: calc(100vh - 210px); min-height: calc(100vh - 210px);
        max-height: calc(100vh - 210px); max-height: calc(100vh - 210px);
        min-width: 600px; min-width: 600px;
        overflow-y: scroll;
        } }
        ...@@ -317,9 +324,9 @@ ...@@ -317,9 +324,9 @@
        .siteSelectList { .siteSelectList {
        border: 1px solid #f5f5f5; border: 1px solid #f5f5f5;
        height: 200px; height: 120px;
        overflow: auto; overflow: auto;
        margin-bottom: 50px; margin-bottom:20px;
        .siteSelectUl { .siteSelectUl {
        margin: 0; margin: 0;
        ...@@ -329,25 +336,24 @@ ...@@ -329,25 +336,24 @@
        flex-wrap: wrap; flex-wrap: wrap;
        li { li {
        width: 200px;
        height: 35px; height: 35px;
        line-height: 35px; line-height: 35px;
        background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 175px; background: rgba(24, 144, 255, 0.16) url('../../../assets/images/icons/close.png') no-repeat 170px;
        background-size: 20px; background-size: 20px;
        background-position:center right;
        margin: 0 10px 10px 0; margin: 0 10px 10px 0;
        cursor: pointer; cursor: pointer;
        overflow: hidden; overflow: hidden;
        white-space: nowrap; white-space: nowrap;
        text-overflow: ellipsis; text-overflow: ellipsis;
        padding: 0 20px 0 10px; padding: 0 40px 0 10px;
        } }
        } }
        } }
        .siteline { .siteline {
        border-top: 1px solid #eee;
        padding-top: 15px;
        margin-top: 20px;
        } }
        .siteBtn { .siteBtn {
        ......
        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