Merge branch 'feature_GLCC' of http://106.75.45.236:3000/tongChong/forgeplus-react into feature_IDE

This commit is contained in:
何童崇 2022-06-10 16:27:04 +08:00
commit d4a75f5dcc
10 changed files with 7 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 KiB

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 KiB

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 728 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 406 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

@ -8,7 +8,7 @@ let setting = {
slidesToShow: 3,
slidesToScroll: 1,
pauseOnDotsHover: true,
autoplaySpeed: 5000000,
autoplaySpeed: 5000,
centerMode: true,
centerPadding: "",
// pauseOnFocus: true,
@ -21,10 +21,11 @@ function SliderLeft({list,history}) {
function goDetail(projectName){
history.push({
pathname:'/glcc/projects',
state:{projectName:projectName.replace(/ /g,'-')}
})
// history.push({
// pathname:'/glcc/projects',
// state:{projectName:projectName.replace(/ /g,'-')}
// })
window.open(`/glcc/projects?projectName=${projectName}`);
}
return (

View File

@ -10,8 +10,7 @@ const {Search} = Input;
//
function ProjectList({applyTaskId, current_user, showLoginDialog, isStudentApplyDate, studentApplyEnd, location,history}) {
let openmmlab =location.state&&location.state.projectName;
let openmmlab =location.search&&location.search.split('=')[1];
//
const [keyword, setKeyword] = useState(openmmlab?'openmmlab':undefined);
const [data, setData] = useState([]);