底部信息

This commit is contained in:
caishi 2021-10-13 11:37:14 +08:00
parent d768761afb
commit 35de29c677
3 changed files with 13 additions and 59 deletions

View File

@ -16,50 +16,9 @@ function Footer(){
var html = {__html:htmlString};
return <div dangerouslySetInnerHTML={html}></div> ;
}
return(
<div>
<div style={{height:"543px"}}></div>
<div className="newFooter edu-txt-center">
{value && showhtml(value)}
{/* <div className="footerInfos">
<ul>
<li>社区</li>
<li><a href={`/`} target="_blank">网站首页</a></li>
<li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
<li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
<li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
<li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
</ul>
<ul>
<li>支持与服务</li>
<li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
<li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
<li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
<li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
<li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
</ul>
<ul>
<li>合作伙伴</li>
<li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
<li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
<li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
<li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
<li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
<li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
<li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
<li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
<li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
<li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
</ul>
<ul>
<li>合作伙伴</li>
<li><span>热线</span></li>
<li><span>QQ群1071514693</span></li>
</ul>
</div>
<p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477</a></p> */}
</div>
{value && showhtml(value)}
</div>
)
}

View File

@ -11,6 +11,8 @@ function turnbar(str){
}
return str;
}
const port = window.location.port;
const hostname = window.location.hostname;
class MergeItem extends Component {
constructor(props) {
super(props);
@ -166,24 +168,17 @@ class MergeItem extends Component {
)}
</li>
<li>{item.version || "--"}</li>
<li>
<div
className="flex1 df"
style={{ justifyContent: "center" }}
>
{item.journals_count ? (
<div className="flex1 df" style={{ justifyContent: "center" }}>
{item.journals_count ?
<Link
className="mr5 color-grey-8"
to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
>
<i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
{item.journals_count}
</Link>
) : (
""
)}
{user_admin_or_developer && item.pull_request_status === 0 ? (
<i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>{item.journals_count}
</Link>:""
}
{user_admin_or_developer && item.pull_request_status === 0 &&
<div
className="milepostleft"
style={{
@ -194,7 +189,7 @@ class MergeItem extends Component {
: "none",
}}
>
<div className="grid-item mr15 color-grey-9">
<div className="grid-item color-grey-9">
<Link
to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
className="color-grey-9"
@ -203,11 +198,10 @@ class MergeItem extends Component {
</Link>
</div>
</div>
) : (
""
)}
}
</div>
</li>
<li style={{width:"50px",textAlign:"left"}}><a className="color-blue" target="_blank" href={`http://106.75.189.31:5000/result?SrcPR=${port ? `${hostname}:${port}`:`https://${hostname}`}/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}>查重</a></li>
</ul>
</div>
);

View File

@ -382,6 +382,7 @@ class merge extends Component {
</span>
</Dropdown>
</li>
<li style={{width:"50px"}}></li>
</ul>
</div>
<div style={{minHeight:"470px"}}>