diff --git a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx index aa114c4..ae91a83 100644 --- a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx @@ -453,7 +453,7 @@ const MonitorException: React.FC<{}> = () => {
- { setExceptionType("解密异常"); setModalListData(decryptData?.decryptExceptionList); setModalListVisible(true); }}>more} /> + { setExceptionType("解密异常"); setModalListData(decryptData?.decryptExceptionList ? decryptData?.decryptExceptionList : []); setModalListVisible(true); }}>more} />
@@ -465,7 +465,7 @@ const MonitorException: React.FC<{}> = () => {
- { setExceptionType("MAC地址重复"); setModalListData(decryptData?.macSameList); setModalListVisible(true); }}>more} /> + { setExceptionType("MAC地址重复"); setModalListData(decryptData?.macSameList ? decryptData?.macSameList : []); setModalListVisible(true); }}>more} />
diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx index ab51564..69ee5f5 100644 --- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx @@ -16,7 +16,7 @@ import './china'; import * as echarts from 'echarts'; import { getActiveSupplierAPI, getAnnoCountAPI, getAnnualAndTenderAgentAPI, getExpertNumberAPI, getMonitorListAPI, getOpeningListAPI, getReviewDistributionAPI, getSupplierCountAPI, getTodayOpeningAPI } from '../service'; import moment from 'moment'; -import { isNotEmpty } from '@/utils/CommonUtils'; +import { isEmpty, isNotEmpty } from '@/utils/CommonUtils'; import { getSessionUserData } from '@/utils/session'; import { history } from 'umi'; @@ -600,7 +600,7 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: }, axisLabel: { color: '#FFFFFF' }, // prettier-ignore - data: ['2022-8', '2022-9', '2022-10', '2022-11', '2022-12'], + data: chartData?.[3], } ], yAxis: [ @@ -1260,8 +1260,11 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: //角色校验 export const authCheck = () => { //获取角色列表 - const authorityList: any[] = getSessionUserData()?.authorityList; - if (authorityList.findIndex(item => item.roleCode == "ebtp-watcher") == -1) {//监看人员校验 + const authorityList: any[] | undefined = getSessionUserData()?.authorityList; + if (isEmpty(authorityList)) { + return false; + } + if (authorityList?.findIndex(item => item.roleCode == "ebtp-watcher") == -1) {//监看人员校验 history.replace({ pathname: "/401", query: { code: "405" } }); return false; } @@ -1288,11 +1291,11 @@ const MonitorHome: React.FC<{}> = () => { //年度&月度 year-年度 month-月度 const [ymChange, setYmChange] = useState("year"); //评标室监控 - const [monitorList, setMonitorList] = useState([]); + const [monitorList, setMonitorList] = useState([{ status: "3" }, { status: "3" }, { status: "3" }]); //权限校验 const auth = useRef(authCheck()); - const bidStatusMap = ["准备评标", "正在评标", "评标结束"]; - const statusColorMap = ["card-text-orange", "card-text-green", "card-text-purple"]; + const bidStatusMap = ["准备评标", "正在评标", "评标结束", "暂无数据"]; + const statusColorMap = ["card-text-orange", "card-text-green", "card-text-purple", "card-text-white"]; const mapChart = useMemo(() => { return reviewDistributionData.length > 0 && }, [reviewDistributionData]) @@ -1391,6 +1394,9 @@ const MonitorHome: React.FC<{}> = () => { } //监控室点击事件 const onCardClick = (item: any) => { + if (item.status == "3") { + return; + } if (item.status == "0") { message.info("当前评标室未开启，请等待开启后查看"); return; @@ -1467,14 +1473,14 @@ const MonitorHome: React.FC<{}> = () => { {/*
*/} {monitorList.map((item, index) => ( - + {/*
*/}
onCardClick(item)}>
{bidStatusMap[item.status]}
- {item.projectName} + {item?.projectName}
{/*
*/} diff --git a/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx b/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx index 6d96a9c..3d67160 100644 --- a/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/OpenToday/index.tsx @@ -227,15 +227,15 @@ const OpenToday: React.FC<{}> = () => {
{ }} rightClick={() => { setExceptionType("解密异常"); setModalListData(isNotEmpty(decryptSuccessRateTodayData?.decryptFailProjectList) ? decryptSuccessRateTodayData?.decryptFailProjectList : []); setModalListVisible(true); }} /> - { setExceptionType(null); setModalListData(noOpenListTwo); setModalListVisible(true); }} rightClick={() => { setExceptionType(null); setModalListData(noOpenListFive); setModalListVisible(true); }} /> - { setExceptionType(null); setModalListData(unopenSixData); setModalListVisible(true); }} rightClick={() => { setExceptionType(null); setModalListData(unopenTenData); setModalListVisible(true); }} /> + { setExceptionType(null); setModalListData(noOpenListTwo); setModalListVisible(true); }} rightClick={() => { setExceptionType(null); setModalListData(noOpenListFive); setModalListVisible(true); }} /> + { setExceptionType(null); setModalListData(unopenSixData); setModalListVisible(true); }} rightClick={() => { setExceptionType(null); setModalListData(unopenTenData); setModalListVisible(true); }} />
- +
diff --git a/src/pages/ElecEvaluation/Monitor/TenderAgent/index.tsx b/src/pages/ElecEvaluation/Monitor/TenderAgent/index.tsx index 96456f6..b817e07 100644 --- a/src/pages/ElecEvaluation/Monitor/TenderAgent/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/TenderAgent/index.tsx @@ -102,12 +102,14 @@ const TenderAgent: React.FC<{}> = () => { const wclList: any[] = []; const dlxmsList: any[] = []; const dlxmysList: any[] = []; - data.slice(7, 12).forEach((item: any) => { + const monthList: any[] = []; + data.slice(1, 6).forEach((item: any) => { wclList.push(Number((item.wcl * 100).toFixed(1))); dlxmsList.push(item.dlxms); dlxmysList.push(Number(item.dlxmys.toFixed(2))); + monthList.push(item.monthDate); }); - const monthDataMap = [wclList, dlxmsList, dlxmysList]; + const monthDataMap = [wclList, dlxmsList, dlxmysList, monthList]; setMonthData(monthDataMap) const selectData: any[] = res?.data.agencyList.map((item: any) => ({ label: item.agencyName, value: item.agencyId }));//右侧代理机构下拉 diff --git a/src/pages/ElecEvaluation/Monitor/style.less b/src/pages/ElecEvaluation/Monitor/style.less index 678f877..e802460 100644 --- a/src/pages/ElecEvaluation/Monitor/style.less +++ b/src/pages/ElecEvaluation/Monitor/style.less @@ -288,6 +288,11 @@ .card-text-orange; color: rgb(189, 16, 224); } + + .card-text-white { + .card-text-orange; + color: #fff; + } } .evaluation-text { @@ -1007,6 +1012,12 @@ } .monitor-select-dropdown { + + &>ul { + height: 99vh; + overflow-y: scroll; + } + .ant-dropdown-menu { background-color: #081a30; }