Skip to content

Commit

Permalink
Merge pull request #11 from ynnnny/main
Browse files Browse the repository at this point in the history
test: 图片遮挡
  • Loading branch information
eleliauk authored Sep 8, 2024
2 parents 0534a80 + d3f9021 commit 545f445
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/components/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ const Layout: React.FC<LayoutProps> = ({ identity, isForm }) => {
itemSelectedBg: '#ffaf24',
itemSelectedColor: '#fffacc',
itemColor: '#fffacc',
itemHeight: 75,
itemHeight: 60,
},
},
}}
Expand Down
21 changes: 0 additions & 21 deletions src/pages/AuthorityManage/AuthorityManage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,14 @@ import { get, post } from '../../fetch.ts';
import { AdminList, AdminRow, ChangeUserType } from './AdminList.ts';
import AdminLists from './components/AdminLists/AdminLists.tsx';
import { useNavigate } from 'react-router-dom';
import SelectGroup from './components/AdminLists/SelectGroup/SelectGroup.tsx';
import { AdminFilter, Group } from './AdminFilter.ts';

const AuthorityManage = () => {
const [adminFilter, setAdminFilter] = useState<AdminFilter>({
grade: '',
group: Group.Product,
school: '',
status: '',
});
const [superAdmin, setSuperAdmin] = useState<AdminRow[]>([]);
const [admin, setAdmin] = useState<AdminRow[]>([]);
const [ordinary, setOrdinary] = useState<AdminRow[]>([]);

const [loading, setLoading] = useState<boolean>(false);

const changeGroup = (group: Group) => {
setAdminFilter((preAdminFilter) => {
if (group === 'All') {
return preAdminFilter;
} else {
return { ...preAdminFilter, group: group };
}
});
};

const navigate = useNavigate();
const getUserList = (
user_type: string,
Expand Down Expand Up @@ -88,9 +70,6 @@ const AuthorityManage = () => {
return (
<>
<div className="authorityManageBox">
<div className="selectGroup">
<SelectGroup adminFilter={adminFilter} changeGroup={changeGroup}></SelectGroup>
</div>
<div className={'authorityManage'}>
<AdminLists
header={'超级管理员'}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Review/Review.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
box-shadow: 0 5px 10px #d4d4d4;
border-radius: 0.5vw;
position: relative;
padding-bottom: 50px; /* 为分页器腾出空间,避免覆盖内容 */
overflow-y: scroll;
// padding-bottom: 50px; /* 为分页器腾出空间,避免覆盖内容 */
// overflow-y: scroll;
}
}
4 changes: 3 additions & 1 deletion src/pages/Review/Review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ const Review = () => {
<ReviewYear changeYear={changeYear} />
<ReviewGroupSelect reviewFilter={reviewFilter} changeGroup={changeGroup} />
</div>
<ReviewTable reviewList={reviewList} loading={loading} />
<div className={'reviewList'}>
<ReviewTable reviewList={reviewList} loading={loading} />
</div>
</div>
);
};
Expand Down
4 changes: 3 additions & 1 deletion src/pages/Review/components/ReviewYear/ReviewYear.less
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
.reviewYear {
width: 100%;
height: 8vh;
height: 12vh;
border-radius: 0.5vw;
background-color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
box-shadow: 0 5px 10px #d4d4d4;
min-height: 50px;

.reviewYearSelect {
width: 80%;
height: 40%;
min-height: 50px;
border-radius: 1vw;
border: none;
outline: none;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/formM/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ const FormForMobile: React.FC = () => {
// 获取当前日期和时间
const currentDate = new Date();
// 设置目标日期
const targetDate = new Date(currentDate.getFullYear(), 2, 4, 23, 59, 0); // 月份从0开始,所以8代表9月
const targetDate = new Date(currentDate.getFullYear(), 8, 24, 23, 59, 0); // 月份从0开始,所以8代表9月

// 比较当前日期和目标日期
if (currentDate > targetDate) {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/formW/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ const FormForWeb: React.FC = () => {
// 获取当前日期和时间
const currentDate = new Date();
// 设置目标日期为9月24日23点59分
const targetDate = new Date(currentDate.getFullYear(), 2, 4, 23, 59, 0); // 月份从0开始,所以8代表9月
const targetDate = new Date(currentDate.getFullYear(), 8, 24, 23, 59, 0); // 月份从0开始,所以8代表9月

// 比较当前日期和目标日期
if (currentDate > targetDate) {
Expand Down

0 comments on commit 545f445

Please sign in to comment.