Commit 2635a093 authored by wangxuelai's avatar wangxuelai

'最新代码提交'

parent 3459aa54
......@@ -694,7 +694,7 @@ class CallStudentsForm extends React.Component {
</Row>
}
</Col>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }} style={{ marginBottom: '24px' }}>
<Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 12 }} style={{ marginBottom: '14px' }}>
<Row type="flex">
<Input
suffix={
......@@ -731,7 +731,7 @@ class CallStudentsForm extends React.Component {
zIndex={111}
>
<Row gutter={21}>
<Col lg={{ span: 8 }} md={{ span: 12 }} xs={{ span: 24 }} className={pageStyle.endsearchcol}>
<Col lg={{ span: 8 }} md={{ span: 12 }} xs={{ span: 24 }} style={{ marginBottom: '14px' }} className={pageStyle.endsearchcol}>
<Input
placeholder="搜索学员"
value={linshiStudentSearchName}
......@@ -787,7 +787,7 @@ class CallStudentsForm extends React.Component {
width={773}
zIndex={111}
>
<Row gutter={21}>
<Row gutter={21} style={{ marginBottom: '14px' }}>
<Col lg={{ span: 8 }} md={{ span: 12 }} xs={{ span: 24 }} className={pageStyle.endsearchcol}>
<Input placeholder="搜索学员" value={bukeStudentSearchName} allowClear onChange={this.bukeStudentSearchNameChange} suffix={<Icon type="search" />} />
</Col>
......
......@@ -19,7 +19,7 @@ html {
overflow: auto;
}
body {
font-size: inherit;
// font-size: inherit;
font-family: @font-family;
line-height: @line-height;
......
......@@ -81,7 +81,7 @@ class CommentEditorBox extends React.Component {
<div className={pageStyle.gobackdraw}>
<div onClick={() => gobackDraw()} >
<Icon type="left" className={pageStyle.gobackicon} />
<a href="javascript:;">返回涂鸦</a>
<span className="hreflink" style={{ paddingLeft: '5px' }}>返回涂鸦</span>
</div>
<Icon type="close" onClick={() => closeDrawer()} className={pageStyle.closeicon} />
</div>
......@@ -152,7 +152,7 @@ class CommentEditorBox extends React.Component {
{((commentParams.common.audio && commentParams.common.audio.length > 0) || commentParams.common.audio.src) &&
<div className={pageStyle.teacheraudiobox} style={{ display: 'flex', alignItems: 'center', marginBottom: '12px' }}>
<audio controls id={commentParams.privite.audio.src} src={audioorigin(commentParams.privite.audio.src)} />
<a style={{ marginLeft: '10px' }} href="javascript:;" onClick={delCommonAudio}>删除</a>
<span style={{ marginLeft: '10px' }} className="hreflink" onClick={delCommonAudio}>删除</span>
</div>
}
<div className={pageStyle.operatebox}>
......@@ -189,7 +189,7 @@ class CommentEditorBox extends React.Component {
{((commentParams.privite.audio && commentParams.privite.audio.length > 0) || commentParams.privite.audio.src) &&
<div className={pageStyle.teacheraudiobox} style={{ display: 'flex', alignItems: 'center' }}>
<audio controls id={commentParams.privite.audio.src} src={audioorigin(commentParams.privite.audio.src)} />
<a style={{ marginLeft: '10px' }} href="javascript:;" onClick={delPriviteAudio}>删除</a>
<span style={{ marginLeft: '10px' }} className="hreflink" onClick={delPriviteAudio}>删除</span>
</div>
}
</div>
......
......@@ -151,9 +151,9 @@ class HeadquarterMgtForm extends React.Component {
</div>
) : (
<div>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.goSchoolSystem(record)}>查看校区</a>
<span className="hreflink" onClick={() => this.goSchoolSystem(record)}>查看校区</span>
<span className={pageStyle.divideline}>|</span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.showDeleteConfirm(record.id)}>移除校区</a>
<span className="hreflink" onClick={() => this.showDeleteConfirm(record.id)}>移除校区</span>
</div>
)}
</div>
......
......@@ -71,9 +71,9 @@ class StoreMgt extends React.Component {
return (
<Tooltip title={text}>
<a href="javascript:;">
<span className="hreflink">
{text.substr(0, 10)}
</a>
</span>
</Tooltip>
);
},
......
......@@ -72,7 +72,7 @@ class ThemeEditor extends React.Component {
<div className={pageStyle.imgwrap}>
<div className={pageStyle.uploadimgwrap}> <img alt={item.type} className={pageStyle.teacheruploadimg} src={imagify(item.value)} /></div>
<div className={pageStyle.imghide}>
<a title="预览文件" onClick={() => this.priviewImg(item.value)} href="javascript:;" ><Icon style={{ color: '#fff' }} type="eye" /> 预览</a>
<span title="预览文件" onClick={() => this.priviewImg(item.value)} ><Icon style={{ color: '#fff' }} type="eye" /> 预览</span>
</div>
<div className={pageStyle.toolList}>
{ index === 0 && <div aria-disabled="true" className={pageStyle.noup}><img src={upImg} alt="" /> </div> }
......
......@@ -273,7 +273,7 @@ class StudentAddForm extends React.Component {
})(
<span>{operator.nickname}</span>,
)}
<a href="javascript:;" className={pageStyle.changeOperate} onClick={() => toChangeOperator(true)}>修改</a>
<span className={`${pageStyle.changeOperate} hreflink`} onClick={() => toChangeOperator(true)}>修改</span>
</Form.Item>
</Col>
</Row>
......
......@@ -658,19 +658,19 @@ class StudentMgt extends React.Component {
<div className={pageStyle.tableoperatebox}>
{ hasBtnPower('sjd/studentinfo', 'addCourseHours') &&
<span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.toRenewCourse(record)}>续课</a>
<span className="hreflink" onClick={() => this.toRenewCourse(record)}>续课</span>
<span className={pageStyle.divideline}>|</span>
</span>
}
{ hasBtnPower('sjd/studentinfo', 'changeCourse') && record.surplus > 0 &&
<span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.toChangeCourse(record)} >转课</a>
<span className="hreflink" onClick={() => this.toChangeCourse(record)} >转课</span>
<span className={pageStyle.divideline}>|</span>
</span>
}
{ hasBtnPower('sjd/studentinfo', 'quitCourse') && record.surplus > 0 &&
<span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.showDeleteConfirm(record.id)}>退课</a>
<span className="hreflink" onClick={() => this.showDeleteConfirm(record.id)}>退课</span>
</span>
}
</div>
......@@ -687,7 +687,7 @@ class StudentMgt extends React.Component {
return (
<div className={pageStyle.classNamebox}>
{record.classes && record.classes.length == 0 && '无'}
{record.classes && record.classes.length > 0 && record.classes.map(ele => (<div>{ele.title}</div>))}
{record.classes && record.classes.length > 0 && record.classes.map(ele => (<div key={ele.id}>{ele.title}</div>))}
</div>
);
},
......@@ -737,7 +737,7 @@ class StudentMgt extends React.Component {
<Col xs={{ span: 12 }} sm={{ span: 19 }} lg={{ span: 19 }} xl={{ span: 16 }} xxl={{ span: 12 }}>
<Descriptions>
<Descriptions.Item label="姓名" className={pageStyle.item}>{studentsdetail.name}</Descriptions.Item>
<Descriptions.Item label="微信绑定" className={pageStyle.item}>{studentsdetail.consumer_id == 0 ? '未绑定' : <div><span>已绑定</span><a href="javascript:;" onClick={this.unbindWx} style={{ paddingLeft: '10px' }}>解除绑定</a></div>}</Descriptions.Item>
<Descriptions.Item label="微信绑定" className={pageStyle.item}>{studentsdetail.consumer_id == 0 ? '未绑定' : <div><span>已绑定</span><span className="hreflink" onClick={this.unbindWx} style={{ paddingLeft: '10px' }}>解除绑定</span></div>}</Descriptions.Item>
<Descriptions.Item label="备用电话" className={pageStyle.item}>{studentsdetail.reserve_mobile}</Descriptions.Item>
</Descriptions>
<Descriptions>
......
......@@ -532,7 +532,7 @@ class teachersForm extends React.Component {
render: (text, record, index) => {
return (
<div className={pageStyle.tableoperatebox}>
{!record.call_time ? <div>未点名</div> : <a href="javascript:;" onClick={() => this.showCallDetail(record)}>已点名</a>}
{!record.call_time ? <div>未点名</div> : <span className="hreflink" onClick={() => this.showCallDetail(record)}>已点名</span>}
</div>
);
},
......@@ -605,18 +605,18 @@ class teachersForm extends React.Component {
render: (text, record, index) => {
return (
<div className={pageStyle.tableoperatebox}>
{hasBtnPower('sjd/teacherinfo', 'callStudnet') && record.call_time && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.toEditCallStudents(record)}>已点名</a>}
{hasBtnPower('sjd/teacherinfo', 'callStudnet') && !record.call_time && <a className={pageStyle.alink} href="javascript:;" onClick={() => this.toCallStudents(record)}>点名</a>}
{hasBtnPower('sjd/teacherinfo', 'callStudnet') && record.call_time && <span className="hreflink" onClick={() => this.toEditCallStudents(record)}>已点名</span>}
{hasBtnPower('sjd/teacherinfo', 'callStudnet') && !record.call_time && <span className="hreflink" onClick={() => this.toCallStudents(record)}>点名</span>}
{ hasBtnPower('sjd/teacherinfo', 'changeCourse') &&
<span>
<span className={pageStyle.divideline}>|</span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.changeSchedule(record)}>调课</a>
<span className="hreflink" onClick={() => this.changeSchedule(record)}>调课</span>
</span>
}
{ hasBtnPower('sjd/teacherinfo', 'removePlan') &&
<span>
<span className={pageStyle.divideline}>|</span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.scheduleDel(record)}>删除</a>
<span className="hreflink" onClick={() => this.scheduleDel(record)}>删除</span>
</span>
}
</div>
......@@ -680,7 +680,7 @@ class teachersForm extends React.Component {
key: 'course',
render: (text, record, index) => {
return (
<a href="javascript:;" onClick={() => this.sureChangeStudentSchedule(record)}>调课</a>
<span className="hreflink" onClick={() => this.sureChangeStudentSchedule(record)}>调课</span>
);
},
},
......@@ -740,9 +740,9 @@ class teachersForm extends React.Component {
'暂无备注'
:
<Tooltip title={record.remark}>
<a href="javascript:;">
<span className="hreflink">
{record.remark.substr(0, 10)}
</a>
</span>
</Tooltip>
);
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment