Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

调整设置弹框的样式+设为队长按钮的显示和操作

This commit is contained in:
caishi 2024-09-24 14:07:06 +08:00
parent 5403858c73
commit e89e8c30c7
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/Competitions/Entered/Enteredmodel/DownStudents.tsx
View File

@ -30,7 +30,8 @@ function DownStudent({students,setTeams,Teams,HeaderDetail}:DownStudent){
// console.log('students',Teams,item);
// return
let students=Teams;
students.push(item);
let temp = {...item,temporary:true}//temporary临时添加还未保存的队员不显示设为队长按钮
students.push(temp);
setTeams(students)
}}>
<img style={{marginLeft:'10px',marginRight:'3px'}} className={styles.loaderimg} src={`${item.image_url}`}/>

3
src/pages/Competitions/Entered/Enteredmodel/DownTeacher.tsx
View File

@ -28,7 +28,8 @@ function Downteacher({teachers,setTeams,Teams,HeaderDetail}:Downteacher){
return
}
let teachers=Teams;
teachers.push(item);
let temp = {...item,temporary:true}//temporary临时添加还未保存的队员不显示设为队长按钮
teachers.push(temp);
setTeams(teachers)
}}>
<img style={{marginLeft:'10px',marginRight:'3px'}} className={styles.loaderimg} src={`${item.image_url}`}/>

2
src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx
View File

@ -159,7 +159,7 @@ function Setmembers({ Membersshow,setClose,HeaderDetail, StaffDetail,setMembers,
setClose()
//selectlist('');
}}
width={900}
width={950}
>
<div className={styles.setmembers}>
<p>添加教师</p>

4
src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx
View File

@ -3,8 +3,8 @@ import styles from '../index.less'
function Teammember(){
return(
<div className={styles.teammember}>
<span className={styles.flex1}>头像</span>
<span className={styles.flex1}>姓名</span>
<span>头像</span>
<span className={`${styles.flex1} ml5`}>姓名</span>
<span className={styles.flex2}>手机</span>
<span className={styles.flex2}>Email</span>
<span className={styles.flex2}>学校/单位</span>

12
src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx
View File

@ -13,6 +13,8 @@ interface Teammember {
}
function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammember) {
console.log("valueTeams:",Teams);
const menuitem = () => (
<Menu onClick={() => {
setleader();
@ -51,11 +53,11 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe
return (
<div className={styles.teammembers}>
<span className={styles.flex1}><img className={styles.loaderimg} src={`${teamitem.image_url?.indexOf("http") > -1 ? teamitem.image_url : (ENV.IMG_SERVER + `/images/` + teamitem.image_url)}`} /></span>
<span className={styles.flex1}>{teamitem && teamitem.name.length > 6 ? teamitem.name.substring(0, 6) + '...' : teamitem.name}</span>
<span><img className={styles.loaderimg} src={`${teamitem.image_url?.indexOf("http") > -1 ? teamitem.image_url : (ENV.IMG_SERVER + `/images/` + teamitem.image_url)}`} /></span>
<span className={`${styles.flex1} ml5`}>{teamitem && teamitem.name.length > 6 ? teamitem.name.substring(0, 6) + '...' : teamitem.name}</span>
<span className={styles.flex2}>{teamitem && teamitem.phone || '- -'}</span>
<span className={styles.flex2}>{teamitem && teamitem.mail || '- -'}</span>
<span className={styles.flex2}>{teamitem && teamitem.school_name.length > 6 ? teamitem.school_name.substring(0, 6) + '...' : teamitem.school_name || '- - '}</span>
<span className={styles.flex2}>{teamitem && teamitem.school_name && teamitem.school_name.length > 6 ? teamitem.school_name.substring(0, 6) + '...' : teamitem.school_name || '- - '}</span>
<span className={styles.flex1}>{teamitem && teamitem.identity || '- -'}</span>
<span className={`${styles.flex2} ${styles.task_hide}`}>{teamitem && teamitem.student_id || '- -'}</span>
<span className={styles.flex2} style={{ color: teamitem && teamitem.role === "leader" ? '#1890FF' : '#1890FF', fontSize: '14px' }}>
@ -67,8 +69,8 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe
</Dropdown>} */}
</span>
<div className={styles.flex2}>
{/* <Popconfirm title="设置为队长，权限：编辑战队、设置战队成员、转移队长、删除战队" okText="确认" cancelText="取消" onConfirm={()=>setleader()}><span className={` ${styles.deleteitem}`}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '设为队长'}</span></Popconfirm> */}
<div className={styles.flex2} style={{textAlign:"center"}}>
{!teamitem?.temporary && <Popconfirm title="设置为队长，权限：编辑战队、设置战队成员、转移队长、删除战队" okText="确认" cancelText="取消" onConfirm={()=>setleader()}><span className={` ${styles.deleteitem}`} style={{marginLeft:"0px"}}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '设为队长'}</span></Popconfirm> }
<span style={{color:'#f73737'}} onClick={()=>deleteitem()} className={` ${styles.deleteitem}`}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '删除'}</span>
</div>
</div>

4
src/utils/fetch.ts
View File

@ -126,8 +126,8 @@ export default function request(url: string, option: any, flag?: boolean) {
let newOptions = { ...defaultOptions, ...options }
let eduHeader = {
'X-Edu-Signature':'47ceb295f3bf94da0b47e4876b7bbd59',
'X-Edu-Timestamp':'1724744339707',
'X-Edu-Signature':'b7e4aa591dc0b95429dbce0f138d8df4',
'X-Edu-Timestamp':'1726643948398',
'X-Edu-Type':'pc',
}