tongChong
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

修改第三方登录logo及新建项目的样式

This commit is contained in:
何童崇 2022-10-27 16:08:19 +08:00
parent b462961bb3
commit dd144f1cc0
10 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Main/Index.js
View File

@ -271,7 +271,7 @@ class Index extends Component {
newItem = ()=>{
return(
<ul>
<ul className='newProject'>
<li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
{/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
</li>

6
src/forge/Main/Index.scss
View File

@ -578,4 +578,10 @@
}
}
}
}
.newProject li{
cursor: pointer;
&:hover{
color: $primary-color;
}
}

6
src/forge/Team/Index.scss
View File

@ -550,4 +550,10 @@
border-left-style: none;
}
}
}
.newProject li{
cursor: pointer;
&:hover{
color: $primary-color;
}
}

6
src/forge/Team/List.jsx
View File

@ -102,11 +102,11 @@ function List(props){
</Menu>
)
const menu_new=(
<ul>
<li onClick={()=>{this.props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
<ul className='newProject'>
<li onClick={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
{/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目</CheckProfile> */}
</li>
<li onClick={()=>{this.props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
<li onClick={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
{/* <CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目</CheckProfile> */}
</li>
</ul>

2
src/forge/users/InfosUser.js
View File

@ -114,7 +114,7 @@ class InfosUser extends Component {
);
newItem =()=> (
<ul>
<ul className='newProject'>
<li onClick={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目
{/* <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile> */}
</li>

10
src/military/components/exportExcel.js
View File

@ -80,7 +80,7 @@ const tableToExcel = (table, fileName, worksheet) => {
const uri = 'data:application/vnd.ms-excel;base64,';
const styles='<style>table{corlor:#666;border-color:#666;padding:3px 10px;} .w-e-menu .w-e-panel-container { position: absolute; top: 0; left: 50%; border: 1px solid #ccc; border-top: 0; box-shadow: 1px 1px 2px #ccc; color: #333; background-color: #fff; text-align: left;}.w-e-menu .w-e-panel-container .w-e-panel-close { position: absolute; right: 0; top: 0; padding: 5px; margin: 2px 5px 0 0; cursor: pointer; color: #999;}.w-e-menu .w-e-panel-container .w-e-panel-close:hover { color: #333;}.w-e-menu .w-e-panel-container .w-e-panel-tab-title { list-style: none; display: flex; font-size: 14px; margin: 2px 10px 0 10px; border-bottom: 1px solid #f1f1f1;}.w-e-menu .w-e-panel-container .w-e-panel-tab-title .w-e-item { padding: 3px 5px; color: #999; cursor: pointer; margin: 0 3px; position: relative; top: 1px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-title .w-e-active { color: #333; border-bottom: 1px solid #333; cursor: default; font-weight: 700;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content { padding: 10px 15px 10px 15px; font-size: 16px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content input:focus,.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea:focus,.w-e-menu .w-e-panel-container .w-e-panel-tab-content button:focus { outline: none;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea { width: 100%; border: 1px solid #ccc; padding: 5px; margin-top: 10px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea:focus { border-color: #1e88e5;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text] { border: none; border-bottom: 1px solid #ccc; font-size: 14px; height: 20px; color: #333; text-align: left;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text].small { width: 30px; text-align: center;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text].block { display: block; width: 100%; margin: 10px 0;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text]:focus { border-bottom: 2px solid #1e88e5;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button { font-size: 14px; color: #1e88e5; border: none; padding: 5px 10px; background-color: #fff; cursor: pointer; border-radius: 3px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.left { float: left; margin-right: 10px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.right { float: right; margin-left: 10px;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.gray { color: #999;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.red { color: #c24f4a;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button:hover { background-color: #f1f1f1;}.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container:after { content: ""; display: table; clear: both;}.w-e-menu .w-e-panel-container .w-e-emoticon-container .w-e-item { cursor: pointer; font-size: 18px; padding: 0 3px; display: inline-block;}.w-e-menu .w-e-panel-container .w-e-up-img-container,.w-e-menu .w-e-panel-container .w-e-up-video-container { text-align: center;}.w-e-menu .w-e-panel-container .w-e-up-img-container .w-e-up-btn,.w-e-menu .w-e-panel-container .w-e-up-video-container .w-e-up-btn { display: inline-block; color: #999; cursor: pointer; font-size: 60px; line-height: 1;}.w-e-menu .w-e-panel-container .w-e-up-img-container .w-e-up-btn:hover,.w-e-menu .w-e-panel-container .w-e-up-video-container .w-e-up-btn:hover { color: #333;}</style>';
// 定义文档的类型
const template = `<html><head><meta charset="UTF-8">${styles}</head><body><table border="1" style="corlor:#666;border-color:#666;padding:3px 10px;">{table}</table></body></html>`;
const template = `<html><head><meta charset="UTF-8">${styles}</head><body><table border="1" borderColor="grey" style="font-size:16px;corlor:#666;border:1px solid #666;padding:3px 10px;">{table}</table></body></html>`;
const base64 = function (s) {
return window.btoa(unescape(encodeURIComponent(s)))
};
@ -103,10 +103,18 @@ const tableToExcel = (table, fileName, worksheet) => {
for (let thItem of thArray) {
let newTh = document.createElement("th");
const {rowSpan = 1, colSpan = 1, style} = thItem;
// style.borderColor="#999";
// style.color="#999";
// style.fontSize="20px";
// style.font={
// name: "微软雅黑",
// sz: 20,
// },
traverseNodes(thItem, newTh);
newTh.rowSpan = rowSpan; //跨行
newTh.colSpan = colSpan; //跨列
newTh.style = style; // 样式
console.log(style);
newTr.appendChild(newTh);
}
for (let tdItem of tdArray) {

27
src/military/task/taskList/index.jsx
View File

@ -66,6 +66,17 @@ export default ({ history, current_user, showLoginDialog, location, mygetHelmeta
}
setTaskList(data.rows);
setTotal(data.total);
// 存储搜索条件
let params={
categoryId,
taskModeId,
statusString,
searchInput,
orderBy,
curPage,
}
sessionStorage.setItem("taskParams",JSON.stringify(params));
}
setLoading(false);
})
@ -138,17 +149,7 @@ export default ({ history, current_user, showLoginDialog, location, mygetHelmeta
// showLoginDialog();
// return;
// }
let params={
categoryId,
taskModeId,
// expiredStartTime,
// expiredEndTime,
statusString,
searchInput,
orderBy,
curPage,
}
sessionStorage.setItem("taskParams",JSON.stringify(params));
history.push(`/task/taskDetail/${id}`);
}
@ -277,10 +278,10 @@ export default ({ history, current_user, showLoginDialog, location, mygetHelmeta
cancelButtonProps={null}
closeIcon={<i className='iconfont icon-shanchuicon'></i>}
>
<div className='profiles-tit'>您暂无发布权限，仅<span >平台指定企业</span>允许需求提报</div>
<div className='profiles-tit'>您暂无权限，仅<span >平台指定企业</span>允许需求提报</div>
<img className='polify' src={polify} />
<div className='profiles-content'>
若想发布需求，请在账号管理处<a href={`${mygetHelmetapi && mygetHelmetapi.main_web_site_url}/users/${current_user.login}/profiles`}>完善企业认证信息</a>，或<Link to={'/needs/new'}>点击此处</Link>提交需求申请信息，后续管理员将与您联系。
若想需求提报，请在账号管理处<a href={`${mygetHelmetapi && mygetHelmetapi.main_web_site_url}/users/${current_user.login}/profiles`}>完善企业认证信息</a>，或<Link to={'/needs/new'}>点击此处</Link>提交需求申请信息，后续管理员将与您联系。
</div>
</Modal>
</div>

3
src/modules/login/LoginDialog.css
View File

@ -168,6 +168,3 @@
.thirdLog{
width: 120px;
}
.gitLinkLog{
background-color: #1b2440;
}

BIN
src/modules/login/gitLink.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

14
src/modules/loginRegister/LoginRegisterPage.scss
View File

@ -17,9 +17,6 @@
.thirdLog{
width: 120px;
}
.gitLinkLog{
background-color: #1b2440;
}
/*当页面宽度大于1000px*/
@media screen and (min-width:1000px) {
.banner{
@ -272,7 +269,7 @@
padding-top:0;
}
.login_register_right .right_cont{
padding:8vh 15px
padding:2vh 15px
}
.ant-form-item-label, .ant-form-item-control-wrapper{
width: auto !important;
@ -299,11 +296,18 @@
@media screen and (max-width:360px) {
.login_register_right .right_cont{
font-size: 12px;
padding:5vh 10px
padding:1vh 10px;
.ant-form-item{
margin-bottom: .9rem;
}
}
.login_register_right{
overflow-y: scroll;
}
.has-success{
white-space: nowrap;
}
}
.login_agreement{