diff --git a/config/router_partyMemberTopic.ts b/config/router_partyMemberTopic.ts index 1c828bd..c6dbf23 100644 --- a/config/router_partyMemberTopic.ts +++ b/config/router_partyMemberTopic.ts @@ -8,11 +8,16 @@ export default [ path: '/partyMemberTopic/home', component: './PartyMemberTopic/Home', }, - { //物资采购与管理专业线 党支部 + { //物资采购与管理专业线 党支部 省分 name: 'partyBranch', path: '/partyMemberTopic/partyBranch', component: './PartyMemberTopic/PartyBranch', }, + { //物资采购与管理专业线 党支部数据 + name: 'partyBranches', + path: '/partyMemberTopic/partyBranches', + component: './PartyMemberTopic/PartyBranches', + }, { //物资采购与管理专业线 党支部人员信息 name: 'personInfor', path: '/partyMemberTopic/personInfor', diff --git a/src/assets/topic/topic_fist.png b/src/assets/topic/topic_fist.png new file mode 100644 index 0000000..54b1307 Binary files /dev/null and b/src/assets/topic/topic_fist.png differ diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx index 81c117e..87cc0d5 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx +++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx @@ -22,8 +22,7 @@ const PersonInfor: React.FC<{}> = () => { setLoading(true); getGracefulList({ param: value }).then(async res => { if (res?.code == 200) { - const data = await getImageUrl(res?.data, 'image', topic_activity_default); - setGracefulList(data); + setGracefulList(res?.data); setPage(1); } }).finally(() => { @@ -89,7 +88,7 @@ const PersonInfor: React.FC<{}> = () => { renderItem={item => (
- +

clickTitle(item)}>{item.title}

{item.secordTitle}

{item.createTime} diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less index f6064c4..8b559f8 100644 --- a/src/pages/PartyMemberTopic/Home/index.less +++ b/src/pages/PartyMemberTopic/Home/index.less @@ -80,7 +80,7 @@ .left-activity-marquee { height: 103px; width: 940px; - padding-left: 45px; + padding-left: 25px; .left-activity-scroll { height: 103px; @@ -89,12 +89,12 @@ align-items: center; .left-activity-scroll-content { - font-size: 18px; + font-size: 17px; color: #fff; margin-right: 20px; .left-activity-scroll-end { - margin-top: 4px; + margin-top: 2px; } } @@ -119,6 +119,14 @@ font-size: 28px; } + + .left-card-fist { + vertical-align: text-bottom; + position: relative; + top: 3px; + margin-right: 6px; + } + .left-card-flag { vertical-align: text-bottom; position: relative; @@ -362,6 +370,27 @@ background: #fff; padding: 16px 24px 28px; + .bottom-select { + margin-bottom: 24px; + + .bottom-select-label { + margin-right: 6px; + font-size: 14px; + font-weight: bold; + } + + .ant-tag-checkable-checked { + background-color: #da3232; + } + } + + .bottom-select .bottom-select-tag { + font-size: 14px; + padding: 0 9px; + line-height: 27px; + margin-right: 6px; + } + .left-card-top { display: flex; justify-content: space-between; @@ -515,13 +544,11 @@ padding: 0 20px; .bottom-modal-headertext { - font-size: 20px; + font-size: 21px; font-family: '黑体'; color: #fff; width: 100%; - text-align: center; - position: relative; - right: 20px; + margin-left: 8px; } } } @@ -534,49 +561,81 @@ } .topic-home-modal .ant-modal-content .ant-modal-body .bottom-modal-body { - display: flex; - flex-direction: column; - align-items: center; + // display: flex; + // flex-direction: column; + // align-items: center; - .radio-group { - width: 300px; - margin-bottom: 12px; + // .radio-group { + // width: 300px; + // margin-bottom: 12px; - .radio-content { - font-size: 17.16px; - font-family: '黑体'; - color: #939393; - margin-left: 16px; - } + // .radio-content { + // font-size: 17.16px; + // font-family: '黑体'; + // color: #939393; + // margin-left: 16px; + // } + // } + + // .bottom-modal-textarea { + // resize: none; + // border-radius: 8px; + // } + + // .bottom-modal-submit { + // display: flex; + // 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; + // margin-left: 8px; + // border-color: #d44026; + // } + // } + .ant-form-item { + margin-bottom: 16px; } - .bottom-modal-textarea { + .ant-form-item textarea { resize: none; - border-radius: 8px; + } + + .ant-form-item-label>label { + font-size: 17px; + font-family: '黑体'; + color: #939393; + } + + .radio-content { + font-size: 17px; + font-family: '黑体'; + color: #939393; + } + + .ant-input { + color: #333333; } .bottom-modal-submit { - display: flex; - 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; - } + text-align: center; .submit-button { - border-radius: 8px; - background: #d44026; - margin-left: 8px; - border-color: #d44026; + background: #da3232; + border-color: #da3232; } } } \ No newline at end of file diff --git a/src/pages/PartyMemberTopic/Home/index.tsx b/src/pages/PartyMemberTopic/Home/index.tsx index d529850..5499f16 100644 --- a/src/pages/PartyMemberTopic/Home/index.tsx +++ b/src/pages/PartyMemberTopic/Home/index.tsx @@ -1,11 +1,12 @@ import React, { useEffect, useRef, useState } from 'react'; import './index.less'; -import { Button, Carousel, Col, Divider, Input, List, message, Modal, Radio, RadioChangeEvent, Row, Spin, Tooltip } from 'antd'; +import { Button, Carousel, Col, Divider, Form, Input, List, message, Modal, Radio, Row, Space, Spin, Tag, Tooltip } from 'antd'; import * as echarts from 'echarts'; import Marquee from 'react-fast-marquee'; import topic_header from '@/assets/topic/topic_header.jpg' import topic_activity_logo from '@/assets/topic/topic_activity_logo.png' import topic_red_flag from '@/assets/topic/topic_red_flag.png' +import topic_fist from '@/assets/topic/topic_fist.png' import topic_other from '@/assets/topic/topic_other.png' import topic_project_picture from '@/assets/topic/topic_project_picture.jpg' import topic_bottom_button from '@/assets/topic/topic_bottom_button.png' @@ -24,7 +25,16 @@ import topic_interview from '@/assets/topic/topic_interview.png' import topic_assure from '@/assets/topic/topic_assure.png' import topic_difficult from '@/assets/topic/topic_difficult.png' import { getHomeActivity, getHomeBanner, getHomeContact, getHomeGraceful, getHomeProject, getHomeRight, submitAdvice } from './service'; -import { formatTime, getImageUrl, isEmpty, isNotEmpty } from '../utils'; +import { chunk, formatTime, getImageUrl } from '../utils'; +import ExtendUpload from '@/utils/ExtendUpload'; +import { getSessionUserData } from '@/utils/session'; + +const tagsData = ['集团总部', '北京', '天津', '河北', '山西', '内蒙古', '辽宁', '吉林', '黑龙江', '山东', '河南', '上海', '江苏', '浙江', '安徽', '福建', '江西', '湖北', '湖南', '广东', '广西', '海南', '重庆', '四川', '贵州', '云南', '西藏', '陕西', '甘肃', '青海', '宁夏', '新疆', '数字科技', '联通在线', '智网科技', '支付公司', '财务公司', '融资租赁', '时科（北京）信息']; + +const formItemLayout = { + labelCol: { span: 5 }, + wrapperCol: { span: 17 }, +}; //卡片头 const LeftCardTop = (props: any) => { @@ -32,8 +42,9 @@ const LeftCardTop = (props: any) => { <>
+ {props.code == "2" && } {props.title} - + {props.code != "2" && }
{props.url &&
window.open(props.url)}> 更多 @@ -153,39 +164,20 @@ const BottomCardContent = (props: any) => { //活动联系人-我要提意见Modal const CommentModal = (props: any) => { const { TextArea } = Input; + const [form] = Form.useForm(); const [modalLoading, setModalLoading] = useState(false); - const textRef = useRef(null); - const radioRef = useRef(null); - - const onRadioChange = (e: RadioChangeEvent) => { - radioRef.current = e.target.value; - }; - - const onTextChange = (e: any) => { - textRef.current = e.target.value; - }; - const onCancel = () => { props.closeModal(); - textRef.current = null; - radioRef.current = null; } - const onSubmit = async () => { - if (isEmpty(radioRef.current)) { - message.info("请选择意见类型"); - return; - } - if (isEmpty(textRef.current)) { - message.info("请先输入意见内容"); - return; - } + const onSubmit = () => { + form.submit(); + } + + const onFinish = async (values: any) => { setModalLoading(true); const params = { - contactName: props.data?.contactName, - contactId: props.data?.contactId, - suggestionType: radioRef.current, - suggestionContent: textRef.current, + ...values, } await submitAdvice(params).then(res => { if (res?.code == 200) { @@ -195,7 +187,14 @@ const CommentModal = (props: any) => { }).finally(() => { setModalLoading(false); }) - } + }; + useEffect(() => { + form.setFieldsValue({ + ...props.data, + name: props.userData?.fullName, + company: props.userData?.organizationName, + }) + }, [props.data?.id]) return ( { footer={null} centered maskStyle={{ backgroundColor: 'rgba(0, 0, 0, 0.3)' }} - width={450} + width={800} >
-
- - 网络运营 - IT - 市场 - 综合行政 - 其他 - -
-