Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_aliyun_beta
daiao 6 years ago
commit 11a8aa0d97

@ -446,8 +446,8 @@ table.text-file{}
/*-------------------------------实训路径-------------------------------*/ /*-------------------------------实训路径-------------------------------*/
.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png"); .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
background-color: #081C4B; background-color: #131b39;
background-size: cover; /*background-size: cover;*/
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

@ -1,5 +1,5 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd"; import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form,Row, Col } from "antd";
import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
import './myysleduinforms.css' import './myysleduinforms.css'
import axios from 'axios'; import axios from 'axios';
@ -165,18 +165,25 @@ class Bullsubdirectory extends Component{
{ {
whethertoeditysl === false? whethertoeditysl === false?
<div> <div>
<div className="" > <div>
<div className="fudonyingxiangysl"><div className="ysltitbt fl"><span >{myname}</span></div> <div className="fudonyingxiangysl">
{ <div style={{marginRight:"59px"}}>
this.props.isAdmin() === true ? <span className="ysltitbt">{myname}</span>
(this.props.yslbool===false? </div>
<i className="iconfont icon-bianji1 newbianji1 fr pr25 yslbianji" onClick={()=>this.bianji(true)}></i> <div>
: <span className="fr pr25 yslbianji">
"" {
) this.props.isAdmin() === true ?
(this.props.yslbool===false?
:"" <i className="iconfont icon-bianji1 newbianji1" onClick={()=>this.bianji(true)}></i>
} :
""
)
:""
}
</span>
</div>
<div className="yslclear"></div>
</div> </div>
<div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"} dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/> <div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"} dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
</div> </div>

@ -68,7 +68,6 @@
} }
.fudonyingxiangysl{ .fudonyingxiangysl{
width: 100%; width: 100%;
height: 66px;
} }
.yslbianji{ .yslbianji{
padding-top: 31px; padding-top: 31px;
@ -79,3 +78,5 @@
.ysldashed{ .ysldashed{
border:1px dashed #EEE; border:1px dashed #EEE;
} }
.yslclear{ clear: both;
}

@ -448,8 +448,8 @@ table.text-file{}
/*-------------------------------实训路径-------------------------------*/ /*-------------------------------实训路径-------------------------------*/
.path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png"); .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
background-color: #081C4B; background-color: #131b39;
background-size: cover; /*background-size: cover;*/
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

Loading…
Cancel
Save