diff --git a/src/baseStyle.less b/src/baseStyle.less index c4f8cdf..e54feab 100644 --- a/src/baseStyle.less +++ b/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; diff --git a/src/components/BiddingRoom/index.js b/src/components/BiddingRoom/index.js index 95c56e0..70b42fc 100644 --- a/src/components/BiddingRoom/index.js +++ b/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'; diff --git a/src/components/Promenu/index.less b/src/components/Promenu/index.less index c0f0dd1..29e82c5 100644 --- a/src/components/Promenu/index.less +++ b/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 ; diff --git a/src/pages/BidEvaluation/Jury.js b/src/pages/BidEvaluation/Jury.js index 8fe7a0f..09dc3fb 100644 --- a/src/pages/BidEvaluation/Jury.js +++ b/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{ diff --git a/src/pages/BidEvaluation/manager.js b/src/pages/BidEvaluation/manager.js index d460a77..0faa1a5 100644 --- a/src/pages/BidEvaluation/manager.js +++ b/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() { diff --git a/src/pages/BidEvaluation/supplier.js b/src/pages/BidEvaluation/supplier.js index 8797235..1458803 100644 --- a/src/pages/BidEvaluation/supplier.js +++ b/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() { diff --git a/src/pages/Evaluation/BaseInf/index.tsx b/src/pages/Evaluation/BaseInf/index.tsx index 2385ce4..78efb5c 100644 --- a/src/pages/Evaluation/BaseInf/index.tsx +++ b/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 diff --git a/src/pages/Evaluation/BidDetailed/BidDetailedManager/BPR.js b/src/pages/Evaluation/BidDetailed/BidDetailedManager/BPR.js index 4c0f474..297f832 100644 --- a/src/pages/Evaluation/BidDetailed/BidDetailedManager/BPR.js +++ b/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'; diff --git a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/BPM.js b/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/BPM.js index 56282c5..cbeb7e4 100644 --- a/src/pages/Evaluation/BidPreliminary/BidPreliminaryManager/BPM.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/Jury.js b/src/pages/MainPage/ProjectManager/Jury.js index 5affae0..210aca0 100644 --- a/src/pages/MainPage/ProjectManager/Jury.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/disposalManager.js b/src/pages/MainPage/ProjectManager/disposalManager.js index 0ce3836..be21452 100644 --- a/src/pages/MainPage/ProjectManager/disposalManager.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/index.less b/src/pages/MainPage/ProjectManager/index.less index 742a75b..8afc3de 100644 --- a/src/pages/MainPage/ProjectManager/index.less +++ b/src/pages/MainPage/ProjectManager/index.less @@ -87,6 +87,9 @@ border-radius: 4px; } } + .cardtre { + height: 100%; + } } .topt::-webkit-scrollbar { width: 8px; diff --git a/src/pages/MainPage/ProjectManager/manager.js b/src/pages/MainPage/ProjectManager/manager.js index 7f25f07..e7c9a4d 100644 --- a/src/pages/MainPage/ProjectManager/manager.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/managerAdmin.js b/src/pages/MainPage/ProjectManager/managerAdmin.js index 01d7ce2..d298e95 100644 --- a/src/pages/MainPage/ProjectManager/managerAdmin.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/managerSubAdmin.js b/src/pages/MainPage/ProjectManager/managerSubAdmin.js index 14e3920..9a8e31e 100644 --- a/src/pages/MainPage/ProjectManager/managerSubAdmin.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/participants.js b/src/pages/MainPage/ProjectManager/participants.js index 89d8970..ec567b9 100644 --- a/src/pages/MainPage/ProjectManager/participants.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/purchaseManager.js b/src/pages/MainPage/ProjectManager/purchaseManager.js index 10a22c2..a6916cd 100644 --- a/src/pages/MainPage/ProjectManager/purchaseManager.js +++ b/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'; diff --git a/src/pages/MainPage/ProjectManager/supplier.js b/src/pages/MainPage/ProjectManager/supplier.js index d44a82b..77ccb3e 100644 --- a/src/pages/MainPage/ProjectManager/supplier.js +++ b/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'; diff --git a/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/BPR.js b/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/BPR.js index 22f0ca5..98d9e4a 100644 --- a/src/pages/ZBiXuan/EvaluationRoom/View/BidDetailedManager/BPR.js +++ b/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'; diff --git a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/BPR.js b/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/BPR.js index 9024113..102664b 100644 --- a/src/pages/ZBiXuan/EvaluationRoom/View/BidNumberManager/BPR.js +++ b/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';