Commit f9f4ce1c authored by 沈翠玲's avatar 沈翠玲

修改bug

parent d6c32192
import type { Settings as LayoutSettings } from '@ant-design/pro-layout';
import { setLocale } from 'umi';
import { PageLoading } from '@ant-design/pro-layout';
import type { RunTimeLayoutConfig, RequestConfig } from 'umi';
import { history, Link, matchPath } from 'umi';
......@@ -192,7 +191,6 @@ export async function getInitialState(): Promise<{
const fetchUserInfo = async () => {
try {
const msg = await queryCurrentUser();
console.log('msgmsg', msg)
if (msg && msg.code === 200) {
return msg;
} else {
......@@ -203,14 +201,10 @@ export async function getInitialState(): Promise<{
}
return undefined;
};
// 如果是登录页面,不执行
if (history.location.pathname !== loginPath) {
const currentUser = await fetchUserInfo();
console.log('currentUser', currentUser)
if (currentUser && currentUser.user.locale) {
console.log('locale', currentUser.user.locale)
setLocale(currentUser.user.locale)
}
return {
fetchUserInfo,
currentUser,
......
import moment from 'moment';
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { getIntl } from 'umi';
import { useIntl } from 'umi';
export type Style1Props = {
autoResize: boolean;
headerText: string;
onHeaderClick?: () => void;
};
const intl = getIntl();
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
function getWeekDayString(weekDay: number) {
return weekList[weekDay];
}
const Style1: React.FC<Style1Props> = ({ autoResize, headerText, children, onHeaderClick }) => {
const [scaleWidth, setScaleWidth] = useState(1);
const [scaleHeight, setScaleHeight] = useState(1);
const [currentDate, setCurrentDate] = useState('');
const [currentWeek, setCurrentWeek] = useState('');
const [currentTime, setCurrentTime] = useState('');
const intl = useIntl();
function getWeekDayString(weekDay: number) {
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
return weekList[weekDay];
}
const resetScale = (ar: boolean) => {
if (ar === true) {
setScaleWidth(document.body.clientWidth / 1920);
......
......@@ -28,7 +28,7 @@
}
.leftheader {
width: 210px;
width: 220px;
padding: 26px 0 0 50px;
color: #fff;
font-size: 21px;
......
......@@ -2,7 +2,7 @@ import moment from 'moment';
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { delay, floor } from 'lodash';
import { getIntl } from 'umi';
import { useIntl } from 'umi';
export type Style1Props = {
autoResize: boolean;
headerText: string;
......@@ -11,11 +11,6 @@ export type Style1Props = {
style?: object;
onHeaderClick?: () => void;
};
const intl = getIntl();
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
function getWeekDayString(weekDay: number) {
return weekList[weekDay];
}
const Style1: React.FC<Style1Props> = ({
autoResize,
......@@ -26,6 +21,11 @@ const Style1: React.FC<Style1Props> = ({
children,
onHeaderClick,
}) => {
const intl = useIntl();
function getWeekDayString(weekDay: number) {
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
return weekList[weekDay];
}
const [scaleWidth, setScaleWidth] = useState(1);
const [scaleHeight, setScaleHeight] = useState(1);
const [currentDate, setCurrentDate] = useState('');
......
import moment from 'moment';
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { getIntl } from 'umi';
import { useIntl } from 'umi';
export type Style1Props = {
autoResize: boolean;
headerText: string;
onHeaderClick?: () => void;
};
const intl = getIntl();
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
function getWeekDayString(weekDay: number) {
return weekList[weekDay];
}
const Style1: React.FC<Style1Props> = ({ autoResize, headerText, children, onHeaderClick }) => {
const [scaleWidth, setScaleWidth] = useState(1);
......@@ -19,7 +15,11 @@ const Style1: React.FC<Style1Props> = ({ autoResize, headerText, children, onHea
const [currentDate, setCurrentDate] = useState('');
const [currentWeek, setCurrentWeek] = useState('');
const [currentTime, setCurrentTime] = useState('');
const intl = useIntl();
function getWeekDayString(weekDay: number) {
const weekList = [intl.formatMessage({id:'星期日'}), intl.formatMessage({id:'星期一'}), intl.formatMessage({id:'星期二'}), intl.formatMessage({id:'星期三'}), intl.formatMessage({id:'星期四'}), intl.formatMessage({id:'星期五'}), intl.formatMessage({id:'星期六'})];
return weekList[weekDay];
}
const resetScale = (ar: boolean) => {
if (ar === true) {
setScaleWidth(document.body.clientWidth / 3840);
......
......@@ -6,6 +6,8 @@ import ProForm, { ProFormText, ProFormCheckbox } from '@ant-design/pro-form';
import { UserOutlined, LockOutlined, CloseCircleOutlined } from '@ant-design/icons';
import Footer from '@/components/Footer';
import { login } from '@/services/mgr/api';
import { setLocale } from 'umi';
const LoginMessage: React.FC = ({ children }) => (
<Alert
......@@ -38,6 +40,11 @@ const Login: React.FC = () => {
const fetchUserInfo = async () => {
const resp = await initialState?.fetchUserInfo?.();
if (resp) {
if (resp.user.locale) {
console.log('locale', resp.user.locale)
setLocale(resp.user.locale, false)
}
await setInitialState((s) => ({
...s,
currentUser: resp,
......@@ -88,12 +95,10 @@ const Login: React.FC = () => {
<div className={styles.content}>
<div className={styles.top}>
<div className={styles.header}>
<Link to="/">
<img alt="logo" className={styles.logo} src="logo.png" />
<span className={styles.title}>
<FormattedMessage id="看板系统" defaultMessage="看板系统" />
</span>
</Link>
<img alt="logo" className={styles.logo} src="logo.png" />
<span className={styles.title}>
<FormattedMessage id="看板系统" defaultMessage="看板系统" />
</span>
</div>
</div>
<div className={styles.main}>
......
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