diff --git a/web/client/assets/images/background/user_login.png b/web/client/assets/images/background/user_login.png index 151e68e..7681ad4 100644 Binary files a/web/client/assets/images/background/user_login.png and b/web/client/assets/images/background/user_login.png differ diff --git a/web/client/assets/images/background/xiangqi.png b/web/client/assets/images/background/xiangqi.png new file mode 100644 index 0000000..9742f78 Binary files /dev/null and b/web/client/assets/images/background/xiangqi.png differ diff --git a/web/client/assets/images/problem/await.png b/web/client/assets/images/problem/await.png new file mode 100644 index 0000000..ce41e1d Binary files /dev/null and b/web/client/assets/images/problem/await.png differ diff --git a/web/client/assets/video/login_bg.mp4 b/web/client/assets/video/login_bg.mp4 index 24450a3..c10df87 100644 Binary files a/web/client/assets/video/login_bg.mp4 and b/web/client/assets/video/login_bg.mp4 differ diff --git a/web/client/src/layout/components/header/index.jsx b/web/client/src/layout/components/header/index.jsx index 3f2c94f..49cf5b8 100644 --- a/web/client/src/layout/components/header/index.jsx +++ b/web/client/src/layout/components/header/index.jsx @@ -67,25 +67,43 @@ const Header = (props) => { text={
- - U + + {user?.name?.substr(0, 1)}
+ }} + >
} > - +
+
+ + {user?.name?.substr(0, 1)} + +
+ {user.name} +
v.name + '、')} style={{ width: 100, overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}>{user?.department?.map(v => v.name + '、')}
+
+
+
用户中心
+
安全认证
+
+ + + {/* collapseButton collapseText */} + + } diff --git a/web/client/src/sections/auth/containers/login.jsx b/web/client/src/sections/auth/containers/login.jsx index 11f1d87..11f63df 100644 --- a/web/client/src/sections/auth/containers/login.jsx +++ b/web/client/src/sections/auth/containers/login.jsx @@ -8,41 +8,41 @@ import { IconLock, IconUser } from '@douyinfe/semi-icons'; import '../style.less' const Login = props => { - const { dispatch, user, error, actions, apiRoot, isRequesting } = props - const form = useRef(); + const { dispatch, user, error, actions, apiRoot, isRequesting } = props + const form = useRef(); - useEffect(() => { - if (error) { - Toast.error(error); - form.current.setValue('password', '') - } - }, [error]) + useEffect(() => { + if (error) { + Toast.error(error); + form.current.setValue('password', '') + } + }, [error]) - useEffect(() => { - if (user && user.authorized) { - dispatch(push('/console')); - localStorage.setItem('poms_open_sider', JSON.stringify([])) - localStorage.removeItem('poms_selected_sider') - } - }, [user]) + useEffect(() => { + if (user && user.authorized) { + dispatch(push('/console')); + localStorage.setItem('poms_open_sider', JSON.stringify([])) + localStorage.removeItem('poms_selected_sider') + } + }, [user]) - return ( -
-
+ + ); } function mapStateToProps (state) { - const { auth, global } = state; - return { - user: auth.user, - error: auth.error, - actions: global.actions, - apiRoot: global.apiRoot, - isRequesting: auth.isRequesting - } + const { auth, global } = state; + return { + user: auth.user, + error: auth.error, + actions: global.actions, + apiRoot: global.apiRoot, + isRequesting: auth.isRequesting + } } export default connect(mapStateToProps)(Login); \ No newline at end of file diff --git a/web/client/src/sections/problem/components/statistics.jsx b/web/client/src/sections/problem/components/statistics.jsx index 2fca6eb..3895cf9 100644 --- a/web/client/src/sections/problem/components/statistics.jsx +++ b/web/client/src/sections/problem/components/statistics.jsx @@ -6,24 +6,27 @@ const Statistics = ({ dispatch, actions, close, modalName, visible, appData }) = return ( -
+
数据异常统计
- + /> */}
-
+ {/*
暂未开放敬请期待
暂未开放敬请期待
暂未开放敬请期待
暂未开放敬请期待
+
*/} +
+ 暂未开放 敬请期待
) diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 17eddf2..7cda095 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -4,8 +4,9 @@ import { Button, Form, Modal, Skeleton, Pagination, Table } from "@douyinfe/semi import { SkeletonScreen, } from "$components"; -const TableData = ({ dispatch, actions, route, collectData, setSetup }) => { +const TableData = ({ dispatch, actions, route, collectData, setSetup, exhibition }) => { + const [selected, setSelected] = useState([]) //表格被勾选项 const api = useRef(); useEffect(() => { @@ -67,7 +68,7 @@ const TableData = ({ dispatch, actions, route, collectData, setSetup }) => { field={collectData.common.field} key={collectData.common.field} // defaultPickerValue={[new Date('2022-08-08 00:00'), new Date('2022-08-09 12:00')]} - values={[new Date('2022-08-08 00:00'), new Date()]} + // initValue={[new Date('2022-08-08 00:00'), new Date()]} onChange={(v) => console.log(v)} />) return frame @@ -82,17 +83,11 @@ const TableData = ({ dispatch, actions, route, collectData, setSetup }) => { marginRight: 10 }} > - setSetup(true)} /> + setSetup(true)} />