From 6a3333510d4aed9130cce629149df1273a56a02e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 6 Nov 2024 14:22:34 +0800
Subject: [PATCH] =?UTF-8?q?uos=E4=B8=93=E5=8C=BA=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=20fix=20#123152?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Information/Pages/JCC/homePage.jsx | 2 +-
src/forge/Information/Pages/headerPage.jsx | 4 +-
.../Information/Pages/headerPagebyCCF.jsx | 2 +-
.../Pages/homepage/component/introduction.jsx | 11 +++-
.../Pages/homepage/component/news.jsx | 8 ++-
.../Pages/homepage/component/project.jsx | 53 ++++++++++++++----
.../homepage/component/specialProjects.jsx | 22 ++------
.../Information/Pages/homepage/image/left.png | Bin 0 -> 2379 bytes
.../Pages/homepage/image/proType4.png | Bin 0 -> 1542 bytes
.../Pages/homepage/image/proType4_active.png | Bin 0 -> 3435 bytes
.../Pages/homepage/image/proType5.png | Bin 0 -> 922 bytes
.../Pages/homepage/image/proType5_active.png | Bin 0 -> 1704 bytes
.../Pages/homepage/image/right.png | Bin 0 -> 2384 bytes
.../Information/Pages/homepage/index.scss | 47 ++++++++++++++--
14 files changed, 109 insertions(+), 40 deletions(-)
create mode 100644 src/forge/Information/Pages/homepage/image/left.png
create mode 100644 src/forge/Information/Pages/homepage/image/proType4.png
create mode 100644 src/forge/Information/Pages/homepage/image/proType4_active.png
create mode 100644 src/forge/Information/Pages/homepage/image/proType5.png
create mode 100644 src/forge/Information/Pages/homepage/image/proType5_active.png
create mode 100644 src/forge/Information/Pages/homepage/image/right.png
diff --git a/src/forge/Information/Pages/JCC/homePage.jsx b/src/forge/Information/Pages/JCC/homePage.jsx
index 999876ee7..8faf02091 100644
--- a/src/forge/Information/Pages/JCC/homePage.jsx
+++ b/src/forge/Information/Pages/JCC/homePage.jsx
@@ -141,7 +141,7 @@ function HeaderPageJCC(props){
{
data.introductionImage &&
-
+
}
}
diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx
index cc21f1535..654fa1dc7 100644
--- a/src/forge/Information/Pages/headerPage.jsx
+++ b/src/forge/Information/Pages/headerPage.jsx
@@ -79,8 +79,8 @@ function HeaderPage(props){
- {firstDir.name}
+ {window.scrollTo(0,450)}}>{firstDir.name}
{window.scrollTo(0,450)}}>更多
{secondDir.name}
++ {window.scrollTo(0,450)}}>{secondDir.name} +
{secondDirIntro}
,
+ nextArrow:
,
+ afterChange: (currentSlide)=>{onClick(list[currentSlide*pageSize].id)}
+ }
+ const pages = []
+ for (let i = 0; i < Math.ceil(list.length / pageSize); i++) {
+ const start = i * pageSize;
+ const end = start + pageSize;
+ pages.push(list.slice(start, end));
+ }
+ return {homepageProjectTitle}
{subTitle}
-{item.projectLeader}
+{item.projectLeader}
{homepageSpecialProjectTitle}
{subTitle}
-|m+8xan~yEg(Cq&U7^ANAm+x7fE8Wy3PHxi(2$! z%0R~Y(*wmhnUbiC*FopFV|gaHKC1qiF03zgwW_+z1C=PMtPp4lKhd;UKam1UL*#hK zyl(M4Bfy|lQWzr;%CU{E>S}XRfZsxj*%pv#80>gEc;Hwe4PVE(qz1;`&VPd=VpU-yM60#T+=Ds&u?p1SnR!< z6m#jO(=FQ4A5>TDgrY(8Xk^k;$lGK601p`OIt|$o7lFZA*3+(nqN5Ctb+Eq0Yzg8l zHZdSniLvEM-!Qw1-MS;1s{AHH?@p|q?B6@C-RHe8_X*@?U>(|hFr70Lg++ogNc`{= zet>)|co1QNtS~vB$)*@|xEqjh>B9rq_EN|L&9Dd|xX*oWrYuyrVj!eqRIAXlhc=_; zQ>>iEzSCi&6$=!kzEqJ^{z6 qvZIUcjB`GWSD!Lrk0 c}!ipzj?WDyKvY-7w6hNUJ2hDy-F zo~T4u8H$bxa3^p{9q9fu&4%7@Ee7kC6P-uloNk>4(n$>ZnIOQHqy$OQnCuB103sIz zO~~1fz+ $RA=+Mv?H<9p-KU>(rwx!?5o-r+)gSxVT# zsVo*Xe0~py5TnMy|1rSt&?STBldWXXU{!f)Wk>GgvD>)v!QcAc{{TYZ7pVK2<i}X t@KyhjG?58G|>w!0iQ$l>PuE+XO6|RQqZog>kt&w{Cw9 zT(Hg{WVJaiu}7w?6YxhBVC`T5g-_r1SgG_)2*&KHH8Cv?R_n~@1sLm^gz$;1dBN8b zWccN31q(pcTPJ{(D=LolC>Y+&rXvnwym(h >^);bndzvo($ zN7N0= A=d=(=e%vjx&OwN>QchQEhQj7QxTOFSH40!!A1(z2iR#Ot6IQ?cr{d$t1;bl}@6 zpzAq&WUsu896lp)#7#BF>Fu8CQfx=LbE=QA{bnMVaoTCI61&_{0WFXFyBW~|(vK2u zQN=;H0o9_dl2E+E1?$C4fISgXFmEHTFLp(6Ggi_jn@tsa;$3}Y0+qpJg7UV$6_|6U zg7Th{$^zzbnJ?*OrUF~FJM?J@8vC>mT?Zz>?6x=IQaL*v*a5$n5nN!3C4)-^Cc8_? z4%>Czf3K6tQU)V8G^mN4$pq?Lr-9IV;3_*u8O#wxW9ct6mhK&(8=2F!X5h_DWKhm} wDlip+dD&Bd<;4=JdK4B@eN%baceED!2d=I_PaCIpCIA2c07*qoM6N<$f*$#-GXMYp literal 0 HcmV?d00001 diff --git a/src/forge/Information/Pages/homepage/image/proType5_active.png b/src/forge/Information/Pages/homepage/image/proType5_active.png new file mode 100644 index 0000000000000000000000000000000000000000..2e291efe03957757eeb21909cc908449c99a8fd5 GIT binary patch literal 1704 zcmV;Z23PrsP) zAH?tk3DJa$NQ;RffhQv-K8OXR;zMZwqaq|lxkMr$6l5!x(iRrzMQFR*-R^#$=M0?9 zbi3Q`Zh 6Icy( Mr<2pDv* zXjFm*fpROpj}_D2s!bH(m&Q+=@r)(8cr?O$Rn>j$&h;N#on7sqLY-pXQ~5Q4zB{?- z{m}@_Ot)NJjX&SITCZx_i2=|%XO)jCcKd^N*nasWbb5MkA87vjFereU4v6&s8oJHx zg!7$uz~$|O%-FF|lx&S^2cKG`33$V~qx~TBEh(@ne <7U*W@1K59~0qmH_ zS#b%lFg }7?;|IIf+tYNYweg4y9fQ&!jZ D7B%fg5Q9%y|{K|yMb24Hr`N^gj_^h~8JjZ%WK-4k( za{Fqns9@OMnDp%OF?xfAWW@54`*Dtxm#sMq2z)kbekG3M7BO@ ye!)W zrPdt(wo_>)AOb&htFgAz?dqmZIpVAG9{PINWt=CizuR>9T36?7d8_I7lGIE(WceZJ zmo;a85<7FC k7i0^QC33LE zE{aA|&;5pDj_aqW?}gM1n=N5nN#L#o^L(D0^Mw+3YvDX$kzqsAB*HyVdxL>fVOcwE zwn#wI=;^kWBbV>DHPPRr|CWs#6PGO~YdDTXz-y<@7LF8ABJz`m15VCB2}rHx#>HyZ zW<}0(6$YKoTvap=Qq8d-b`O0#Sdo$=%)m5XRM103T)y#8LjBNmsg_+JP|tKw+SzzU zBp#2Wv7vy61sw{UJ(zbz)-&HZ=b_ClN4ulO&{%xB@D@@_J0g2NSzO?`JL*UW%Xt2d ze)5?@hJG!3+7dbl1%i;xQF0MDodju&oY3;T!;ZA9aZWmdC0n9K+fIez!oPP<#~Y3D zd6twJ>;Uq?pL9*hP2kjM%*vd?kT;uQM>;SH@@MvS`8(M) Nxw`-J5@k_a4UG zm8*3M6!V#a?sCf}*@Q=qbfX~b!kZFVBp+o}ul9vv+_j}xXHZsSbWB)2m*TlMexzXo z*XIP+G_Bp!qkgK;0FE|+&q>QJ8IM(r4&);ZPkxTTjeG+_X>1cOAO+Z0n`4b}`u9jC zBMlmCeN_RcrfN0bicP;$|3m0UO-RM4l&Jt&It@an^iz5=l7j}y%|4y423Blt<7N9n z^OuG_m1TOo+R 3uy|NA7+|V2tqk+)hRb`n~ z?GqX(m)NHiTz`S0n~$a_H$5vhY#9=oU$Xn(X<)@FOiUZJ06eY-q7x;b7X7!MN69Cz zF(A_By_M@gg95%ilv;D~a+>zIxQ3jEE)(=hjqjO0fPLP#Hj0-%AvGNcJ>)7+Xn_A^ z4^}|5xw=82*|T#kNfV|grj3XNdR3nX-;LCZ%S2f6sIDx)e;loQLII3uT2TQjHhnZ? yBGLd%#sW0-GM#SZyc&U 6;@e6ZOW2>l pk)PfwT0sbW2%*-WeR&?Cn7+Yhn(PNX8V25DiEQ89q0Zu*8Y#HRyB0 z=f=8s0pUdqt-AA^b&*hx3>~rrz<5dThYj`a9@w+L`<}lKi8<` a(|sKv=B2&~+u7gmvDvF98hzE@QR!HoX`j{%U`{ ztJGmS_}fg+wwbPNGac#pR#Py5u3Nu%xFb^_!nY&WTHaTz34(-WW|P6A-Ed~9Ow)WF zCMq+a5f@CTqKVtm10dn?+bYXjM`*}kVL L9U7%zM4RXF=dC+L$bO{p_2;Z(fsio%({bMuIW)=q7r6=1rl j6sLqLkjP)lcIRIlhB*~Y2iy%50-olYkI|c*k2#v3*yLB#T z5gP8tk=VW+eGfA5&QD_2$Ap~bqP<4I;G@-Ua+^lGM-dd5aQi4;m2*eC4t$rcDS=c6 z!?s01*z;yX$)7(smCNBh2R%)ck>K0vMsQWm=NYv^=RDD4!x1}OSIEQ+tgYM{o4R#7 z$b(^1W&Af3X{f`ODlU^->7I}de1Ek=s5+#XI$#BAf~>`wAd9)E*_^s57w2z@HrC#N zv7zghJex*XP(BF06SdahBGuc{J2l()N=1F~a0*O=$m?MV++ENLwt5bB+KZ*|34jkh z2#-PhYR8#baKY+`y)1o&r`zZ{(g1lqyOHGfEC9IW>zYVYZP4YwCSk5CP9nJ7O0|bV za)F$Osz}8n`k?}Z>^t%fZZ`ZdWm&GbN DTU-2&c8#3u}vn-E6Nwjk4Eqc8q+@7^@7vchaTyYQ=#N?qBV2@{Eh zzW{28+i`ooiVCE{ -c~svRU``Pa^HH|4&j^FVaUkQCld-CU<>#i z^pzEg$5%uG+?LNzm$MsfLcxn43fPa8I&L(;Z5>OGWgDOP7#IE9HvbzcVq-9uRt9s! zsXb{TM)EUt_qn@YWw6%Uc{h2RL>Cxe>EC3VL Il)6EtKxaq@oo=F_k7>I4u`! zHQ@F^x&f-bedtp2bY_+vU1(tQ(6@vs&A9O8N_DpkKE(cIhW~(9X|t<8PwlydCD%ka zF2R}gz27HvDTc6z%rI)LHk2o&rl-NFqy+^ylhy~z$#q8Sqt6S*tBsNaHZ|@qY1%D^ z=Oj+{avPljrJq|Yhy-jQ7OjmQ9wYkB&eIcT%}u5hsP$Hmif88vad-e^0EyvSbzoXH zEQ?>3>xGBvxkq)rS?#tg_}i54PouGFJ%V-U^40VCRwrffX@TpCR3>g$uIKRHwDy1g zCG7e0fPCuFP<{zBCM3hLw#m&DeLir-M~Gj$yUWZ|ky>k$C!!hIjue9LHvYHLLOL}b z5bOy#Xktth5$5mzp2H#xS!bP%bX$-Gz*a;ae3iBT@I9xq?KxMMDHdK?)z35lww5?4 zB1+woJ~VqI!wnu`Zs#e%3I`7qcaToSn}O1!c0|I_Sy9a-6rVerkN2NAbO@-*vfh_M zuqF=>HD@^eLwOFQJ-A4be|uLugR6V#Ha Wx=b zX9RmH!qR$-6qgpaxsd6RA!d1%u4DNTA#0Zfdnot@a09dHV+kyGZJlSN TyTjKt-WKcZ
AFll#Hb+4^0e%|bf$YUKh_MuI*lHLEB {uwqv&>5$r%z>th6s=7y#FD9e)bcOBIJz rRsrl3Slzm({6|CZqE~&|I^Y{Q=gYm$g?2?uy+k5OL_WeYk5KG?U<3qk literal 0 HcmV?d00001 diff --git a/src/forge/Information/Pages/homepage/index.scss b/src/forge/Information/Pages/homepage/index.scss index db0855268..84235dd24 100644 --- a/src/forge/Information/Pages/homepage/index.scss +++ b/src/forge/Information/Pages/homepage/index.scss @@ -65,6 +65,20 @@ color: #D9D9D9; } } + .intro_1_carousel{ + width: 526px; + float: right; + margin-left: 35px; + .slick-dots li button:before{ + font-size: 10px; + top: -12px; + } + } + .intro_image{ + width: 526px; + height: 272px; + object-fit: scale-down; + } } .news_1_bg{ background-image: url('./image/new1.png'); @@ -186,7 +200,7 @@ } } .project_1_bg .proTypeBox, .specialProjects_1_bg .proTypeBox{ - width: 280px; + min-width: 275px; height: 63px; background: #F5F6F7; border-radius: 8px; @@ -207,6 +221,12 @@ .icon2{ background-image: url('./image/proType3_active.png'); } + .icon3{ + background-image: url('./image/proType4_active.png'); + } + .icon4{ + background-image: url('./image/proType5_active.png'); + } .s_p_order_1, .s_p_order>img{ display: none; } @@ -225,7 +245,7 @@ background-image: url('./image/s_project7.png'); } } - .icon1, .s_p_order_icon, .icon0, .icon2{ + .s_p_order_icon, .p_1_icon{ width: 22px; height: 22px; background-size: 100% 100%; @@ -239,12 +259,30 @@ background-image: url('./image/proType2.png'); } .icon2{ - width: 25px; - height: 19px; + height: 18px; background-image: url('./image/proType3.png'); } + .icon3{ + width: 24px; + height: 24px; + background-image: url('./image/proType4.png'); + } + .icon4{ + background-image: url('./image/proType5.png'); + } } +.project_1_bg .proTypeBox{ + min-width:200px; + .s_p_order{ + display: none; + } +} +.specialProjects_1_bg .proTypeBox{ + .p_1_icon{ + display: none; + } +} .source_1_bg{ background-color: white; background-image: url('./image/source1.png'); @@ -350,6 +388,7 @@ margin: 0 0 35px 0 !important; } .s_p_detail{ + flex-direction: column; flex: 0 0 calc(33.333% - 20px); background: #FFFFFF; box-shadow: 0px 0px 10px 1px rgba(28,48,175,0.08);