diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx
index 7f63044a9..09728dc77 100644
--- a/src/forge/AboutUs/AboutUs.jsx
+++ b/src/forge/AboutUs/AboutUs.jsx
@@ -1,6 +1,7 @@
import React , { useEffect , useState } from 'react';
import { TPMIndexHOC} from '../../modules/tpm/TPMIndexHOC';
import { Timeline, Carousel } from 'antd';
+import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import CountUp from 'react-countup';
import axios from 'axios';
@@ -17,6 +18,14 @@ import fun2 from './image/fun2.png';
import fun3 from './image/fun3.png';
import fun4 from './image/fun4.png';
import fun5 from './image/fun5.png';
+import huawei from '../Main/img/index/unit/huawei.png';
+import langchao from '../Main/img/index/unit/langchao.png';
+import jijinhui from '../Main/img/index/unit/jijinhui.png';
+import mulan from '../Main/img/index/unit/mulan.png';
+import xigongye from '../Main/img/index/unit/xigongye.png';
+import feiteng from '../Main/img/index/unit/feiteng.png';
+import xiuos from '../Main/img/index/unit/xiuos.png';
+import huake from '../Main/img/index/unit/huake.png';
function AboutUs(){
const countUpProps = {
@@ -53,6 +62,19 @@ function AboutUs(){
}
}
+ const teamlist =
+ [
+ {url:"/Huawei_Technology",avatar_url:huawei,name:"华为技术有限公司"},
+ {url:"/openatom_foundation",avatar_url:jijinhui,name:"开放原子开源基金会"},
+ {url:"/Inspur",avatar_url:langchao,name:"浪潮信息"},
+ {url:"/mulan-community",avatar_url:mulan,name:"木兰开源社区"},
+ {url:"/CrowdOS_WeSense",avatar_url:xigongye,name:"西北工业大学"},
+ {url:"/pkecosystem",avatar_url:feiteng,name:"PK开源生态项目组"},
+ {url:"/xuos",avatar_url:xiuos,name:"泛在操作系统实验室"},
+ {url:"/hustos",avatar_url:huake,name:"华中科技大学操作系统团队"},
+ ]
+
+
return(
@@ -255,6 +277,23 @@ function AboutUs(){
简历投递邮箱:zengyt#csxjy.com.cn 曾先生 (用@符号替换#)
+ {/* 精选组织 */}
+
+
+
精选组织
+ {
+ teamlist && teamlist.length > 0 &&
+
+ {
+ teamlist.map((i,k)=>{
+ return(
+ 
+ )
+ })
+ }
+
+ }
+
{/* 合作单位 */}
diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss
index 640cd4b57..e44c6cf9e 100644
--- a/src/forge/AboutUs/AboutUs.scss
+++ b/src/forge/AboutUs/AboutUs.scss
@@ -21,6 +21,41 @@
top: -70px;
}
}
+.about_team{
+ min-height: 495px;
+ background-image: url('./image/teambanner.png');
+ background-size: 100% 100%;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ .about_team_lists{
+ width: 1200px;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ margin-top: 20px;
+ li{
+ height: 120px;
+ width: 266px;
+ margin-right: 40px;
+ margin-bottom: 20px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ &:hover{
+ background-color:#ffffff;
+ border:2px solid #ffffff;
+ border-color:#ffffff;
+ border-radius:6px;
+ box-shadow:0px 1px 8px rgba(0, 0, 0, 0.06);
+ }
+ &:nth-child(4n){
+ margin-right: 0px;
+ }
+ }
+ }
+}
.aboutUs_head.df{
flex-direction: column;
justify-content: center;
diff --git a/src/forge/AboutUs/image/teambanner.png b/src/forge/AboutUs/image/teambanner.png
new file mode 100644
index 000000000..c57724d36
Binary files /dev/null and b/src/forge/AboutUs/image/teambanner.png differ
diff --git a/src/forge/Main/img/index/banner 15.25.50.png b/src/forge/Main/img/index/banner 15.25.50.png
new file mode 100644
index 000000000..92a1792b4
Binary files /dev/null and b/src/forge/Main/img/index/banner 15.25.50.png differ
diff --git a/src/forge/Main/img/index/banner.png b/src/forge/Main/img/index/banner.png
index 92a1792b4..631b8c6a6 100644
Binary files a/src/forge/Main/img/index/banner.png and b/src/forge/Main/img/index/banner.png differ
diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss
index 93528abad..8961320f3 100644
--- a/src/forge/Main/projecthome/Index.scss
+++ b/src/forge/Main/projecthome/Index.scss
@@ -1,6 +1,6 @@
.banners{
background: url('../img/index/banner.png') no-repeat top;
- min-height: 516px;
+ min-height: 360px;
background-size: cover;
background-color: #0C2A5B;
.bannersCenter{
@@ -8,7 +8,7 @@
max-width: 1200px;
margin: 0px auto;
position: relative;
- height: 516px;
+ height: 360px;
}
.bTitle{
height: 30px;
@@ -35,8 +35,8 @@
.bannerBox{
background: url('../img/index/box.png') no-repeat;
background-size: 100% 100%;
- height: 240px;
- width: 380px;
+ height: 195px;
+ width: 330px;
margin:0px auto;
padding:25px 30px 34px;
.bannersProject{
@@ -48,12 +48,12 @@
.slick-track{
display: flex;
li{
- padding:15px 20px;
+ padding:3px 10px;
.projectinfos{
display: flex;
align-items: center;
width: 100%;
- margin-bottom: 13px;
+ margin-bottom: 8px;
img{
width: 32px;
height: 32px;
@@ -63,7 +63,7 @@
.name{
height: 28px;
line-height: 28px;
- font-size: 20px;
+ font-size: 18px;
font-weight: 500;
overflow: hidden;
white-space: nowrap;
@@ -104,7 +104,7 @@
}
.infoData{
display: flex;
- margin-top: 16px;
+ margin-top: 7px;
justify-content: space-around;
&>span{
display: flex;
@@ -127,7 +127,7 @@
.airBubble{
&>div{
position: absolute;
- height: 410px;
+ height: 100%;
width: 415px;
bottom: 0px;
&.right{