diff --git a/config/router_partyMemberTopic.ts b/config/router_partyMemberTopic.ts index 61303e1..1c828bd 100644 --- a/config/router_partyMemberTopic.ts +++ b/config/router_partyMemberTopic.ts @@ -1,10 +1,10 @@ export default [ { - name: 'partyMemberTopic', + name: '党建攻坚', path: '/partyMemberTopic', routes: [ {//首页 - name: 'home', + name: '首页', path: '/partyMemberTopic/home', component: './PartyMemberTopic/Home', }, diff --git a/src/assets/topic/branch.png b/src/assets/topic/branch.png new file mode 100644 index 0000000..9f288e5 Binary files /dev/null and b/src/assets/topic/branch.png differ diff --git a/src/assets/topic/emblem.png b/src/assets/topic/emblem.png new file mode 100644 index 0000000..eaae6d3 Binary files /dev/null and b/src/assets/topic/emblem.png differ diff --git a/src/assets/topic/newsTempPic.jpg b/src/assets/topic/newsTempPic.jpg deleted file mode 100644 index af952b9..0000000 Binary files a/src/assets/topic/newsTempPic.jpg and /dev/null differ diff --git a/src/assets/topic/person.png b/src/assets/topic/person.png index 0a10418..778f805 100644 Binary files a/src/assets/topic/person.png and b/src/assets/topic/person.png differ diff --git a/src/assets/topic/topic_activity_default.jpg b/src/assets/topic/topic_activity_default.jpg index 50a80fb..389c1f1 100644 Binary files a/src/assets/topic/topic_activity_default.jpg and b/src/assets/topic/topic_activity_default.jpg differ diff --git a/src/assets/topic/topic_activity_default2.jpg b/src/assets/topic/topic_activity_default2.jpg deleted file mode 100644 index fac92f5..0000000 Binary files a/src/assets/topic/topic_activity_default2.jpg and /dev/null differ diff --git a/src/assets/topic/topic_banner_default.jpg b/src/assets/topic/topic_banner_default.jpg index 3161a23..e17a0ba 100644 Binary files a/src/assets/topic/topic_banner_default.jpg and b/src/assets/topic/topic_banner_default.jpg differ diff --git a/src/locales/zh-CN/menu.ts b/src/locales/zh-CN/menu.ts index fecbc1d..7979744 100644 --- a/src/locales/zh-CN/menu.ts +++ b/src/locales/zh-CN/menu.ts @@ -58,28 +58,28 @@ export default { 'menu.bidOpening': '开标', 'menu.bidOpening.openList': '开标列表', - 'menu.list.ProjectDocumentation':'项目管理', - 'menu.list.ProjectInformationManagement':'项目信息管理', - 'menu.list.ProjectComplaint':'异议投诉', + 'menu.list.ProjectDocumentation': '项目管理', + 'menu.list.ProjectInformationManagement': '项目信息管理', + 'menu.list.ProjectComplaint': '异议投诉', // 'menu.list.packageDivided':'标段划分', - 'menu.biddingInvitation':'投标邀请', - 'menu.biddingInvitation.biddingAnnouncement':'招标公告', - 'menu.biddingInvitation.responseFormat':'应答格式', - 'menu.list.packageInformation':'标包信息', - 'menu.profile.biddingAnnouncement':'招标公告', - 'menu.list.LookingForBusinessOpportunities':'寻找商机', - 'menu.list.IParticipate':'我要参与', - 'menu.list.DownloadPurchasingDocuments':'下载招标文件', - 'menu.list.SupplierQuestionsOrObjections':'供应商质疑或异议列表', - 'menu.supplierClarificationList':'供应商澄清列表', - 'menu.clarificationOfTheBid':'标中质询澄清列表', - 'menu.challengeListInTheIndex':'标中质询列表', - 'menu.clarifyTheList':'澄清列表', - 'menu.invitationLetter':'邀请函', - 'menu.mentionDoubtReply':'项目经理提疑回复列表', - 'menu.reviewResults.manager':'评审结果-项目经理', - 'menu.reviewResults.groupLeader':'评审结果-组长', - 'menu.reviewResults.jury':'评审结果-评委', + 'menu.biddingInvitation': '投标邀请', + 'menu.biddingInvitation.biddingAnnouncement': '招标公告', + 'menu.biddingInvitation.responseFormat': '应答格式', + 'menu.list.packageInformation': '标包信息', + 'menu.profile.biddingAnnouncement': '招标公告', + 'menu.list.LookingForBusinessOpportunities': '寻找商机', + 'menu.list.IParticipate': '我要参与', + 'menu.list.DownloadPurchasingDocuments': '下载招标文件', + 'menu.list.SupplierQuestionsOrObjections': '供应商质疑或异议列表', + 'menu.supplierClarificationList': '供应商澄清列表', + 'menu.clarificationOfTheBid': '标中质询澄清列表', + 'menu.challengeListInTheIndex': '标中质询列表', + 'menu.clarifyTheList': '澄清列表', + 'menu.invitationLetter': '邀请函', + 'menu.mentionDoubtReply': '项目经理提疑回复列表', + 'menu.reviewResults.manager': '评审结果-项目经理', + 'menu.reviewResults.groupLeader': '评审结果-组长', + 'menu.reviewResults.jury': '评审结果-评委', 'menu.Tender': '发标', 'menu.Tender.UploadResponse': '上传应答文件', @@ -161,15 +161,15 @@ export default { 'menu.Auction.AuctionLookingForInnerShot': '寻找内拍项目', 'menu.Auction.AuctionMyLookingForInnerShot': '我参与的内拍项目', 'menu.Auction.AuctionManagerProject': '我发起的内拍项目', - "menu.Auction.AuctionAnnouncementData":'公告信息', - "menu.Auction.AuctionInfoupdateManage":'公告信息2', + "menu.Auction.AuctionAnnouncementData": '公告信息', + "menu.Auction.AuctionInfoupdateManage": '公告信息2', //项目委托 'menu.entrust': '项目委托管理', 'menu.entrust.manager': '委托管理(管理员)', 'menu.entrust.operator': '委托管理(操作员)', - 'menu.entrust.mandatoryAdministration':'项目经理的委托管理', + 'menu.entrust.mandatoryAdministration': '项目经理的委托管理', //招标项目 'menu.bidManage': '招标项目管理', 'menu.bidManage.projectManage': '项目管理', @@ -182,13 +182,13 @@ export default { 'menu.Calibration.ViewNotice': '查看通知书', 'menu.BiddingDocumentsDecrypt': '投标文件查看',/*BiddingDocumentsDecrypt_pg*/ 'menu.BiddingDocumentsDecrypt.BiddingDocumentsDecrypt_pg': '投标文件查看页面', - 'menu.BidAssessmentResults':'评审结果', - 'menu.BidAssessmentResults.BidAssessmentResults_pg':'评审结果页面', - 'menu.BidPublicityResult':'结果公示', - 'menu.BidPublicityResult.BidPublicityResult_pg':'结果公示页面', - 'menu.NtkoPage':'weboffice', - 'menu.NtkoPage.NtkoPage_pg':'ntko', - 'menu.finance.RevenueRecognition':'收入确认审核（项目经理）', + 'menu.BidAssessmentResults': '评审结果', + 'menu.BidAssessmentResults.BidAssessmentResults_pg': '评审结果页面', + 'menu.BidPublicityResult': '结果公示', + 'menu.BidPublicityResult.BidPublicityResult_pg': '结果公示页面', + 'menu.NtkoPage': 'weboffice', + 'menu.NtkoPage.NtkoPage_pg': 'ntko', + 'menu.finance.RevenueRecognition': '收入确认审核（项目经理）', //发票管理 'menu.Invoice': '发票管理', 'menu.Invoice.InvoiceManager': '发票列表', @@ -222,4 +222,6 @@ export default { 'menu.Recruit.ProjectsInvolved': '你参与的项目', 'menu.Recruit.Find': '寻找商机', 'menu.Recruit.Letter': '邀请函', + //党建攻坚 + 'menu.topic.home': '党建攻坚', }; diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx index 52dee15..9a42d98 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx +++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx @@ -1,49 +1,30 @@ import React, { useEffect, useState } from 'react'; import '../Style/ld_style.less'; -import { Input, List, Pagination } from 'antd'; -import topic_activity_default2 from '@/assets/topic/topic_activity_default2.jpg' +import { Input, List, Spin } from 'antd'; +import topic_activity_default from '@/assets/topic/topic_activity_default.jpg' import time_icon from '@/assets/topic/timeIcon.png' import { getGracefulList } from './service'; -import { formatTime, getImageUrl } from '../utils'; +import { getImageUrl } from '../utils'; import { history } from 'umi'; const { Search } = Input; -const data = [ - { - title: '集团党支部', - name: '张三', - position: '党委书记', - }, - { - title: '集团党支部', - name: '李四', - position: '党委副书记', - }, - { - title: '集团党支部', - name: '李四', - position: '党委副书记', - }, - { - title: '集团党支部', - name: '李四', - position: '党委副书记', - } -]; - - - const PersonInfor: React.FC<{}> = () => { //graceful data const [gracefulList, setGracefulList] = useState([]); + //loading + const [loading, setLoading] = useState(false); + //get graceful - const getGracefulData = () => { - getGracefulList().then(async res => { + const getGracefulData = (value: string) => { + setLoading(true); + getGracefulList({ param: value }).then(async res => { if (res?.code == 200) { - const data = await getImageUrl(res?.data, 'image', topic_activity_default2); + const data = await getImageUrl(res?.data, 'image', topic_activity_default); setGracefulList(data); } + }).finally(() => { + setLoading(false); }) } //onclick @@ -61,7 +42,7 @@ const PersonInfor: React.FC<{}> = () => { } useEffect(() => { - getGracefulData(); + getGracefulData(''); }, []) return (
@@ -71,38 +52,41 @@ const PersonInfor: React.FC<{}> = () => { toGoBack()}>上一页
-
- 活动风采 -
- +
+ 活动风采 +
+ +
+
+
+ `共 ${total} 条`, + pageSize: 10, + }} + dataSource={gracefulList} + renderItem={item => ( + +
+ +

clickTitle(item)}>{item.title}

+

{item.secordTitle}

+ {item.createTime} +
+ + )} />
-
-
- `共 ${total} 条`, - pageSize: 10, - }} - dataSource={gracefulList} - renderItem={item => ( - -
- -

clickTitle(item)}>{item.title}

-

{item.content}

- {item.createTime} -
- - )} - /> -
+
) } diff --git a/src/pages/PartyMemberTopic/ActivityStyle/service.ts b/src/pages/PartyMemberTopic/ActivityStyle/service.ts index 773333c..3d9373a 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/service.ts +++ b/src/pages/PartyMemberTopic/ActivityStyle/service.ts @@ -1,6 +1,9 @@ import request from '@/utils/request'; //活动风采列表 -export async function getGracefulList() { - return request('/api/biz-service-ebtp-extend/v1/eventpartybranch/eventStyle/list'); +export async function getGracefulList(data: any) { + return request('/api/biz-service-ebtp-extend/v1/eventpartybranch/eventStyle/list', { + method: 'POST', + data: { ...data } + }); } \ No newline at end of file diff --git a/src/pages/PartyMemberTopic/HardDetail/index.tsx b/src/pages/PartyMemberTopic/HardDetail/index.tsx index ecc3213..11e0276 100644 --- a/src/pages/PartyMemberTopic/HardDetail/index.tsx +++ b/src/pages/PartyMemberTopic/HardDetail/index.tsx @@ -1,9 +1,12 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import '../Style/detailStyle.less'; import bannerProjectPic from '@/assets/topic/bannerProjectPic.jpg' import { history } from 'umi' +import { getDetailData } from '../utils'; const HardDetail: React.FC<{}> = () => { + //session detailData + const item = getDetailData(); //to home const toHome = () => { history.push("/partyMemberTopic/home"); @@ -18,12 +21,9 @@ const HardDetail: React.FC<{}> = () => { toHome()}>返回首页
-

党员先锋示范队“攻坚克难”活动项目计划书

+

{item?.title}

-

近期，中国联通牵头的 “新一代宽带无线移动通信网” 国家科技重大专项课题“面向工业制造的5G业务研发与试验”顺利通过工信部的结项验收。课题完成了5G网络和工业网络融合系统架构、工业场景5G网络应用指标、工业场景无线干扰和电磁兼容、工业边缘计算、融合互通、流量标识和拥塞控制等关键技术和解决方案研究，研制了面向工业设备的5G统一接入网关和CPE终端设备。

-

课题组在中兴滨江智能制造工厂和北汽福田诸城超卡工厂搭建了5G工业互联网试验验证平台，通过了第三方测试，实现生产现场的部署应用。滨江智能制造工厂采用UPF下沉到园区的5G本地专网方案，实现了智能制造现场的单板远程维修指导、云化AGV、机器视觉检测、沉浸式远程生产监控等业务的稳定应用。福田诸城超卡工厂采用5G公网方案，通过对覆盖厂区的5G网络进行优化配置，解决了保障工业视觉检测系统的时延和可靠性要求。同时，该研究也为广域网中确定性服务能力的实现积累了经验。

-

2021年，中国联通重磅推出CUBE-Net3.0网络创新体系研究，以打造新一代信息通信基础设施为己任，为产业互联网的发展提供高效确定的ICT融合服务。重大科技专项的研究内容作为CUBE-Net3.0体系下的重大创新工程之“面向确定性服务的定制网络研究项目”的重要组成部分，相关工作得到了未来网络党支部的大力支持。“面向确定性服务的定制网络研究项目”被列为支部的党建融合工程之一，部门负责人及支部委员密切关注课题进展，指导项目推进工作，党支部成员也积极建言献策，保障重大专项课题顺利完成结项验收。后续支部党建融合工程及项目团队将持续探索5G确定性网络关键技术，充分发挥5G高速率、低时延和大连接的能力，以打造高品质网络+业务一体化产品服务为导向，实现5G和工业应用的深度融合，助力行业用户提升生产效率，加快智能化转型步伐。

-

值此中国共产党成立100周年之际，研究院未来网络党支部将继续秉承敬业、精益、专注、创新的工匠精神，以更加饱满的工作热情、更加敬业的工作态度、更加务实的工作作风投入到研究工作中，以实际行动推动我国制造业向智能化转型升级，推动制造业高质量发展。

+
diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less index 4b8f5bd..9575719 100644 --- a/src/pages/PartyMemberTopic/Home/index.less +++ b/src/pages/PartyMemberTopic/Home/index.less @@ -33,6 +33,7 @@ background-size: 100%; display: flex; align-items: flex-end; + cursor: pointer; .carousel-textbg { display: flex; @@ -54,16 +55,15 @@ .carousel-text-click { font-size: 14px; margin-left: 10px; - cursor: pointer; - } - - .carousel-text-click:hover { - color: #fff; - text-decoration: underline; } } } } + + .carousel-content:hover { + -webkit-filter: brightness(105%); + filter: brightness(105%); + } } .left-carousel .slick-dots-bottom { @@ -151,7 +151,7 @@ .left-graceful { background: #fff; - padding: 24px 24px 50px; + padding: 16px 24px 50px; .left-graceful-bg { height: 198px; @@ -189,7 +189,7 @@ .left-project { margin-top: 20px; background: #fff; - padding: 24px 24px 40px; + padding: 16px 24px 40px; .left-project-content { display: flex; @@ -279,7 +279,7 @@ letter-spacing: 1px; .right-display-content-percentage { - margin-left: 12px; + margin-left: 8px; .right-display-content-percentage-increase { color: #28e099; @@ -317,6 +317,10 @@ } } + .right-display-content-pointer { + cursor: pointer; + } + } .right-divider { @@ -352,7 +356,7 @@ .bottom-global { margin: 0px 12px 84px; background: #fff; - padding: 24px 24px 28px; + padding: 16px 24px 28px; .left-card-top { display: flex; @@ -468,6 +472,12 @@ vertical-align: text-bottom; margin-left: 5px; } + + .bottom-close-icon { + transform: rotate(-90deg); + vertical-align: text-bottom; + margin-left: 5px; + } } } } @@ -508,18 +518,23 @@ border-bottom-left-radius: 8px; border-bottom-right-radius: 8px; background: #eeeeee; - padding: 12px; + padding: 16px; } .topic-home-modal .ant-modal-content .ant-modal-body .bottom-modal-body { + display: flex; + flex-direction: column; + align-items: center; + .radio-group { - padding: 0 40px 8px; + width: 260px; + margin-bottom: 12px; .radio-content { font-size: 17.16px; font-family: '黑体'; color: #939393; - margin-left: 12px; + margin-left: 16px; } } @@ -533,11 +548,18 @@ justify-content: space-between; align-items: center; margin-top: 8px; + width: 100%; .submit-text { color: #939393; } + .submit-cancelbutton { + border-radius: 8px; + border-color: #d44026; + color: #d44026; + } + .submit-button { border-radius: 8px; background: #d44026; diff --git a/src/pages/PartyMemberTopic/Home/index.tsx b/src/pages/PartyMemberTopic/Home/index.tsx index a2f4014..e792301 100644 --- a/src/pages/PartyMemberTopic/Home/index.tsx +++ b/src/pages/PartyMemberTopic/Home/index.tsx @@ -20,8 +20,9 @@ import topic_header_img from '@/assets/topic/topic_header_img.png' import topic_banner_default from '@/assets/topic/topic_banner_default.jpg' import topic_activity_default from '@/assets/topic/topic_activity_default.jpg' import { getHomeActivity, getHomeBanner, getHomeContact, getHomeGraceful, getHomeProject, getHomeRight, submitAdvice } from './service'; -import { formatTime, getImageUrl } from '../utils'; +import { formatTime, getImageUrl, isEmpty, isNotEmpty } from '../utils'; +//卡片头 const LeftCardTop = (props: any) => { return ( <> @@ -39,7 +40,7 @@ const LeftCardTop = (props: any) => { ) } - +//右侧专业线标题 const RightDisplayTitle = (props: any) => { return (
@@ -47,11 +48,18 @@ const RightDisplayTitle = (props: any) => {
) } - +//右侧专业线内容 const RightDisplayContent = (props: any) => { + const displayContentClick = () => { + if (props.index == 0) {//党员数量 + window.open("/partyMemberTopic/personInfor"); + } else if (props.index == 1) {//党支部数量 + window.open("/partyMemberTopic/partyBranch"); + } + } return ( props.data?.length > 0 ? ( -
+
displayContentClick()}>
@@ -74,7 +82,7 @@ const RightDisplayContent = (props: any) => { ) : null ) } - +//右侧图表内容 const RightGraphContent = (props: any) => { const random = Math.random().toString(); useEffect(() => { @@ -94,7 +102,7 @@ const RightGraphContent = (props: any) => { data: props.data, label: { formatter: props.type != null ? `{b}\n\n{c}${props.type} {d}%` : '{b}', - fontSize: 14, + fontSize: '90%', color: '#fff', position: 'inner', }, @@ -114,7 +122,7 @@ const RightGraphContent = (props: any) => {
) } - +//活动联系人卡片内容 const BottomCardContent = (props: any) => { return ( @@ -124,7 +132,7 @@ const BottomCardContent = (props: any) => {
{props.data.contactName} - ({props.data.remark}) + {isNotEmpty(props.data.remark) && ({props.data.remark})}
@@ -139,7 +147,7 @@ const BottomCardContent = (props: any) => { ) } - +//活动联系人-我要提意见Modal const CommentModal = (props: any) => { const { TextArea } = Input; const [modalLoading, setModalLoading] = useState(false); @@ -161,7 +169,7 @@ const CommentModal = (props: any) => { } const onSubmit = async () => { - if (textRef.current == '' || textRef.current == null) { + if (isEmpty(textRef.current)) { message.info("请先输入意见内容"); return; } @@ -200,7 +208,7 @@ const CommentModal = (props: any) => { footer={null} centered maskStyle={{ backgroundColor: 'rgba(0, 0, 0, 0.3)' }} - width={350} + width={450} >
@@ -213,20 +221,23 @@ const CommentModal = (props: any) => {