Zgna
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并何童崇代码

This commit is contained in:
谢思 2021-12-24 11:15:30 +08:00
parent 61bb8fdb8e 7e3fc9a412
commit a361415ebc
10 changed files with 76 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -119,7 +119,7 @@
},
"scripts": {
"start": "node --max_old_space_size=15360 scripts/start.js",
"build": "set NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
"build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
"test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
"pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
"gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",

5
src/home/SeventhSection/index.scss
View File

@ -3,7 +3,7 @@
text-align: center;
padding-top: 2.5em;
padding-bottom: 0.625em;
z-index: 100000;
z-index: 100;
margin-bottom: -0.625em;
border-bottom: 1px solid #cbdcff;
.seventh-main {
@ -15,7 +15,6 @@
height: 31.25em;
left: 0;
bottom: 2.5em;
// z-index: 10;
.client {
position: absolute;
width: 6.25em;
@ -130,7 +129,7 @@
.slick-list {
width: 33.75em;
margin: 0 auto;
z-index: 10000;
z-index: 1001;
}
.issue-item {
text-align: center;

4
src/military/components/ModalFun/index.jsx
View File

@ -65,7 +65,7 @@ function renderModal(props) {
} else if (type === 'confirm') {
return <InitModal title="选择" afterClose={destroy} {...props} />
} else if (type === 'info') {
return <InitModal title="选择" afterClose={destroy} {...props} okText="知道了"/>
return <InitModal title="选择" afterClose={destroy} {...props} okText="知道了" cancelButtonProps={""}/>
} else {
return <InitModal title="选择" afterClose={destroy} {...props} />
}
@ -119,7 +119,7 @@ function InitModal({
<Button type="default" key="back" onClick={onCancelModal}>
{cancelText}
</Button>,
<Button className="foot-submit" key="submit" onClick={onSuccess}>
<Button type="primary" className="foot-submit" key="submit" onClick={onSuccess}>
{okText}
</Button>,
]}

28
src/military/components/ModalFun/index.scss
View File

@ -46,17 +46,25 @@
width: 6rem;
}
}
.foot-submit {
.ant-btn-primary {
margin-left: 3rem;
color: #4154F1;
&:hover {
border-color: #4154F1;
background: #4154f1;
border-color: #4154f1;
&:hover,
&:active,
&:focus {
background: #5d6eff;
border-color: #5d6eff;
}
}
.ant-btn-default:hover,
.ant-btn-default:active,
.ant-btn-default:focus {
background: #5d6eff;
border-color: #5d6eff;
.ant-btn-default {
&:hover,
&:active,
&:focus {
color: #5d6eff;
border-color: #5d6eff;
}
}
}
}

11
src/military/expert/expertList/index.jsx
View File

@ -205,6 +205,15 @@ function RegisterList({ showNotification }) {
}
}
function exportList(){
Info({
title: '提示',
content: <div className="import-important">
hhhh
</div>,
});
}
const upload = {
name: 'file',
action: `${httpUrl}/api/experts/registerByExcel`,
@ -263,7 +272,7 @@ function RegisterList({ showNotification }) {
>
<button className="but41_fill">导入</button>
</Upload>
<button className="but41_fill">导出</button>
<button className="but41_fill" onClick={exportList}>导出</button>
</div>
</div>
<Paginationtable

2
src/military/expert/index.scss
View File

@ -45,7 +45,7 @@
.ant-btn-primary {
background-color: #4154f1;
border-color: #4154f1;
&:hover {
&:hover,&:active,&:focus {
background-color: #5d6eff;
border-color: #5d6eff;
}

20
src/military/expert/register/index.jsx
View File

@ -27,6 +27,8 @@ export default Form.create()(({ match, history, showNotification, form, current_
const [honorList, setHonorList] = useState([]);
const [honorIds, setHonorIds] = useState();
const [reload, setReload] = useState();
// 获取列表
useEffect(() => {
let params = {};
@ -85,7 +87,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
}
}
});
}, []);
}, [reload]);
function getFiles(ids) {
let idArr = ids.split(',');
@ -171,8 +173,10 @@ export default Form.create()(({ match, history, showNotification, form, current_
academicAchievements: achievementIds,
honors: honorIds,
userId: current_user.user_id,
status: -1,
};
if (lastRegister) {
if (lastRegister && [2,3].includes(lastRegister.status)) {
expertUpdate({
...params,
id: lastRegister.id
@ -210,6 +214,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
if (res && res.message && (res.message.indexOf("成功") > -1 || res.message.indexOf("更新") > -1)) {
showNotification("操作成功");
setSubmitConfirmValue(false);
setReload(Math.random());
} else {
showNotification(res && res.message || "操作失败");
}
@ -218,7 +223,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
return (
<div className="centerbox detail">
<div className="navigation">
<span>专家评审系统</span>&nbsp;&gt;&nbsp;<span>登记专家资料</span>
<span>专家评审系统</span>&nbsp;&gt;&nbsp;<span>{lastRegister && lastRegister.status === -1 ? "您的资料正在审核，请稍候" : "登记专家资料"}</span>
</div>
<div className='center_flex'>
<div className='register_left'>
@ -445,9 +450,12 @@ export default Form.create()(({ match, history, showNotification, form, current_
</div>
</Form>
<div className='buts'>
<button className="but41_fill mr20" disabled={lastRegister && lastRegister.status === '-1'} onClick={() => expertRegisterSubmit(true)}>提交资料</button>
<button className="but41_border mr20" disabled={lastRegister && lastRegister.status === '-1'} onClick={draft}>保存资料</button>
<button className="butE3_border" onClick={() => setCancelConfirmValue(true)}>取消</button>
{/* <button className="but41_fill mr20" disabled={lastRegister && lastRegister.status === -1} onClick={() => expertRegisterSubmit(true)}>提交资料</button>
<button className="but41_border mr20" disabled={lastRegister && lastRegister.status === -1} onClick={draft}>保存资料</button>
<button className="butE3_border" onClick={() => setCancelConfirmValue(true)}>取消</button> */}
<Button className="but41_fill mr20" type="primary" disabled={lastRegister && lastRegister.status === -1} onClick={() => expertRegisterSubmit(true)}>提交资料</Button>
<Button className="but41_border mr20" disabled={lastRegister && lastRegister.status === -1} onClick={draft}>保存资料</Button>
<Button className="butE3_border" onClick={() => setCancelConfirmValue(true)}>取消</Button>
<Modal
title="提交资料"

19
src/military/expert/register/index.scss
View File

@ -1,13 +1,13 @@
.centerbox.detail{
.centerbox.detail {
font-size: 20px;
.navigation{
.navigation {
font-size: 0.6em;
margin: -35px 0 15px;
}
.center_flex{
.center_flex {
display: flex;
justify-content: space-between;
.register_left{
.register_left {
height: 10em;
font-size: 0.7em;
background-color: white;
@ -16,9 +16,9 @@
.register_right{
width: 87.5%;
background-color: white;
&>p{
border-bottom: 1px solid #EEEEEE;
padding:.5em 2em;
& > p {
border-bottom: 1px solid #eeeeee;
padding: 0.5em 2em;
color: #181818;
font-size: 0.8em;
font-weight: bold;
@ -76,6 +76,7 @@
}
}
}
.expert_register .ant-select-dropdown-menu-item:hover, .ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled){
background-color: #F2F3FF;
.expert_register .ant-select-dropdown-menu-item:hover,
.ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled) {
background-color: #f2f3ff;
}

34
src/military/expert/selectExpert/index.jsx
View File

@ -12,11 +12,10 @@ const { Option } = Select;
const { Search } = Input;
function SelectExpert(props) {
console.log('选择专家', props);
const { form, location } = props;
const { history, showNotification, form, location } = props;
const { getFieldDecorator, setFieldsValue, getFieldsValue } = form;
const { taskRecord } = location && location.state;
console.log('信息',taskRecord);
console.log('信息', taskRecord);
// const TaskDetail = (
// <div>
@ -148,16 +147,16 @@ function SelectExpert(props) {
okText: '确定',
cancelText: '取消',
onOk() {
registerCheck({
expertId: record.id,
isPassed: checkStatus,
userId: record.userId,
}).then(res => {
if (res.message === 'success') {
showNotification('操作成功!');
setReload(Math.random());
}
});
// registerCheck({
// expertId: record.id,
// isPassed: checkStatus,
// userId: record.userId,
// }).then(res => {
// if (res.message === 'success') {
// showNotification('操作成功!');
// setReload(Math.random());
// }
// });
},
});
}
@ -254,7 +253,7 @@ function SelectExpert(props) {
{professionalType.map(item => {
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>)}
</Select>)}
</Form.Item>
<Form.Item label="评审领域：">
{getFieldDecorator('reviewAreaSel', {})(
@ -263,7 +262,7 @@ function SelectExpert(props) {
{reviewArea.map(item => {
return <Option key={item.value} value={item.value}>{item.label}</Option>
})}
</Select>)}
</Select>)}
</Form.Item>
</Form>
<button className="butE3_border ml120 mb25" onClick={() => {
@ -274,7 +273,8 @@ function SelectExpert(props) {
searchInput: '',
expertType: 'all',
reviewAreaSel: 'all'
});}}>清除</button>
});
}}>清除</button>
</div>
<Paginationtable
loading={loading}
@ -286,7 +286,7 @@ function SelectExpert(props) {
// rowSelection={selectExperts ? rowSelection : null}
rowSelection={rowSelection}
expandedRowRender={record => <p style={{ margin: 0 }}>{record.graduatedFrom}</p>}
expandIconColumnIndex={10}
expandIconColumnIndex={5}
expandIconAsCell={false}
/>
</TabPane>

2
src/modules/tpm/NewHeader.js
View File

@ -835,7 +835,7 @@ class NewHeader extends Component {
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && (
activeIndex ?
<Button className="register-button" type="primary" size="large">免费注册</Button> :
<Button className="register-button" type="primary" size="large" ><a href={`${mygetHelmetapi2.new_course.register_url}`}>免费注册</a></Button> :
<span><em className="vertical-line"></em><a className={`ml5 ${activeIndex ? 'color-home' : 'color-grey-6'}`} href={`${mygetHelmetapi2.new_course.register_url}`} target="_blank">注册</a></span>
)
}