From 8af8dd5173f60ad396fa0828795a23696a5b76b0 Mon Sep 17 00:00:00 2001
From: shaoan123 <48235222+shaoan123@users.noreply.github.com>
Date: Fri, 9 Apr 2021 15:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=B0=E8=BF=90=E7=BB=B4?=
=?UTF-8?q?=E7=AB=99=E7=82=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../userCenter/siteManageV2/siteManage.jsx | 63 ++++++++++---------
.../userCenter/siteManageV2/siteManage.less | 15 ++++-
2 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/src/pages/userCenter/siteManageV2/siteManage.jsx b/src/pages/userCenter/siteManageV2/siteManage.jsx
index 1b1cccde..21ea2eb1 100644
--- a/src/pages/userCenter/siteManageV2/siteManage.jsx
+++ b/src/pages/userCenter/siteManageV2/siteManage.jsx
@@ -224,12 +224,12 @@ const SiteManageV2 = () => {
//鑾峰彇褰撳墠绔欑偣鎵€鏈夊凡缁忓嬀閫夌殑鐢ㄦ埛鏂版帴鍙�
const getAllCheckListNew = () => {
getStationUsers({
- stationId:currentStation
+ stationId: currentStation
}).then(
res => {
let list = []
if (res.data.length > 0) {
-
+
res.data.map((item, index) => {
list.push({
GroupId: +item.OUID,
@@ -238,7 +238,7 @@ const SiteManageV2 = () => {
userID: item.userID,
});
})
-
+
}
setSelectList(lodash.cloneDeep(list));
setUpdatePageUser(updatePageUser + 1)
@@ -487,6 +487,7 @@ const SiteManageV2 = () => {
autoExpandParent
selectedKeys={[currentStation]}
onSelect={onSelect}
+ height={treeData.length && treeData.length > 30 ? treeData.length * 14 : 900}
treeData={treeData.map(t => mapTree(t))}
/>
)}
@@ -576,30 +577,10 @@ const SiteManageV2 = () => {
})}
>
{/* <Checkbox className={styles.siteAll}>鍏ㄩ€�/鍙嶉€�</Checkbox> */}
- <Spin spinning={visibleParams.loading}>
- {dataList.map((item, index) => (
- <Panels
- {...item}
- index={index}
- key={item.GroupId}
- handleChangeCollpase={handleChangeCollpase}
- handleChangeAll={handleChangeAll}
- handleChangeSignel={handleChangeSignel}
- />
- ))}
- </Spin>
+
{dataList.length > 0 && !visibleParams.loading ? (
<>
- <div style={{ textAlign: 'right' }}>
- <Pagination
- size="small"
- total={total}
- current={page.pageNum}
- defaultPageSize="5"
- onChange={handleChangePage}
- pageSizeOptions={['5']}
- />
- </div>
+
<p className={styles.siteline}>宸查€夋嫨鍒楄〃锛�</p>
<div className={styles.siteSelectList}>
<ul className={styles.siteSelectUl}>
@@ -617,7 +598,31 @@ const SiteManageV2 = () => {
) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)}
+ <Spin spinning={visibleParams.loading}>
+ {dataList.map((item, index) => (
+ <Panels
+ {...item}
+ index={index}
+ key={item.GroupId}
+ handleChangeCollpase={handleChangeCollpase}
+ handleChangeAll={handleChangeAll}
+ handleChangeSignel={handleChangeSignel}
+ />
+ ))}
+ </Spin>
</Card>
+ {dataList.length > 0 && !visibleParams.loading ? (
+ <div style={{ textAlign: 'right' }}>
+ <Pagination
+ size="small"
+ total={total}
+ current={page.pageNum}
+ defaultPageSize="5"
+ onChange={handleChangePage}
+ pageSizeOptions={['5']}
+ />
+ </div>) : ''
+ }
<div className={styles.siteBtn}>
<Button
type="primary"
@@ -641,6 +646,7 @@ const Panels = React.memo(props => {
let { index, GroupId, GroupName, Users, isChecked, isShow, color } = props;
return (
<div className={styles.sitePanel} key={GroupId} id={`siteId${GroupId}`}>
+
{/* onClick={() => props.handleChangeCollpase(GroupId, isShow)} */}
<div className={styles.sitePanelHead}>
{/* {isShow ? (
@@ -651,16 +657,17 @@ const Panels = React.memo(props => {
{/* <UpOutlined className={styles.siteIcon} /> */}
<UserOutlined className={styles.siteIcon} />
<p style={{ color }}>{GroupName}</p>
- </div>
- <div className={styles.sitePanelCon}>
<Checkbox
key="0"
- className={styles.siteList}
+ className={styles.siteListTitle}
checked={isChecked}
onClick={e => props.handleChangeAll(e, index)}
>
鍏ㄩ€�
</Checkbox>
+ </div>
+ <div className={styles.sitePanelCon}>
+
{Users.length > 0 &&
Users.map((v, vIndex) => (
<CheckBoxRow
diff --git a/src/pages/userCenter/siteManageV2/siteManage.less b/src/pages/userCenter/siteManageV2/siteManage.less
index 6aa97e78..6578319e 100644
--- a/src/pages/userCenter/siteManageV2/siteManage.less
+++ b/src/pages/userCenter/siteManageV2/siteManage.less
@@ -122,7 +122,7 @@
width: 280px;
left: 0;
top: 0;
- overflow-x: hidden;
+ overflow: hidden;
margin-right: 10px;
position: relative;
transition-property: width, left;
@@ -259,7 +259,14 @@
white-space: nowrap;
text-overflow: ellipsis;
}
-
+.siteListTitle {
+ width: 199px;
+ // margin:0 0 15px 0;
+ padding: 0 0 0 15px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
.sitePanel {
margin: 0 0 10px 0;
}
@@ -269,11 +276,13 @@
padding: 8px 10px;
cursor: pointer;
display: flex;
+ align-items: center;
flex-direction: row;
}
.sitePanelHead p {
margin: 0;
+ margin-right: 0.6rem;
}
.sitePanelCon {
@@ -346,7 +355,7 @@
display: flex;
flex-direction: row;
align-items: center;
- justify-content: flex-end;
+ justify-content: center;
}
.ant-modal-root {
--
2.17.1