调整实训改版

chromesetting
杨树明 5 years ago
parent ed0febdf39
commit ce989a1e55

@ -216,6 +216,12 @@
<div class="code-name">&amp;#xe66d;</div> <div class="code-name">&amp;#xe66d;</div>
</li> </li>
<li class="dib">
<span class="icon iconfont">&#xe700;</span>
<div class="name">下箭头</div>
<div class="code-name">&amp;#xe700;</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe78f;</span> <span class="icon iconfont">&#xe78f;</span>
<div class="name">三角形-up</div> <div class="name">三角形-up</div>
@ -1398,6 +1404,12 @@
<div class="code-name">&amp;#xe6b7;</div> <div class="code-name">&amp;#xe6b7;</div>
</li> </li>
<li class="dib">
<span class="icon iconfont">&#xe74c;</span>
<div class="name">向上 箭头</div>
<div class="code-name">&amp;#xe74c;</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe60e;</span> <span class="icon iconfont">&#xe60e;</span>
<div class="name">healthmode</div> <div class="name">healthmode</div>
@ -2075,6 +2087,15 @@
</div> </div>
</li> </li>
<li class="dib">
<span class="icon iconfont icon-jiantou9"></span>
<div class="name">
下箭头
</div>
<div class="code-name">.icon-jiantou9
</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-sanjiaoxing-up"></span> <span class="icon iconfont icon-sanjiaoxing-up"></span>
<div class="name"> <div class="name">
@ -3848,6 +3869,15 @@
</div> </div>
</li> </li>
<li class="dib">
<span class="icon iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu-"></span>
<div class="name">
向上 箭头
</div>
<div class="code-name">.icon-changyongtubiao-xianxingdaochu-zhuanqu-
</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-healthmode"></span> <span class="icon iconfont icon-healthmode"></span>
<div class="name"> <div class="name">
@ -4647,6 +4677,14 @@
<div class="code-name">#icon-dianzan11</div> <div class="code-name">#icon-dianzan11</div>
</li> </li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jiantou9"></use>
</svg>
<div class="name">下箭头</div>
<div class="code-name">#icon-jiantou9</div>
</li>
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-sanjiaoxing-up"></use> <use xlink:href="#icon-sanjiaoxing-up"></use>
@ -6223,6 +6261,14 @@
<div class="code-name">#icon-menu_people</div> <div class="code-name">#icon-menu_people</div>
</li> </li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-changyongtubiao-xianxingdaochu-zhuanqu-"></use>
</svg>
<div class="name">向上 箭头</div>
<div class="code-name">#icon-changyongtubiao-xianxingdaochu-zhuanqu-</div>
</li>
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-healthmode"></use> <use xlink:href="#icon-healthmode"></use>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -222,6 +222,13 @@
"unicode": "e66d", "unicode": "e66d",
"unicode_decimal": 58989 "unicode_decimal": 58989
}, },
{
"icon_id": "1110411",
"name": "下箭头",
"font_class": "jiantou9",
"unicode": "e700",
"unicode_decimal": 59136
},
{ {
"icon_id": "1113422", "icon_id": "1113422",
"name": "三角形-up", "name": "三角形-up",
@ -1601,6 +1608,13 @@
"unicode": "e6b7", "unicode": "e6b7",
"unicode_decimal": 59063 "unicode_decimal": 59063
}, },
{
"icon_id": "10809887",
"name": "向上 箭头",
"font_class": "changyongtubiao-xianxingdaochu-zhuanqu-",
"unicode": "e74c",
"unicode_decimal": 59212
},
{ {
"icon_id": "11222372", "icon_id": "11222372",
"name": "healthmode", "name": "healthmode",

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 362 KiB

@ -91,7 +91,7 @@ export default class TPMsettings extends Component {
axios.delete(cul).then((response) => { axios.delete(cul).then((response) => {
if (response.data.status === 1) { if (response.data.status === 1) {
this.props.showSnackbar("操作成功"); this.props.showNotification("操作成功");
this.setState({ this.setState({
operateshixunstype: false, operateshixunstype: false,
}); });
@ -109,7 +109,7 @@ export default class TPMsettings extends Component {
let cul = `/shixuns/` + id + `/close.json`; let cul = `/shixuns/` + id + `/close.json`;
axios.post(cul).then((response) => { axios.post(cul).then((response) => {
if (response.data.status === 1) { if (response.data.status === 1) {
this.props.showSnackbar("操作成功"); this.props.showNotification("操作成功");
this.setState({ this.setState({
operateshixunstype: false, operateshixunstype: false,
}); });

@ -59,14 +59,14 @@ class TPMRightSection extends Component {
render() { render() {
let {TPMRightSection, clickNewsubscripttype} = this.state; let {TPMRightSection, clickNewsubscripttype} = this.state;
let {TPMRightSectionData} = this.props let {TPMRightSectionData} = this.props
console.log(this.props)
return ( return (
<div> <div>
{ {
TPMRightSectionData === undefined ? "" : TPMRightSectionData === undefined ? "" :
<div> <div>
<div className="edu-back-white pd302020zuoze mb10"> <div className="edu-back-white pd302020zuoze mb10">
<p className="font-16 mb20">创建者</p> <p className="font-16 mb20"><i className={"iconfont icon-chuangjianzhe1 audit_situationactive font-14"}></i> </p>
<div className="df"> <div className="df">
<a <a
href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/courses`}> href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/courses`}>
@ -95,9 +95,9 @@ class TPMRightSection extends Component {
</div> </div>
{ {
TPMRightSectionData === undefined ? "" : TPMRightSectionData.tags === undefined ? "" : TPMRightSectionData.tags.length === 0 ? "" : TPMRightSectionData === undefined ? "" : TPMRightSectionData.tags === undefined ? "" : TPMRightSectionData.tags.length === 0 ? "" :
<div className="edu-back-white padding40-20 mb10 relative"> <div className="edu-back-white padd252020px mb10 relative">
<p className="font-16 mb20"> <p className="font-16 mb20">
<span>技能标签</span> <span><i className={"iconfont icon-biaoqian2 audit_situationactive font-14"}></i> </span>
<span className={"sortinxdirection space-between fr"}> <span className={"sortinxdirection space-between fr"}>
<span className="color888hezuo font-12">已获得 {TPMRightSectionData&&TPMRightSectionData.user_tag_count} / {TPMRightSectionData&&TPMRightSectionData.tag_count} </span> <span className="color888hezuo font-12">已获得 {TPMRightSectionData&&TPMRightSectionData.user_tag_count} / {TPMRightSectionData&&TPMRightSectionData.tag_count} </span>
</span> </span>
@ -118,19 +118,25 @@ class TPMRightSection extends Component {
<div <div
className={TPMRightSectionData.tags.length > 15 && clickNewsubscripttype === false ? "newsubscript mb9 color-grey-9" : "newsubscript mb9 color-grey-9 none"} className={TPMRightSectionData.tags.length > 15 && clickNewsubscripttype === false ? "textcenter color-grey-9 mt20 rightjinengs" : "none"}
onClick={() => this.clickNewsubscript(0)}>
data-tip-down="显示全部" <span className="mr8">
onClick={() => this.clickNewsubscript(0)}><span className="mr8">...</span><Icon <div>
type="caret-down"/> <p className={"font-12"}>展开全部</p>
<p className={"font-12"}><i className={"iconfont icon-jiantou9"}></i></p>
</div>
</span>
</div> </div>
<div <div className={clickNewsubscripttype === false ? "none" : "textcenter mt20 color-grey-9 rightjinengs"}
className={clickNewsubscripttype === false ? "newsubscript mb9 color-grey-9 none" : "newsubscript mb9 color-grey-9"} onClick={() => this.clickNewsubscript(1)}>
<span className="mr8">
data-tip-down="显示全部" <div>
onClick={() => this.clickNewsubscript(1)}><Icon type="caret-up"/> <p className={"font-12"}><i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu-"}></i></p>
<p className={"font-12"}>收起全部</p>
</div>
</span>
</div> </div>
</div> </div>

@ -111,4 +111,15 @@
.pd302020zuoze { .pd302020zuoze {
padding: 30px 20px 20px; padding: 30px 20px 20px;
}
.textcenter{
text-align: center;
}
.padd252020px{
padding: 25px 20px 15px;
}
.rightjinengs{
height: 35px;
margin-top: 20px;
} }

@ -146,7 +146,9 @@
.hezuozhe630{ .hezuozhe630{
width: 630px; width: 630px;
} }
.hezuozhe634{
width: 634px;
}
.color333hezuo{ .color333hezuo{
color:#333333; color:#333333;
} }
@ -174,4 +176,12 @@
color: #fff; color: #fff;
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
}
.fontnewreds{
color: rgb(255, 85, 85);
}
.fontneweees{
color: #eee;
} }

@ -114,7 +114,7 @@ class Collaborators extends Component {
}) })
let admintype = this.props.identity; let admintype = this.props.identity;
if (admintype > 4) { if (admintype > 4) {
this.props.showSnackbar("您没有权限"); this.props.showNotification("您没有权限");
return return
} }
if (type === "cooperation") { if (type === "cooperation") {
@ -287,7 +287,7 @@ class Collaborators extends Component {
user_ids: user_ids user_ids: user_ids
}).then((response) => { }).then((response) => {
this.updatacomponentDiddata(); this.updatacomponentDiddata();
this.props.showSnackbar(response.data.message); this.props.showNotification(response.data.message);
this.setState({ this.setState({
Collaboratorsvisibleadmin: false, Collaboratorsvisibleadmin: false,
Collaboratorslist: [], Collaboratorslist: [],
@ -316,7 +316,7 @@ class Collaborators extends Component {
Collaboratorslist: [], Collaboratorslist: [],
Searchadmin: [] Searchadmin: []
}); });
this.props.showSnackbar("所选人员为空,没有更换成功"); this.props.showNotification("所选人员为空,没有更换成功");
this.CollaboratorsshowModal("admin") this.CollaboratorsshowModal("admin")
return return
} }
@ -331,7 +331,7 @@ class Collaborators extends Component {
Searchadmin: [] Searchadmin: []
}); });
this.updatacomponentDiddata(); this.updatacomponentDiddata();
this.props.showSnackbar(response.data.message); this.props.showNotification(response.data.message);
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });
@ -356,7 +356,7 @@ class Collaborators extends Component {
this.props.history.push('/shixuns') this.props.history.push('/shixuns')
return; return;
} }
this.props.showSnackbar(response.data.message); this.props.showNotification(response.data.message);
this.updatacomponentDiddata(); this.updatacomponentDiddata();
this.setState({ this.setState({
collaborators_deletetype: false collaborators_deletetype: false
@ -420,7 +420,12 @@ class Collaborators extends Component {
onChangepageNumber=(pageNumber)=>{ onChangepageNumber=(pageNumber)=>{
this.updatacomponentDiddata(pageNumber); this.updatacomponentDiddata(pageNumber);
} }
toggleHover=(type,key)=>{
this.setState({
hovertype:type,
hoverkey:type===false?undefined:key
})
}
render() { render() {
let { let {
collaboratorList, collaboratorList,
@ -617,13 +622,13 @@ class Collaborators extends Component {
</div> </div>
<div className="mt10 clearfix"> <div className="mt10 clearfix">
<span className="fl mr15"> <span className="fl mr15">
<Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox> <Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
<div className="fl" style={{height: '27px'}}> <div className="fl" style={{height: '27px'}}>
<span className="color-orange fl" id="add_teacher_notice" <span className="color-orange fl" id="add_teacher_notice"
style={{display: Collaboratorslisttype === true ? 'inline' : 'none'}}>请至少选择一个用户</span> style={{display: Collaboratorslisttype === true ? 'inline' : 'none'}}>请至少选择一个用户</span>
</div> </div>
</span> </span>
</div> </div>
@ -653,18 +658,23 @@ class Collaborators extends Component {
<a href={item.user.user_url} target="_blank" className="mr20 fl edu-position"> <a href={item.user.user_url} target="_blank" className="mr20 fl edu-position">
<img alt="用户头像" className="radius" height="48" src={getImageUrl("images/" + item.user.image_url)} <img alt="用户头像" className="radius" height="48" src={getImageUrl("images/" + item.user.image_url)}
width="48"/> width="48"/>
<span className={item && item.user && item.user.shixun_manager === true ? "ml20 yslusercjz newyslusercjz" : "none "} <span className={item && item.user && item.user.shixun_manager === true&&this.props.power === true ? "ml20 yslusercjz newyslusercjz" : "none "}
// style={{display: this.props.power === false ? "none" : "inline-block"}} // style={{display: this.props.power === false ? "none" : "inline-block"}}
> >
<p <p className="yslusercjztest newyslusercjztest">{item.user.shixun_manager === true ? "创建者" : ""}</p></span>
className="yslusercjztest newyslusercjztest">{item.user.shixun_manager === true ? "创建者" : ""}</p></span>
</a> </a>
<div className="fl collaborators-item-middles"> <div className="fl collaborators-item-middles">
<p className="mb10 "> <p className="mb10 sortinxdirection space-between hezuozhe634">
<a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a> <a href={item.user.user_url} target="_blank" className="yslusername">{item.user.name}</a>
{item.user.shixun_manager === true ? "" : <span>
<i className={this.state.hovertype===true&&key===this.state.hoverkey?"fontnewreds iconfont icon-shanchu_moren":"fontneweees iconfont icon-shanchu_moren"}
style={{display: this.props.power === false ? "none" : "block"}}
onClick={() => this.collaborators_delete(item.user.user_id)}
onMouseEnter={()=>this.toggleHover(true,key)}
onMouseLeave={()=>this.toggleHover(false,key)}
></i></span> }
{/*<span*/} {/*<span*/}
{/* className={item && item.user && item.user.shixun_manager === true ? "ml20 yslusercjz " : "ml20"}*/} {/* className={item && item.user && item.user.shixun_manager === true ? "ml20 yslusercjz " : "ml20"}*/}
{/* style={{display: this.props.power === false ? "none" : "inline-block"}}><p*/} {/* style={{display: this.props.power === false ? "none" : "inline-block"}}><p*/}
@ -745,6 +755,7 @@ class Collaborators extends Component {
<Pagination showQuickJumper defaultCurrent={1} total={collaboratorList && collaboratorList.member_count} onChange={this.onChangepageNumber} /> <Pagination showQuickJumper defaultCurrent={1} total={collaboratorList && collaboratorList.member_count} onChange={this.onChangepageNumber} />
</div>:""} </div>:""}
</React.Fragment> </React.Fragment>
); );

@ -216,6 +216,12 @@
<div class="code-name">&amp;#xe66d;</div> <div class="code-name">&amp;#xe66d;</div>
</li> </li>
<li class="dib">
<span class="icon iconfont">&#xe700;</span>
<div class="name">下箭头</div>
<div class="code-name">&amp;#xe700;</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe78f;</span> <span class="icon iconfont">&#xe78f;</span>
<div class="name">三角形-up</div> <div class="name">三角形-up</div>
@ -1398,6 +1404,12 @@
<div class="code-name">&amp;#xe6b7;</div> <div class="code-name">&amp;#xe6b7;</div>
</li> </li>
<li class="dib">
<span class="icon iconfont">&#xe74c;</span>
<div class="name">向上 箭头</div>
<div class="code-name">&amp;#xe74c;</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe60e;</span> <span class="icon iconfont">&#xe60e;</span>
<div class="name">healthmode</div> <div class="name">healthmode</div>
@ -2075,6 +2087,15 @@
</div> </div>
</li> </li>
<li class="dib">
<span class="icon iconfont icon-jiantou9"></span>
<div class="name">
下箭头
</div>
<div class="code-name">.icon-jiantou9
</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-sanjiaoxing-up"></span> <span class="icon iconfont icon-sanjiaoxing-up"></span>
<div class="name"> <div class="name">
@ -3848,6 +3869,15 @@
</div> </div>
</li> </li>
<li class="dib">
<span class="icon iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu-"></span>
<div class="name">
向上 箭头
</div>
<div class="code-name">.icon-changyongtubiao-xianxingdaochu-zhuanqu-
</div>
</li>
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-healthmode"></span> <span class="icon iconfont icon-healthmode"></span>
<div class="name"> <div class="name">
@ -4647,6 +4677,14 @@
<div class="code-name">#icon-dianzan11</div> <div class="code-name">#icon-dianzan11</div>
</li> </li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jiantou9"></use>
</svg>
<div class="name">下箭头</div>
<div class="code-name">#icon-jiantou9</div>
</li>
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-sanjiaoxing-up"></use> <use xlink:href="#icon-sanjiaoxing-up"></use>
@ -6223,6 +6261,14 @@
<div class="code-name">#icon-menu_people</div> <div class="code-name">#icon-menu_people</div>
</li> </li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-changyongtubiao-xianxingdaochu-zhuanqu-"></use>
</svg>
<div class="name">向上 箭头</div>
<div class="code-name">#icon-changyongtubiao-xianxingdaochu-zhuanqu-</div>
</li>
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-healthmode"></use> <use xlink:href="#icon-healthmode"></use>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -222,6 +222,13 @@
"unicode": "e66d", "unicode": "e66d",
"unicode_decimal": 58989 "unicode_decimal": 58989
}, },
{
"icon_id": "1110411",
"name": "下箭头",
"font_class": "jiantou9",
"unicode": "e700",
"unicode_decimal": 59136
},
{ {
"icon_id": "1113422", "icon_id": "1113422",
"name": "三角形-up", "name": "三角形-up",
@ -1601,6 +1608,13 @@
"unicode": "e6b7", "unicode": "e6b7",
"unicode_decimal": 59063 "unicode_decimal": 59063
}, },
{
"icon_id": "10809887",
"name": "向上 箭头",
"font_class": "changyongtubiao-xianxingdaochu-zhuanqu-",
"unicode": "e74c",
"unicode_decimal": 59212
},
{ {
"icon_id": "11222372", "icon_id": "11222372",
"name": "healthmode", "name": "healthmode",

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 362 KiB

Loading…
Cancel
Save