优化代码；

zhangzzzz
1 parent af748ea6
Showing 11 changed files with 21 additions and 31 deletions
src/components/Common/PersonCenter/PersonCenter.js
src/components/IndexCenter/IndexCenter.js
src/models/app.js
src/routes/indexCenter/indexCenter.js
src/routes/indexPage.js
src/routes/login/login.js
src/routes/menuPanel/menuPanel.js
src/routes/personCenter/personCenter.js
src/routes/tab/tab.js
src/services/services.js
src/utils/request.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 = {
@@ -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`;
@@ -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 });
       }
-import { connect } from 'dva';
+import { connect } from 'umi';
 import IndexCenterComponent from '../../components/IndexCenter/IndexCenter';
  
 function IndexCenter({
-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';
-import { connect } from 'dva';
+import { connect } from 'umi';
 import LoginComponent from '../../components/login/Login';
  
 function Login({ dispatch, login }) {
-import React from 'react';
-import { connect } from 'dva';
+import { connect } from 'umi';
 import MenuPanelComponent from '../../components/MenuPanel/MenuPanel';
  
 function MenuPanel({ dispatch, menuPanel, app }) {
-import React from 'react';
-import { connect } from 'dva';
+import { connect } from 'umi';
 import PersonCenterComponent from '@/components/Common/PersonCenter/PersonCenter';
  
 function personCenter({ dispatch, menuPanel, app }) {
-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';
@@ -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 {};
   }
-// import { fetch } from 'dva';
  
 function parseJSON(response) {
   return response.json();