From c8b315b0d94d0642490e97ca8eb706b4a46b937f Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 13 Feb 2023 15:20:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2.13=20=E5=BC=82=E5=B8=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=89=A9=E5=B1=95=E5=88=B020=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ElecEvaluation/Monitor/Exception/index.tsx | 2 +- src/pages/ElecEvaluation/Monitor/Home/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx index 70ae7d8..63e104a 100644 --- a/src/pages/ElecEvaluation/Monitor/Exception/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Exception/index.tsx @@ -176,7 +176,7 @@ const MonitorException: React.FC<{}> = () => { } useEffect(() => { if (auth.current) { - const params = { pageNo: 1, pageSize: 10 }; + const params = { pageNo: 1, pageSize: 20 }; getNoOpenNumber(); getThreeDayNoEnd(params, 0); getNoOpenList(params, 0); diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx index 8db9329..16e9b02 100644 --- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx @@ -1773,7 +1773,7 @@ const MonitorHome: React.FC<{}> = () => { 标段总数  {isNotEmpty(todayOpeningData?.sectionNumber) ? todayOpeningData?.sectionNumber : 0}  开标完成率  {isNotEmpty(todayOpeningData?.sectionNumber) && todayOpeningData?.sectionNumber != "0" ? Number(((Number(todayOpeningData?.banner) / todayOpeningData?.sectionNumber) * 100).toFixed(0)) : 0}%  评标完成率  {(isNotEmpty(todayInfoData?.sectionNumber) && todayInfoData?.sectionNumber != "0") ? Number(((Number(todayInfoData?.resultNumber) / todayInfoData?.sectionNumber) * 100).toFixed(0)) : 0}%} />
- +
{ window.open("/ElecMonitor/Supplier") }}> From 53296be985907870887d0b7937a830f9c30dc269 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Wed, 15 Feb 2023 09:38:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2.15=203.0=E5=8D=95=E7=82=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=952.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/GlobalHeader/RightContent.tsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx index 070cf13..d8073d9 100644 --- a/src/components/GlobalHeader/RightContent.tsx +++ b/src/components/GlobalHeader/RightContent.tsx @@ -1,6 +1,6 @@ import { Avatar, Dropdown, Menu, message, Modal } from 'antd'; import { DownOutlined, UserOutlined, UserSwitchOutlined, CarryOutOutlined, HomeOutlined, ImportOutlined } from '@ant-design/icons'; -import React, { useEffect } from 'react'; +import React, { useEffect, useRef } from 'react'; import moment from 'moment' import { connect, history } from 'umi'; import { ConnectState } from '@/models/connect'; @@ -8,11 +8,13 @@ import logo from '../../assets/logo.svg'; import './index.less'; import { getMenu, getLogout } from './services' import { getSessionUserData } from "@/utils/session"; +import { getToSecondUrl } from '@/pages/LoadingPage/service'; const GlobalHeaderRight: React.FC<{}> = (props) => { // let className = styles.right; let data = getSessionUserData(); const [dataMenu, setDataMenu] = React.useState([]); + const urlRef = useRef(null); const handelRole = (item: any) => { sessionStorage.setItem('roleData', JSON.stringify(item)); sessionStorage.setItem('roleAuthority', JSON.stringify([item.roleCode])); @@ -74,13 +76,23 @@ const GlobalHeaderRight: React.FC<{}> = (props) => { ); + useEffect(() => { + const getUrl = async () => { + const response = await getToSecondUrl(); + if (response?.success) { + urlRef.current = response?.data; + } + } + getUrl(); + }, []) + return (
中国联通智慧供应链平台 ｜ 招标采购中心
    - {/*
  • window.open(REACT_APP_MALL_V2_URL)}>交易平台2.0
    • */} +
  • { urlRef.current && window.open(urlRef.current); }}>交易平台2.0
  • history.push('/Dashboard')}>首页
  • {moment().format("YYYY-MM-DD")}
    • {data?.organizationName == null ? null : (
  • {data?.organizationName}
    • )} From 5437ab15a68aba6762eae6ad4a016c7308b3d188 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Thu, 16 Feb 2023 15:03:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2.16=20=E4=B8=93=E5=AE=B6=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BC=B1=E5=8F=A3=E4=BB=A4=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/userformal/login/index.tsx | 119 ++++++++++++++------------- 1 file changed, 61 insertions(+), 58 deletions(-) diff --git a/src/pages/userformal/login/index.tsx b/src/pages/userformal/login/index.tsx index 47eb909..d20c59d 100644 --- a/src/pages/userformal/login/index.tsx +++ b/src/pages/userformal/login/index.tsx @@ -309,10 +309,10 @@ const Index: React.FC<{}> = () => { } const handleOk = () => { // 确定修改密码 - if (changeForm.getFieldValue("newPassword") !== changeForm.getFieldValue("newPassword1")) { - message.warn('两次密码输入不一致，请重新输入') - } else { - changeForm.validateFields().then(res => { + changeForm.validateFields().then(res => { + if (changeForm.getFieldValue("newPassword") !== changeForm.getFieldValue("newPassword1")) { + message.warn('两次密码输入不一致，请重新输入') + } else { setSping(true); const date = { identityCard: changeForm.getFieldValue("identityCard"), @@ -330,9 +330,9 @@ const Index: React.FC<{}> = () => { } }).finally(() => { setSping(false); - });; - }) - } + }); + } + }) } //浏览器类型 const BrowserType = () => { @@ -652,62 +652,65 @@ const Index: React.FC<{}> = () => { { + // const oNumber = new RegExp(/\d/); + // const oLetter = new RegExp(/[a-zA-Z]/); + // const oSpecial = '.~!@#$%^&*()_+=-{}|:<>?,./[]-;\\"'; + // if (!value) { + // callback('请输入新密码'); + // return; + // } + // if (value.length < 6) { + // callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); + // return; + // } + // try { + // [...value].forEach(val => { + // if ( + // !( + // oNumber.test(val) || + // oLetter.test(val) || + // oSpecial.indexOf(val) >= 0 + // ) + // ) { + // throw new Error(); + // } + // }); + // } catch (e) { + // callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); + // } + // const contain: boolean[] = []; + // [...value].forEach(val => { + // if (oNumber.test(val)) { + // contain[0] = true; + // } + // if (oLetter.test(val)) { + // contain[1] = true; + // } + // if (oSpecial.indexOf(val) >= 0) { + // contain[2] = true; + // } + // }); + // if (contain.filter(item => item === true).length < 2) { + // callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); + // return; + // } + // callback(); + // } + // } + // ]} rules={[ { required: true, - validator: (rule, value, callback) => { - const oNumber = new RegExp(/\d/); - const oLetter = new RegExp(/[a-zA-Z]/); - const oSpecial = '.~!@#$%^&*()_+=-{}|:<>?,./[]-;\\"'; - if (!value) { - callback('请输入新密码'); - return; - } - if (value.length < 6) { - callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); - return; - } - try { - [...value].forEach(val => { - if ( - !( - oNumber.test(val) || - oLetter.test(val) || - oSpecial.indexOf(val) >= 0 - ) - ) { - throw new Error(); - } - }); - } catch (e) { - callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); - } - const contain: boolean[] = []; - [...value].forEach(val => { - if (oNumber.test(val)) { - contain[0] = true; - } - if (oLetter.test(val)) { - contain[1] = true; - } - if (oSpecial.indexOf(val) >= 0) { - contain[2] = true; - } - }); - if (contain.filter(item => item === true).length < 2) { - callback('密码不能小于六位，至少含字母、数字、特殊字符其中的2种！'); - return; - } - callback(); - } + message: '请输入新密码', + }, { + pattern: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[`~!@#$%^&*()\-_=+\\|[{}\];:'",<.>/?])[a-zA-Z0-9`~!@#$%^&*()\-_=+\\|[{}\];:'",<.>/?]{8,20}$/, + message: "密码不符合规则，密码长度8-20位，必须包含大小写字母、数字和特殊字符", } ]} - // rules={[ - // { - // required: true, - // message: '请输入新密码', - // }, - // ]} > From b028f8643b3a014631491731d60af7ae4ae05500 Mon Sep 17 00:00:00 2001 From: jl-zhoujl2 Date: Mon, 20 Feb 2023 16:12:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2.20=20=E6=BB=9A=E5=8A=A8=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E5=BF=AB=E4=BA=86=EF=BC=8Cchrome=E5=8F=AF=E4=BB=A5=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ElecEvaluation/Monitor/Home/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx index 16e9b02..c968aed 100644 --- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx @@ -487,7 +487,7 @@ export const ScrollTable = (props: { dataSource: any[], columns: any[], ynum?: n // 只有当大于10条数据的时候 才会看起滚动 const v = document.getElementsByClassName("ant-table-body")[tableKey]; timer.current = setInterval(() => { - v.scrollTop += 0.5; + v.scrollTop += 1; if ( Math.ceil(v.scrollTop) >= parseFloat((v.scrollHeight - v.clientHeight).toString()) ) {