From 1895c08397113d5dba9d6d947e60de606a958a31 Mon Sep 17 00:00:00 2001 From: zhangzhen <525765282@qq.com> Date: Tue, 18 Mar 2025 11:55:10 +0800 Subject: [PATCH] 优化代码； --- src/components/Common/PersonCenter/PersonCenter.js | 1 - src/components/IndexCenter/IndexCenter.js | 1 - src/models/app.js | 27 ++++++++++++++------------- src/routes/indexCenter/indexCenter.js | 2 +- src/routes/indexPage.js | 3 +-- src/routes/login/login.js | 2 +- src/routes/menuPanel/menuPanel.js | 3 +-- src/routes/personCenter/personCenter.js | 3 +-- src/routes/tab/tab.js | 3 +-- src/services/services.js | 6 +----- src/utils/request.js | 1 - 11 files changed, 21 insertions(+), 31 deletions(-) diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js index 1cc119c..680464d 100644 --- a/src/components/Common/PersonCenter/PersonCenter.js +++ b/src/components/Common/PersonCenter/PersonCenter.js @@ -38,7 +38,6 @@ const FormItem = Form.Item; class PersonCenter extends Component { constructor(props) { - console.log('=====props', props); super(props); this.changePwd = localStorage.getItem(`${commonConfig.prefix}changePwd`) === 'true'; this.state = { diff --git a/src/components/IndexCenter/IndexCenter.js b/src/components/IndexCenter/IndexCenter.js index 0a14bcc..71e13a6 100644 --- a/src/components/IndexCenter/IndexCenter.js +++ b/src/components/IndexCenter/IndexCenter.js @@ -87,7 +87,6 @@ class IndexCenter extends Component { } componentWillMount() { - console.log('=====componentWillMount'); setTimeout(() => { this.handleGetModelCenter('init'); const commonUrl = `${config.server_host}parameter/getParameter?sModelsId=100`; diff --git a/src/models/app.js b/src/models/app.js index 23075b4..06da906 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -249,7 +249,7 @@ export default { currentPane: pane, }, }); - yield put(history.push(pane.route)); + history.push(pane.route); } }, *addPane({ payload }, { put, select }) { @@ -308,7 +308,8 @@ export default { const { currentPane } = payload; yield put({ type: 'setCurrentPane', payload: { currentPane } }); const routeLine = currentPane.route ? currentPane.route : '/indexPage'; - yield put(history.push(routeLine)); + // yield put(history.push(routeLine)); + history.push(routeLine) }, *throwError({ payload }, { put, select }) { const { code, msg, fn } = payload; @@ -319,9 +320,9 @@ export default { yield put({ type: 'saveWebSocket', payload: { webSocket: null } }); yield put({ type: 'saveToken', payload: {} }); if (location.pathname.toLowerCase() === '/loginoee') { - yield put(history.push('/loginOee')); + history.push('/loginOee'); } else { - yield put(history.push('/login')); + history.push('/login'); } message.destroy(); message.error(msg, ERROR_MSG_DURATION); @@ -365,7 +366,7 @@ export default { commonFunc.onWebSocketClose(webSocket, false, null); yield put({ type: 'saveWebSocket', payload: { webSocket: null } }); yield put({ type: 'saveToken', payload: {} }); - yield put(history.push('/loginMobile')); + history.push('/loginMobile'); message.destroy(); message.error(msg, ERROR_MSG_DURATION); } else { @@ -381,7 +382,7 @@ export default { commonFunc.onWebSocketClose(webSocket, false, null); yield put({ type: 'saveWebSocket', payload: { webSocket: null } }); yield put({ type: 'saveToken', payload: {} }); - yield put(history.push('/loginOee')); + history.push('/loginOee'); message.destroy(); message.error(msg, ERROR_MSG_DURATION); } else { @@ -400,11 +401,11 @@ export default { yield put({ type: 'saveWebSocket', payload: { webSocket: null } }); yield put({ type: 'saveToken', payload: {} }); if (loginOutType === 'loginOut') { - yield put(history.push('/login')); + history.push('/login'); } else if (loginOutType === 'loginMobileOut') { - yield put(history.push('/loginMobile')); + history.push('/loginMobile'); } else if (loginOutType === 'loginOeeOut') { - yield put(history.push('/loginOee')); + history.push('/loginOee'); } } else if (loginOutType === 'loginOut') { yield put({ type: 'throwError', payload: data }); @@ -434,7 +435,7 @@ export default { if (editPwdType === 'mobile') { if (data.code === 1) { // Toast.success(data.msg, 1); - yield put(history.push('loginMobile')); + history.push('loginMobile'); } else { // Toast.fail(data.msg, 1); // yield put({ type: 'throwError', payload: data }); @@ -442,14 +443,14 @@ export default { } else if (editPwdType === 'window') { if (data.code === 1) { message.success(data.msg); - yield put(history.push('/login')); + history.push('/login'); } else { yield put({ type: 'throwError', payload: data }); } } else if (editPwdType === 'oee') { if (data.code === 1) { message.success(data.msg); - yield put(history.push('/loginOee')); + history.push('/loginOee'); } else { yield put({ type: 'throwError', payload: data }); } @@ -461,7 +462,7 @@ export default { const { data } = yield call(services.postValueService, token, value, url); if (data.code === 1) { message.success(data.msg); - yield put(history.push('/login')); + history.push('/login'); } else { yield put({ type: 'throwError', payload: data }); } diff --git a/src/routes/indexCenter/indexCenter.js b/src/routes/indexCenter/indexCenter.js index edf8335..c4422a7 100644 --- a/src/routes/indexCenter/indexCenter.js +++ b/src/routes/indexCenter/indexCenter.js @@ -1,4 +1,4 @@ -import { connect } from 'dva'; +import { connect } from 'umi'; import IndexCenterComponent from '../../components/IndexCenter/IndexCenter'; function IndexCenter({ diff --git a/src/routes/indexPage.js b/src/routes/indexPage.js index badb787..3b29e3b 100644 --- a/src/routes/indexPage.js +++ b/src/routes/indexPage.js @@ -1,5 +1,4 @@ -import React from 'react'; -import { connect } from 'dva'; +import { connect } from 'umi'; import { ConfigProvider, Layout } from 'antd-v4'; import zhCN from 'antd-v4/lib/locale-provider/zh_CN'; // import Search from '../components/Common/Search'; diff --git a/src/routes/login/login.js b/src/routes/login/login.js index 7f98968..7d526b7 100644 --- a/src/routes/login/login.js +++ b/src/routes/login/login.js @@ -1,4 +1,4 @@ -import { connect } from 'dva'; +import { connect } from 'umi'; import LoginComponent from '../../components/login/Login'; function Login({ dispatch, login }) { diff --git a/src/routes/menuPanel/menuPanel.js b/src/routes/menuPanel/menuPanel.js index 81d088b..1ff21e6 100644 --- a/src/routes/menuPanel/menuPanel.js +++ b/src/routes/menuPanel/menuPanel.js @@ -1,5 +1,4 @@ -import React from 'react'; -import { connect } from 'dva'; +import { connect } from 'umi'; import MenuPanelComponent from '../../components/MenuPanel/MenuPanel'; function MenuPanel({ dispatch, menuPanel, app }) { diff --git a/src/routes/personCenter/personCenter.js b/src/routes/personCenter/personCenter.js index 7e4d298..349add1 100644 --- a/src/routes/personCenter/personCenter.js +++ b/src/routes/personCenter/personCenter.js @@ -1,5 +1,4 @@ -import React from 'react'; -import { connect } from 'dva'; +import { connect } from 'umi'; import PersonCenterComponent from '@/components/Common/PersonCenter/PersonCenter'; function personCenter({ dispatch, menuPanel, app }) { diff --git a/src/routes/tab/tab.js b/src/routes/tab/tab.js index 960ca97..0ddad7e 100644 --- a/src/routes/tab/tab.js +++ b/src/routes/tab/tab.js @@ -1,5 +1,4 @@ -import React from 'react'; -import { connect } from 'dva'; +import { connect } from 'umi'; import { Icon as LegacyIcon } from '@ant-design/compatible'; import { ExclamationCircleOutlined } from '@ant-design/icons'; import { Tabs, Modal } from 'antd'; diff --git a/src/services/services.js b/src/services/services.js index b659154..959df7f 100644 --- a/src/services/services.js +++ b/src/services/services.js @@ -10,7 +10,6 @@ export function getService(token, url, app = undefined) { }, }; const result = request(url, options, app); - console.log('=====result', result); return result; } catch (e) { console.log(e.message); @@ -28,11 +27,8 @@ export function postValueService(token, value, url, app) { }, body: JSON.stringify(value), }; - const result = request(url, options, app); - console.log('=====result1', url, result); - return result; + return request(url, options, app); } catch (e) { - console.log('=====result11', e); console.log(e.message); return {}; } diff --git a/src/utils/request.js b/src/utils/request.js index 8ac71f4..998eac3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,4 +1,3 @@ -// import { fetch } from 'dva'; function parseJSON(response) { return response.json(); -- libgit2 0.22.2