Merge branch 'feature_GLCC' of http://106.75.45.236:3000/tongChong/forgeplus-react into feature_IDE
Before Width: | Height: | Size: 819 KiB After Width: | Height: | Size: 193 KiB |
Before Width: | Height: | Size: 425 KiB After Width: | Height: | Size: 80 KiB |
Before Width: | Height: | Size: 235 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 728 KiB After Width: | Height: | Size: 160 KiB |
Before Width: | Height: | Size: 2.0 MiB After Width: | Height: | Size: 406 KiB |
Before Width: | Height: | Size: 385 KiB After Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 241 KiB After Width: | Height: | Size: 63 KiB |
|
@ -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 (
|
||||
|
|
|
@ -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([]);
|
||||
|
|