测试bug修改

master
wangxi 3 years ago
parent c20ae81309
commit fbe16b6f24

@ -63,7 +63,7 @@ const Qualification = () => {
return ( return (
<div className="qualification" style={{height:window.innerHeight-200,background:'#fff',width:'100%',padding:20}}> <div className="qualification" style={{height:window.innerHeight-200,background:'#fff',width:'100%',padding:20}}>
<div ><span className="title" onClick={()=>{history.push('/dashboard/workplace')}} style={{color:'#8C8C8C',cursor:'pointer',}}></span> / </div> <div ><span className="title" onClick={()=>{history.push('/dashboard/workplace')}} style={{color:'#8C8C8C',cursor:'pointer',}}></span> / / {examinationInfo?.examination_name}</div>
<div style={{paddingTop:'3rem',width:'20rem',margin:'0 auto'}}> <div style={{paddingTop:'3rem',width:'20rem',margin:'0 auto'}}>
<div className='condition' > <div className='condition' >
<div className='condition-title' ></div> <div className='condition-title' ></div>

@ -1,6 +1,6 @@
import type { FC } from 'react'; import type { FC } from 'react';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { Avatar, Card, Col, List, Skeleton, Row, Statistic, Descriptions, Progress, Table, Button } from 'antd'; import { Avatar, Card, Col, List, Skeleton, Row, Statistic, Descriptions, Progress, Table, Button ,Image} from 'antd';
import { Line, Radar } from '@ant-design/charts'; import { Line, Radar } from '@ant-design/charts';
import { Link, history, useRequest } from 'umi'; import { Link, history, useRequest } from 'umi';
import { PageContainer } from '@ant-design/pro-layout'; import { PageContainer } from '@ant-design/pro-layout';
@ -268,7 +268,8 @@ const Workplace: FC = () => {
className={styles.studyCard} className={styles.studyCard}
title="当前学习" title="当前学习"
loading={activitiesLoading} loading={activitiesLoading}
cover={<img alt="example" src={lastLearningList?.course_attachment_json?.img} />} // cover={<img alt="example" src={lastLearningList?.course_attachment_json?.img} />}
cover={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${lastLearningList?.subject_attachment_json?.url}`} fallback="../fallback.svg" />}
> >
<Descriptions title={lastLearningList?.course_name} layout='horizontal' column={1} > <Descriptions title={lastLearningList?.course_name} layout='horizontal' column={1} >
<Descriptions.Item label="主将人">{lastLearningList?.lecture_teacher}</Descriptions.Item> <Descriptions.Item label="主将人">{lastLearningList?.lecture_teacher}</Descriptions.Item>

@ -127,7 +127,7 @@ const CardList = () => {
</Card.Grid> </Card.Grid>
<Card.Grid hoverable={false} style={{width:'25%',textAlign:'center',boxShadow: 'none'}}> <Card.Grid hoverable={false} style={{width:'25%',textAlign:'center',boxShadow: 'none'}}>
<Button type="primary" <Button type="primary"
style={{width:'10rem',height:'5'}} style={{width:'10rem',height:'5rem'}}
onClick={() => { onClick={() => {
console.log('last_data', last_data) console.log('last_data', last_data)
const info = subject_data.subject_id + "," + cookie.load('person_id') const info = subject_data.subject_id + "," + cookie.load('person_id')

@ -123,6 +123,7 @@ export default () => {
<div className='condition-title' ></div> <div className='condition-title' ></div>
<div className='condition-text' style={{display:'inline-block',}} > <div className='condition-text' style={{display:'inline-block',}} >
<Input.Password maxLength='12' <Input.Password maxLength='12'
placeholder="输入内容"
value={oldPassWord} value={oldPassWord}
onChange={(e)=>{ onChange={(e)=>{
const strExp= /^[A-Za-z0-9]+$/; const strExp= /^[A-Za-z0-9]+$/;
@ -142,6 +143,7 @@ export default () => {
<div className='condition-text' style={{display:'inline-block',}} > <div className='condition-text' style={{display:'inline-block',}} >
<Input.Password maxLength='12' <Input.Password maxLength='12'
value={newPassWord} value={newPassWord}
placeholder="输入内容"
onChange={(e)=>{ onChange={(e)=>{
const strExp= /^[A-Za-z0-9]+$/; const strExp= /^[A-Za-z0-9]+$/;
if(strExp.test(e.target.value) || e.target.value===''){ if(strExp.test(e.target.value) || e.target.value===''){
@ -160,6 +162,7 @@ export default () => {
<div className='condition-text' style={{display:'inline-block',}} > <div className='condition-text' style={{display:'inline-block',}} >
<Input.Password maxLength='12' <Input.Password maxLength='12'
value={secondNewPassWord} value={secondNewPassWord}
placeholder="输入内容"
onChange={(e)=>{ onChange={(e)=>{
const strExp= /^[A-Za-z0-9]+$/; const strExp= /^[A-Za-z0-9]+$/;
if(strExp.test(e.target.value) || e.target.value===''){ if(strExp.test(e.target.value) || e.target.value===''){
@ -186,7 +189,7 @@ export default () => {
showConfirm(); showConfirm();
} }
}}></Button> }}></Button>
</div> </div>
</div> </div>

@ -123,6 +123,7 @@ export default () => {
/> />
<ProFormDatePicker name="birthday" <ProFormDatePicker name="birthday"
label="出生年月" label="出生年月"
picker="month"
fieldProps={{ fieldProps={{
format: 'YYYY-MM', format: 'YYYY-MM',
@ -131,8 +132,8 @@ export default () => {
rules={[{ required: true, message: '请选择出生年月' }]} rules={[{ required: true, message: '请选择出生年月' }]}
/> />
<ProFormText name="idCard" label="身份证号" width="sm" rules={[{ required: true, message: '请输入身份证号' },{len:18,message:'请输入18位身份证号'},{pattern:/^[0-9]+$/,message:'只允许输入数字'}]}/> <ProFormText name="idCard" label="身份证号" width="sm" rules={[{ required: true, message: '请输入身份证号' },{len:18,message:'请输入18位身份证号'},{pattern:/^[0-9]+$/,message:'只允许输入数字'}]}/>
<ProFormText name="address" label="家庭地址" rules={[{ required: true, message: '请输入家庭地址' }]}/> <ProFormText name="address" label="家庭地址" rules={[{ required: true, message: '请输入家庭地址' },{ whitespace: true },]}/>
<ProFormText name="contact" label="联系方式" width="lg" placeholder="联系方式" rules={[{ required: true, message: '请输入联系方式' },{len:11,message:'请输入11位联系方式'},{pattern:/^[0-9]+$/,message:'只允许输入数字'}]} /> <ProFormText name="contact" label="联系方式" width="lg" placeholder="联系方式" rules={[{ required: true, message: '请输入联系方式' },{ whitespace: true },{len:11,message:'请输入11位联系方式'},{pattern:/^[0-9]+$/,message:'只允许输入数字'}]} />
</Col> </Col>
<Col lg={12} md={12} sm={24}> <Col lg={12} md={12} sm={24}>
<ProFormText name="org" label="所在学校" width="md" placeholder="请填写" value={backInfo?.bureau_name} disabled /> <ProFormText name="org" label="所在学校" width="md" placeholder="请填写" value={backInfo?.bureau_name} disabled />
@ -150,14 +151,14 @@ export default () => {
value: '全日制本科', value: '全日制本科',
}, },
{ {
label: '硕士研究生及以上...', label: '硕士研究生及以上学历',
value: '硕士研究生及以上...', value: '硕士研究生及以上学历',
}, },
]} ]}
placeholder="请选择" placeholder="请选择"
/> />
<ProFormText name="graduation" label="毕业院校" rules={[{ required: true, message: '请输入毕业院校' }]}/> <ProFormText name="graduation" label="毕业院校" rules={[{ required: true, message: '请输入毕业院校' },{ whitespace: true },]}/>
<ProFormText name="major" label="专业" rules={[{ required: true, message: '请输入专业' }]}/> <ProFormText name="major" label="专业" rules={[{ required: true, message: '请输入专业' },{ whitespace: true },]}/>
<ProFormSelect <ProFormSelect
label='任教学科' label='任教学科'
name="subject" name="subject"

Loading…
Cancel
Save