m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug

Browse Source
dev_forum
caishi 6 years ago
parent bf12c79e3a
commit 99e86faa5b
12 changed files with 68 additions and 74 deletions
Show Stats Download Patch File Download Diff File

17
public/react/src/modules/courses/busyWork/UseBank.js
Unescape View File

@ -185,6 +185,9 @@ class UseBank extends Component{
align-items: center; align-items: center;
display: -webkit-flex; display: -webkit-flex;
} }
.setImgW .edu-nodata-img{
width:218px!important;
}
`}</style> `}</style>
@ -224,7 +227,7 @@ class UseBank extends Component{
></Search> ></Search>
</div> </div>
{ {
nav_my==='myself'? object_list && object_list.length == 0 && page == 1 ? "" : nav_my==='myself'?
<p className="color-grey-6 mb25 edu-txt-center">选用对象：你在课堂{engNameMap[object_type]}列表中已<span className="color-orange-tip">“加入题库”</span>的{engNameMap[object_type]}</p> <p className="color-grey-6 mb25 edu-txt-center">选用对象：你在课堂{engNameMap[object_type]}列表中已<span className="color-orange-tip">“加入题库”</span>的{engNameMap[object_type]}</p>
: :
<p className="color-grey-6 mb25 edu-txt-center">选用对象：题库中已设置成公共属性的所有{engNameMap[object_type]}</p> <p className="color-grey-6 mb25 edu-txt-center">选用对象：题库中已设置成公共属性的所有{engNameMap[object_type]}</p>
@ -240,7 +243,7 @@ class UseBank extends Component{
</div> </div>
: :
object_list && object_list.length == 0 && page == 1 ? object_list && object_list.length == 0 && page == 1 ?
<NoneData></NoneData> <div className="setImgW"><NoneData></NoneData></div>
: :
<div className="edu-back-skyblue padding20" style={{"height":"230px", "overflowY": 'auto'}}> <div className="edu-back-skyblue padding20" style={{"height":"230px", "overflowY": 'auto'}}>
<InfiniteScroll <InfiniteScroll
@ -262,14 +265,10 @@ class UseBank extends Component{
return ( return (
<p className="clearfix mb7" key={item.id}> <p className="clearfix mb7" key={item.id}>
<Checkbox className="fl" value={item.id}></Checkbox> <Checkbox className="fl" value={item.id}></Checkbox>
<span className="fl with45"> <span className="fl with65">
<ConditionToolTip title={item.name} condition={item.name && item.name.length > 19 }> <label className="task-hide fl" title={item.name && item.name.length > 30 ? item.name:""} style={{"maxWidth":"100%"}}>{item.name}</label>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}>{item.name}</label>
</ConditionToolTip>
</span> </span>
<ConditionToolTip title={item.course_list_name} condition={item.course_list_name && item.course_list_name.length > 13 }> <span title={item.course_list_name && item.course_list_name.length > 14 && item.course_list_name} className={nav_my==='myself'?"fl with30 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name}</span>
<span className={nav_my==='myself'?"fl with50 color-grey-6 task-hide pl5":"fl with30 color-grey-6 task-hide pl5"}>{item.course_list_name}</span>
</ConditionToolTip>
{ {
nav_my==='public' && nav_my==='public' &&
<span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span> <span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span>

33
public/react/src/modules/courses/coursesPublic/ModulationModal.js
Unescape View File

@ -77,41 +77,28 @@ class ModulationModal extends Component{
</p> </p>
<p style={{ <div className="clearfix">
width: '100%', <textarea
height:'150px', className="winput-100-150"
placeholder="请填写您对作品调分的原因"
}}>
<textarea style={{
width: '100%',
height:'150px',
border:'1px solid rgba(234,234,234,1)'
}}
placeholder="请填写您对作品调分的原因" className={"mt20"}
value={textareaval} value={textareaval}
onInput={this.settextarea} onInput={this.settextarea}
></textarea> ></textarea>
<span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span> <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
</p> </div>
<li>
<p>
<Input style={{ <Input style={{
width: '20%', width: '20%',
marginTop: textareavaltype===true?'50px':'40px'
}} }}
placeholder="请填写分数" placeholder="请填写分数"
value={Inputsval} value={Inputsval}
onInput={this.setInputs}/> <span className="ml10">分</span> onInput={this.setInputs}/> <span className="ml10">分</span>
</p> </li>
<li style={{height:"20px",lineHeight:"20px"}}><span className={Inputsvaltype===true?"color-red":"none"}>分数不能为空</span></li>
<span className={Inputsvaltype===true?"color-red":"none"}>分数不能为空</span> <div className="clearfix edu-txt-center">
<div className="clearfix mt30 edu-txt-center mb10">
<a className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a> <a className="task-btn color-white mr30" onClick={this.props.Cancel}>{this.props.Cancelname || '取消'}</a>
<a className="task-btn task-btn-orange" onClick={this.Saves}>{this.props.Savesname || '保存'}</a> <a className="task-btn task-btn-orange" onClick={this.Saves}>{this.props.Savesname || '保存'}</a>
</div> </div>
</div> </div>
</Modal> </Modal>
</div> </div>

8
public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
Unescape View File

@ -103,17 +103,17 @@ class GraduateTopicDetail extends Component{
return( return(
<div className="newMain"> <div className="newMain">
<div className="educontent mt10 mb50"> <div className="educontent mt10 mb50">
<p className="clearfix mb20"> <p className="clearfix mb10">
<WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn> <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn> <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<span>选题详情</span> <span>选题详情</span>
</p> </p>
<p className="clearfix mb20"> <p className="clearfix mb20 lineh-25">
<span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"30px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span> <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"30px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
<CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /> <span className="fl mt4" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
<WordsBtn className="fr font-16" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn> <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
</p> </p>
<div> <div>
<div className="clearfix edu-back-white bor-bottom-greyE" > <div className="clearfix edu-back-white bor-bottom-greyE" >

18
public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js
Unescape View File

@ -79,20 +79,20 @@ class GraduateTopicDetailTable extends Component{
<div className="mt30"> <div className="mt30">
{ {
topicInfo && topicInfo &&
<p className="mb20"> <p className="clearfix exu-txt-left mb20">
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">课题类型：</span> <span className="color-grey-9">课题类型：</span>
<span className="color-grey-3">{topicInfo.topic_type ? type[`${topicInfo.topic_type}`] :"--"}</span> <span className="color-grey-3">{topicInfo.topic_type ? type[`${topicInfo.topic_type}`] :"--"}</span>
</span> </span>
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">课题来源：</span> <span className="color-grey-9">课题来源：</span>
<span className="color-grey-3">{topicInfo.topic_source ? source[`${topicInfo.topic_source}`] :"--"}</span> <span className="color-grey-3">{topicInfo.topic_source ? source[`${topicInfo.topic_source}`] :"--"}</span>
</span> </span>
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">课题性质1：</span> <span className="color-grey-9">课题性质1：</span>
<span className="color-grey-3">{topicInfo.topic_property_first ? first[`${topicInfo.topic_property_first}`] :"--"}</span> <span className="color-grey-3">{topicInfo.topic_property_first ? first[`${topicInfo.topic_property_first}`] :"--"}</span>
</span> </span>
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">课题性质2：</span> <span className="color-grey-9">课题性质2：</span>
<span className="color-grey-3">{topicInfo.topic_property_second ? second[`${topicInfo.topic_property_second}`] :"--"}</span> <span className="color-grey-3">{topicInfo.topic_property_second ? second[`${topicInfo.topic_property_second}`] :"--"}</span>
</span> </span>
@ -100,16 +100,16 @@ class GraduateTopicDetailTable extends Component{
} }
{ {
topicInfo && topicInfo &&
<p> <p className="clearfix exu-txt-left">
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">课题重复情况：</span> <span className="color-grey-9">课题重复情况：</span>
<span className="color-grey-3">{topicInfo.topic_repeat ? repeat[`${topicInfo.topic_repeat}`] :"--"}</span> <span className="color-grey-3">{topicInfo.topic_repeat ? repeat[`${topicInfo.topic_repeat}`] :"--"}</span>
</span> </span>
<span className="mr60"> <span className="fl with25">
<span className="color-grey-9">调研或实习地点：</span> <span className="color-grey-9">调研或实习地点：</span>
<span className="color-grey-3">{topicInfo.city || "--"}</span> <span className="color-grey-3">{topicInfo.city || "--"}</span>
</span> </span>
<span className="mr60"> <span className="fl with50">
<span className="color-grey-9">课题来源单位：</span> <span className="color-grey-9">课题来源单位：</span>
<span className="color-grey-3">{topicInfo.source_unit || "--"}</span> <span className="color-grey-3">{topicInfo.source_unit || "--"}</span>
</span> </span>

9
public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
Unescape View File

@ -74,7 +74,8 @@ class GraduateTopicDetailTable extends Component{
} }
hideAgreeTopic=()=>{ hideAgreeTopic=()=>{
this.setState({ this.setState({
agreeFlag:false agreeFlag:false,
classesId:undefined
}) })
} }
sureAgreeTopic=(count)=>{ sureAgreeTopic=(count)=>{
@ -116,6 +117,7 @@ class GraduateTopicDetailTable extends Component{
//切换分班 //切换分班
changeClasses=(value)=>{ changeClasses=(value)=>{
debugger
this.setState({ this.setState({
classesId:value classesId:value
}) })
@ -130,7 +132,8 @@ class GraduateTopicDetailTable extends Component{
} }
hideClasses=()=>{ hideClasses=()=>{
this.setState({ this.setState({
visible:false visible:false,
classesId:undefined
}) })
} }
@ -209,7 +212,7 @@ class GraduateTopicDetailTable extends Component{
{ {
tableData.group_list && tableData.group_list.map((item,key)=>{ tableData.group_list && tableData.group_list.map((item,key)=>{
return( return(
<Option value={item.course_group_id} key={key}>{item.group_name}</Option> <Option value={item.group_id} key={key}>{item.group_name}</Option>
) )
}) })
} }

4
public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
Unescape View File

@ -328,8 +328,8 @@ class GraduateTopicNew extends Component{
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<span>{topicId==undefined?"新建":"编辑"}</span> <span>{topicId==undefined?"新建":"编辑"}</span>
</p> </p>
<div className="clearfix mb30"> <div className="clearfix mb20 lineh-25">
<p className="fl color-black summaryname mt5">{topicId==undefined?"新建":"编辑"}毕设选题</p> <p className="fl color-black summaryname">{topicId==undefined?"新建":"编辑"}毕设选题</p>
<a onClick={()=>this.props.history.goBack()} className="color-grey-6 fr font-16">返回</a> <a onClick={()=>this.props.history.goBack()} className="color-grey-6 fr font-16">返回</a>
</div> </div>

2
public/react/src/modules/courses/poll/Poll.js
Unescape View File

@ -348,7 +348,7 @@ class Poll extends Component{
} }
this.setState({ this.setState({
course_groups:list, course_groups:list,
checkBoxValues:checkValue checkBoxValues:value
}) })
this.setState({ this.setState({
modalname:"立即发布", modalname:"立即发布",

2
public/react/src/modules/courses/poll/PollDetailIndex.js
Unescape View File

@ -97,7 +97,7 @@ class PollDetailIndex extends Component{
<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}> <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
<Menu.Item key="0">答题列表</Menu.Item> <Menu.Item key="0">答题列表</Menu.Item>
{ {
(isAdmin || (isStudent && pollDetail && pollDetail.show_result == 1 && pollDetail.polls_status == 3)) && <Menu.Item key="1">统计结果</Menu.Item> (isAdmin || (isStudent && pollDetail && pollDetail.show_result == 1 && pollDetail.polls_status == 3 && user_permission && user_permission.current_status==1)) && <Menu.Item key="1">统计结果</Menu.Item>
} }
{ isAdmin && <Menu.Item key="2">问卷预览</Menu.Item> } { isAdmin && <Menu.Item key="2">问卷预览</Menu.Item> }
<Menu.Item key="3">设置</Menu.Item> <Menu.Item key="3">设置</Menu.Item>

7
public/react/src/modules/courses/poll/PollDetailTabForth.js
Unescape View File

@ -556,7 +556,9 @@ class PollDetailTabForth extends Component{
<div className="edu-back-white"> <div className="edu-back-white">
<div className="bor-bottom-greyE padding30"> <div className="bor-bottom-greyE padding30">
<p className="mb30 clearfix"> <p className="mb30 clearfix">
<span className="font-16 fl">发布设置 <span className="color-grey-c font-14">（课堂管理员、教师、助教拥有发布设置权限）</span></span> <span className="font-16 fl">发布设置
{/* <span className="color-grey-c font-14">（课堂管理员、教师、助教拥有发布设置权限）</span> */}
</span>
{ {
!flagPageEdit && isAdmin ? !flagPageEdit && isAdmin ?
<a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip></a> <a className="fr" onClick={this.editSetting}><Tooltip title="编辑"><i className="iconfont icon-bianjidaibeijing font-20 color-green"></i></Tooltip></a>
@ -564,6 +566,8 @@ class PollDetailTabForth extends Component{
} }
</p> </p>
<div className="pl25"> <div className="pl25">
{
course_group && course_group.length > 0 &&
<p className="clearfix mb20"> <p className="clearfix mb20">
<Form.Item className="fl pollForm"> <Form.Item className="fl pollForm">
{getFieldDecorator('unitSet') {getFieldDecorator('unitSet')
@ -575,6 +579,7 @@ class PollDetailTabForth extends Component{
</Form.Item> </Form.Item>
<span className="color-grey-c font-14">（选中则所有分班使用相同的发布设置，仅课堂管理员可修改；否则各个分班允许单独设置）</span> <span className="color-grey-c font-14">（选中则所有分班使用相同的发布设置，仅课堂管理员可修改；否则各个分班允许单独设置）</span>
</p> </p>
}
{ {
unitSetting ? unitSetting ?
<div> <div>

2
public/react/src/modules/courses/poll/PollDetailTabThird.js
Unescape View File

@ -46,7 +46,7 @@ class PollDetailTabThird extends Component{
<span className="color-grey-3"> <span className="color-grey-3">
{ {
pollDetail && pollDetail.question_types.q_counts > 0 && pollDetail && pollDetail.question_types.q_counts > 0 &&
<span>合计12{pollDetail.question_types.q_counts}题：</span> <span>合计{pollDetail.question_types.q_counts}题：</span>
} }
{ {
pollDetail && pollDetail.question_types.q_singles > 0 && pollDetail && pollDetail.question_types.q_singles > 0 &&

4
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -1842,11 +1842,11 @@ class Listofworks extends Component {
border-bottom: none!important; border-bottom: none!important;
height: 85px; height: 85px;
} }
.ant-table-tbody > tr > td { .ant-tables .ant-table-tbody > tr > td {
height: 85px; height: 85px;
} }
`}</style> `}</style>
<div className="edu-table edu-back-white "> <div className="edu-table edu-back-white ant-tables">
{data === undefined ? "" : <Table {data === undefined ? "" : <Table
dataSource={data} dataSource={data}
columns={columns} columns={columns}

10
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -295,27 +295,27 @@ class ShixunhomeWorkItem extends Component{
{/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/} {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
{ {
this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list"} this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list"}
className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
} }
{ {
this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`} this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
} }
{ {
this.props.isNotMember?this.props.discussMessage.private_icon===false? this.props.isNotMember?this.props.discussMessage.private_icon===false?
<span className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span> <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
: :
<Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`} <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
className="fl font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
} }
{ {
this.props.discussMessage.private_icon===false? this.props.discussMessage.private_icon===false?
<Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom"> <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip> </Tooltip>
: :
<div></div> <div></div>

Write Preview
Loading…
Cancel
Save