forked from Gitlink/forgeplus-react
修复issue
This commit is contained in:
谢思
parent
b9682b9235
commit
c20332b7a3
|
|
@ -4,7 +4,7 @@ import './index.scss';
|
|||
|
||||
export default (props) => {
|
||||
const {className, loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex, expandIconAsCell, onShowSizeChange, showSizeChanger, pagination, scroll,pageSize } = props;
|
||||
console.log(total);
|
||||
|
||||
return (
|
||||
<div className={`pagination-table ${className}`}>
|
||||
<Table
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ const Qz2022 = (props) => {
|
|||
{/* 交流互动 */}
|
||||
<Route path="/competition/qz2022/chat"
|
||||
render={
|
||||
() => (<Chat {...props} />)
|
||||
() => (<Chat {...props} isLoacl={qzDetail && qzDetail.is_local}/>)
|
||||
}
|
||||
></Route>
|
||||
{/* 联系我们 */}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import React, {useState, useCallback} from "react";
|
||||
import { Input, Select, Button, Form, message, Radio } from 'antd';
|
||||
import {enrollCompetition} from '../api';
|
||||
import {httpUrl} from '../fetch';
|
||||
import {current_main_site_url} from '../fetch';
|
||||
import EditTable from "../editTable";
|
||||
import apply_top from "../image/apply_top.png";
|
||||
import apply_down from "../image/apply_down.png";
|
||||
|
|
@ -201,20 +201,20 @@ export default Form.create()((props) => {
|
|||
{enrollStatus && enrollStatus.enroll_status && <div className="info">
|
||||
<div><span>参赛单位 : </span>{enrollStatus && enrollStatus.enroll_info.org_name}</div>
|
||||
<div className="info-right"><span>参赛团队负责人姓名 : </span>{enrollStatus && enrollStatus.enroll_info.leader}</div>
|
||||
<div><span>职务 : </span>{enrollStatus && enrollStatus.enroll_info.org_job}</div>
|
||||
<div className="info-right"><span>JXJXJX : </span>{enrollStatus && enrollStatus.enroll_info.org_rank}</div>
|
||||
{qzDetail && qzDetail.is_local && <div><span>职务 : </span>{enrollStatus && enrollStatus.enroll_info.org_job}</div>}
|
||||
{qzDetail && qzDetail.is_local && <div className="info-right"><span>JXJXJX : </span>{enrollStatus && enrollStatus.enroll_info.org_rank}</div>}
|
||||
<div><span>赛区 : </span>{enrollStatus && enrollStatus.enroll_info.zone}</div>
|
||||
<div className="info-right"><span>赛项 : </span>{enrollStatus && enrollStatus.enroll_info.sub_competition}</div>
|
||||
<div><span>课题来源 : </span>{enrollStatus && enrollStatus.enroll_info.subject_source_type === 0 ? "自主提报" : enrollStatus.enroll_info.subject_source_name}</div>
|
||||
<div><span>电话 : </span>{enrollStatus && enrollStatus.enroll_info.phone}</div>
|
||||
<div className="info-right ellipsis_div"><span>成员 : </span>{enrollStatus && enrollStatus.enroll_info.members && enrollStatus.enroll_info.members.map(item=>{return item.real_name + ','})}</div>
|
||||
{qzDetail && qzDetail.is_local && <div><span>课题来源 : </span>{enrollStatus && enrollStatus.enroll_info.subject_source_type === 0 ? "自主提报" : enrollStatus.enroll_info.subject_source_name}</div>}
|
||||
<div className={`${qzDetail && qzDetail.is_local ? '':'info_bottom'}`}><span>电话 : </span>{enrollStatus && enrollStatus.enroll_info.phone}</div>
|
||||
<div className={`info-right ${qzDetail && qzDetail.is_local ? 'ellipsis_div':''}`}><span>成员 : </span>{enrollStatus && enrollStatus.enroll_info.members && enrollStatus.enroll_info.members.map(item=>{return item.real_name + ','})}</div>
|
||||
</div>}
|
||||
</div>
|
||||
{!(enrollStatus && enrollStatus.enroll_status) && <div className="apply_but">
|
||||
<Button type="primary" className="submit_info" onClick={applySubmit}>
|
||||
提交资料
|
||||
</Button>
|
||||
<a href={httpUrl+'/busiAttachments/download/391'}><Button className="add_member download ml20">
|
||||
<a href={qzDetail && qzDetail.is_local ? 'http://osrem.jk:81/api/attachments/1963' : current_main_site_url+'/api/attachments/3715'}><Button className="add_member download ml20">
|
||||
下载报名表
|
||||
</Button></a>
|
||||
</div>}
|
||||
|
|
|
|||
|
|
@ -93,12 +93,9 @@
|
|||
padding-left: 40px;
|
||||
line-height: 44px;
|
||||
}
|
||||
.ellipsis_div{
|
||||
width: 100%;
|
||||
}
|
||||
.info-right{
|
||||
border-right: none;
|
||||
}
|
||||
.ellipsis_div{width: 100%;}
|
||||
.info_bottom{border-bottom: none;}
|
||||
.info-right{border-right: none;}
|
||||
& div:last-child{
|
||||
border-right: none;
|
||||
border-bottom: none;
|
||||
|
|
@ -116,6 +113,7 @@
|
|||
}
|
||||
.member_info .ant-table{
|
||||
margin-top: 20px;
|
||||
width: 73vw;
|
||||
.ant-form-item{
|
||||
width: 76%;
|
||||
margin: 0 0 10px 0;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import chat3 from '../image/chat3.png';
|
|||
import './index.scss';
|
||||
import '../../index.scss';
|
||||
|
||||
function Chat({ form, showNotification, match, history }) {
|
||||
function Chat({ isLoacl }) {
|
||||
|
||||
return (
|
||||
<div className="chat-bg">
|
||||
|
|
@ -22,27 +22,18 @@ function Chat({ form, showNotification, match, history }) {
|
|||
<p>汇聚赛事资讯</p>
|
||||
<p>助您第一时间解读竞赛动态，把握赛事脉搏</p>
|
||||
</div>
|
||||
{/* <div className="chat-btn" onClick={() => { window.open('https://fc.osredm.com/forums/theme/105') }}>
|
||||
<span className="detail1">了解详情</span>
|
||||
<img
|
||||
className="iconPlay1"
|
||||
src={btn}
|
||||
/>
|
||||
</div> */}
|
||||
</div>
|
||||
</div>
|
||||
{/* style={{display:'flex', width: '1200px', margin:'30px auto',padding: '0 120px',justifyContent: 'space-between', background: 'white'}} */}
|
||||
{/* style={{display:'flex',alignItems: 'center'}} */}
|
||||
<div className="links">
|
||||
<div onClick={() => { window.open('https://fc.osredm.com/forums/theme/107') }}>
|
||||
<div onClick={() => { window.open(isLoacl ? 'http://www.osredm.jk/forums/theme/76' : 'https://fc.osredm.com/forums/theme/107') }}>
|
||||
<img src={chat1}></img>
|
||||
<div>参赛咨询</div>
|
||||
</div>
|
||||
<div onClick={() => { window.open('https://fc.osredm.com/forums/theme/108') }}>
|
||||
<div onClick={() => { window.open(isLoacl ? 'http://www.osredm.jk/forums/theme/77' : 'https://fc.osredm.com/forums/theme/108') }}>
|
||||
<img src={chat2}></img>
|
||||
<div>选手交流</div>
|
||||
</div>
|
||||
<div onClick={() => { window.open('https://fc.osredm.com/forums/theme/109') }}>
|
||||
<div onClick={() => { window.open(isLoacl ? 'http://www.osredm.jk/forums/theme/78' : 'https://fc.osredm.com/forums/theme/109') }}>
|
||||
<img src={chat3}></img>
|
||||
<div>专家答疑</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ function Introduce({history:{location:{pathname}},qzDetail }) {
|
|||
{
|
||||
title: '参赛单位',
|
||||
dataIndex: 'org_name',
|
||||
width: '10%',
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
|
|
@ -149,17 +148,17 @@ function Introduce({history:{location:{pathname}},qzDetail }) {
|
|||
const expandRow = (record) =>{
|
||||
return <div className="expandRowManage">
|
||||
<div className="row">
|
||||
<div>序号</div>
|
||||
<div className="index">序号</div>
|
||||
<div>姓名</div>
|
||||
<div className="job">单位</div>
|
||||
<div>单位</div>
|
||||
<div>职务</div>
|
||||
<div>军衔</div>
|
||||
</div>
|
||||
{record.members && record.members.map((item, index)=>{
|
||||
return <div className="row">
|
||||
<div>{index+1}</div>
|
||||
<div className="index">{index+1}</div>
|
||||
<div>{item.real_name}</div>
|
||||
<div className="job">{item.org_job}</div>
|
||||
<div>{item.org_job}</div>
|
||||
<div>{item.org_rank}</div>
|
||||
<div>{item.org_name}</div>
|
||||
</div>
|
||||
|
|
@ -230,7 +229,7 @@ function Introduce({history:{location:{pathname}},qzDetail }) {
|
|||
setCurPage={(page)=>setCurPage(page)}
|
||||
current={curPage}
|
||||
expandedRowRender={qzDetail && qzDetail.is_local ? expandRow : expandRowWai}
|
||||
expandIconColumnIndex={8}
|
||||
expandIconColumnIndex={qzDetail && qzDetail.is_local ? 8 : 5}
|
||||
expandIconAsCell={false}
|
||||
expandIcon={customExpandIcon}
|
||||
pageSize={10}/>
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
}
|
||||
.expandRowManage .row div{
|
||||
display: inline-block;
|
||||
width: 17%;
|
||||
text-align: center;
|
||||
padding-top: 15px;
|
||||
&.job{width: 30%;}
|
||||
&:first-child{
|
||||
padding-top: 0;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
width: 20%;
|
||||
margin-right: 20px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
&.index{width: 6%;}
|
||||
}
|
||||
.expandRowManage .row{
|
||||
border-bottom: 1px solid #ececec;
|
||||
|
|
|
|||
Loading…
Reference in New Issue