liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220704-tpo' into 'master'

Browse Source 
7.4 党建临时发版内容

See merge request eshop/fe_service_ebtp_frontend!160
This commit is contained in:
周建龙
2022-07-05 08:33:17 +08:00
parent ce9f1f04ed b310a0c165
commit fc9e58fd1e
6 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/topic/topic_assure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
src/assets/topic/topic_difficult.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/assets/topic/topic_firstline.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
src/assets/topic/topic_interview.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

38
src/pages/PartyMemberTopic/Home/index.less
View File

@ -308,6 +308,10 @@
color: #eb5527;
}
.number-purple {
color: #c06ad9;
}
.right-display-content-unit {
font-size: 12px;
margin-left: 5px;
@ -328,26 +332,26 @@
color: #c9c9c9;
}
.right-graph {
padding-top: 26px;
// .right-graph {
// padding-top: 26px;
.right-graph-title {
font-size: 17px;
text-align: center;
}
// .right-graph-title {
// font-size: 17px;
// text-align: center;
// }
.right-graph-subtitle {
color: #9e9e9e;
font-size: 12px;
text-align: center;
margin-top: 4px;
}
// .right-graph-subtitle {
// color: #9e9e9e;
// font-size: 12px;
// text-align: center;
// margin-top: 4px;
// }
.right-graph-content {
height: 250px;
width: 250px;
}
}
// .right-graph-content {
// height: 250px;
// width: 250px;
// }
// }
}

26
src/pages/PartyMemberTopic/Home/index.tsx
View File

@ -19,6 +19,10 @@ import topic_protocol from '@/assets/topic/topic_protocol.png'
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 topic_firstline from '@/assets/topic/topic_firstline.png'
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';
@ -168,6 +172,10 @@ const CommentModal = (props: any) => {
}
const onSubmit = async () => {
if (isEmpty(radioRef.current)) {
message.info("请选择意见类型");
return;
}
if (isEmpty(textRef.current)) {
message.info("请先输入意见内容");
return;
@ -212,7 +220,7 @@ const CommentModal = (props: any) => {
<Spin spinning={modalLoading}>
<div className='bottom-modal-body'>
<div className='radio-group'>
<Radio.Group onChange={onRadioChange} defaultValue={"网络运营"}>
<Radio.Group onChange={onRadioChange} defaultValue={""}>
<Radio value="网络运营" className="radio-content">网络运营</Radio>
<Radio value="IT" className="radio-content">IT</Radio>
<Radio value="市场" className="radio-content">市场</Radio>
@ -331,8 +339,9 @@ const Home: React.FC<{}> = () => {
getHomeRight().then(res => {
if (res?.code == 200) {
if (res?.data.length > 0) {
setRightList(res?.data.slice(0, 6));
setRightGraphList(res?.data.slice(6, 9));
// setRightList(res?.data.slice(0, 6));
// setRightGraphList(res?.data.slice(6));
setRightList(res?.data);
}
}
})
@ -487,7 +496,7 @@ const Home: React.FC<{}> = () => {
<RightDisplayContent index={5} data={rightList} img={topic_protocol} color="number-orange" />
</div>
<Divider className='right-divider' />
{rightGraphList.length > 0 && rightGraphList.map(item => (
{/* {rightGraphList.length > 0 && rightGraphList.map(item => (
<div className='right-graph' key={item.dataClass}>
<div className='right-graph-title'>
{item.dataClass}
@ -499,7 +508,14 @@ const Home: React.FC<{}> = () => {
<RightGraphContent name={item.dataClass} type={item.dataType} data={item.data} />
</div>
</div>
))}
))} */}
<div className='right-display'>
<RightDisplayTitle title="党建攻坚活动情况" />
<RightDisplayContent index={6} data={rightList} img={topic_firstline} color="number-purple" />
<RightDisplayContent index={7} data={rightList} img={topic_interview} color="number-purple" />
<RightDisplayContent index={8} data={rightList} img={topic_assure} color="number-purple" />
<RightDisplayContent index={9} data={rightList} img={topic_difficult} color="number-purple" />
</div>
</div>
</div>
<div className='bottom-global'>