refactor(router): replace routerRedux with history for navigation

src/baseStyle.less

@@ -315,6 +315,7 @@ input::-webkit-outer-spin-button,
         &.ant-menu-item-only-child {
             padding-left: 40px !important;
             height: 56px;
+            line-height: 25px;
             margin: 0;
             padding-top: 16px;
             padding-bottom: 16px;

src/components/BiddingRoom/index.js

@@ -3,7 +3,6 @@ import { Link, history } from '@umijs/max';
 import './index.less';
 import styles from './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import React, { useState, useEffect, useReducer } from 'react';
 import { getSessionUserData, getRoomId, getRoomStatus, getProMethod, getSessionRoleData, getIPassDecode, getDefId, getProId, getOfflineStatusById } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';

src/components/Promenu/index.less

@@ -90,10 +90,10 @@
     min-width: 60px;
 }
 .horizontal-stepper .MuiStepIcon-completed {
-    color: #b30000 !important;
+    color: @primary-color !important;
 }
 .horizontal-stepper .MuiStepIcon-active {
-    color: #b30000 !important;
+    color: @primary-color !important;
 }
 .horizontal-stepper .MuiStep-completed {
     // min-width: 90px ;

src/pages/BidEvaluation/Jury.js

@@ -226,7 +226,6 @@ class Jury extends PureComponent {
           // 再跳转
           if(txt==1){
             // sessionStorage.setItem("roomId",record.id)
-            // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
             // history.push('/EvaRoom')
             window.open('/EvaRoom/Eva')
           }else{

src/pages/BidEvaluation/manager.js

@@ -7,7 +7,6 @@ import { getDictBidMethodDict, getProMethod, getRoomId, getDefId, getQuotationMe
 import { saveLeaderId, getJuryData, checkOpenBidSupplier, getPackageList, createReviewRoom, closingReviewRoom } from './components/service';
 import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getProId, getProSignDict } from '@/utils/session';
 import ReviewDevided from '@/pages/BidEvaluation/components/ReviewDevided';
 import CreateReviewRoom from '@/pages/BidEvaluation/components/CreateReviewRoom';
@@ -68,7 +67,6 @@ class manager extends PureComponent {
     sessionStorage.setItem("roomId", record.id)
     this.savePageAndParams();
     history.push(`/ProjectLayout/FlowConfig`)
-    // this.props.dispatch()
   }
   //查询评审室列表
   getManagerList = (params) => {
@@ -126,7 +124,6 @@ class manager extends PureComponent {
     sessionStorage.setItem("openTime", record.openTime)
     this.setState({ loading: true })
     await getQuotationMethodById(record.id)
-    // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
     this.setState({ loading: false })
     window.open(`/EvaRoom`)
   }
@@ -134,7 +131,6 @@ class manager extends PureComponent {
   onJurySet = (record) => {
     this.savePageAndParams();
     history.push({ pathname: '/ProjectLayout/JudgingPanel', state: { roomId: record.id, secId: record.sectionId, openTime: record.openTime } });
-    // this.props.dispatch(routerRedux.push(`/ProjectLayout/JudgingPanel?roomId=${record.id}&secId=${record.sectionId}&openTime=${record.openTime}`));
   }
   //创建评审室
   onCreateClick = async () => {
@@ -429,8 +425,7 @@ class manager extends PureComponent {
   }
   // 跳转组建评委会
   onRedirectRate = () => {
-    // this.props.dispatch(history.push('/JudgingPanel/list'))
+    history.push('/JudgingPanel/list')
-    history.push(`/JudgingPanel/list`)
   }
 
   render() {

src/pages/BidEvaluation/supplier.js

@@ -3,7 +3,6 @@ import { Divider, Button, Form, Card, Tabs, Table, Tooltip, Input, Select, Row,
 import './index.less';
 import { connect } from "dva";
 import { getProId, getProMethod, getDefId, getQuotationMethodById, getSessionUserData } from '@/utils/session';
-// import { routerRedux } from 'dva/router';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { btnAuthority } from '@/utils/authority';
 import { getMaxTurnSortSupplier } from './components/service';
@@ -72,7 +71,6 @@ class supplier extends PureComponent {
       sessionStorage.setItem("isBxOneSecondCustom", "0")
     }
     this.setState({ loading: false })
-    // this.props.dispatch(routerRedux.push('/ProjectLayout/EvaRoom'))
     window.open('/EvaRoom')
   }
   render() {

src/pages/Evaluation/BaseInf/index.tsx

@@ -6,7 +6,7 @@ import ProTable, { ProColumns } from '@ant-design/pro-table';
 import ReviewDevided from '@/pages/BidEvaluation/components/ReviewDevided';
 import { getRoomDataById } from '@/services/common';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-
+import '@/assets/zjl_style.less'
 /**
  * 评审室内页-基本信息
  * @author wuxianhui

src/pages/Evaluation/BidDetailed/BidDetailedManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 

src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/BPM.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Spin,Pagination} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 import { CheckOutlined, CloseOutlined } from '@ant-design/icons';

src/pages/MainPage/ProjectManager/Jury.js

@@ -4,7 +4,6 @@ import { history } from '@umijs/max';
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { jurySaveInfo, getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/disposalManager.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { auctionFollowUpAProjectManager, getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/index.less

@@ -87,6 +87,9 @@
       border-radius: 4px;
     }
   }
+  .cardtre {
+    height: 100%;
+  }
 }
 .topt::-webkit-scrollbar {
   width: 8px;

src/pages/MainPage/ProjectManager/manager.js

@@ -5,7 +5,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectManager, getSessionUserData  } from '@/utils/session';

src/pages/MainPage/ProjectManager/managerAdmin.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/managerSubAdmin.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/participants.js

@@ -4,7 +4,6 @@ import { Row, Col, Tooltip, Card, List, DatePicker, Button, Statistic, Spin, Emp
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { getRA } from '@/utils/session';

src/pages/MainPage/ProjectManager/purchaseManager.js

@@ -20,7 +20,6 @@ import {
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectManager, getRA, getSessionUserData } from '@/utils/session';

src/pages/MainPage/ProjectManager/supplier.js

@@ -5,7 +5,6 @@ import { history } from '@umijs/max';
 import { connect } from 'dva';
 import './index.less';
 import talkPng from '@/images/talk/talk.png';
-// import { routerRedux } from 'dva/router';
 import { RightOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { followUpAProjectSupplier, getSessionUserData,  getRA } from '@/utils/session';

src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';
 

src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/BPR.js

@@ -2,7 +2,6 @@ import React, {PureComponent} from 'react';
 import {Divider,Button,Form,Card,Tabs,Table,Tooltip,Input,Select,Row,Col,message,Modal,Pagination,Spin} from 'antd';
 // import './index.less';
 import { connect } from "dva";
-// import { routerRedux } from 'dva/router';
 import { getRoomId } from '@/utils/session';
 import { getURLInformation } from '@/utils/CommonUtils';