From 5ada6383d304e36c8af71f65afba0586bf7424a7 Mon Sep 17 00:00:00 2001 From: liu2592603532 <2592603532@qq.com> Date: Fri, 19 Apr 2024 17:08:00 +0800 Subject: [PATCH] merge --- react-ui/src/assets/img/clock.png | Bin 0 -> 7984 bytes react-ui/src/assets/img/creatBy.png | Bin 0 -> 1566 bytes react-ui/src/global.less | 115 +++++++++++--------- react-ui/src/pages/Dataset/index.less | 27 ++++- react-ui/src/pages/Dataset/personalData.jsx | 31 ++++-- react-ui/src/pages/Dataset/publicData.jsx | 32 ++++-- react-ui/src/pages/Model/index.less | 56 +++++++--- react-ui/src/pages/Model/personalData.jsx | 32 ++++-- react-ui/src/pages/Model/publicData.jsx | 32 ++++-- 9 files changed, 229 insertions(+), 96 deletions(-) create mode 100644 react-ui/src/assets/img/clock.png create mode 100644 react-ui/src/assets/img/creatBy.png diff --git a/react-ui/src/assets/img/clock.png b/react-ui/src/assets/img/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..a206836434fe4555c76f840326dd7be92e68cabc GIT binary patch literal 7984 zcmY*;WmHtr`u7G#>KpI3s zq=%4_*8h0#UGG}&hjY${z1KcFp8Y((NW8DFK}F6=4gdg^mL|do|Ly?ndEuvum*2zpI>V!vxVRc;z9IkqJ|AAZ-07TlOnM~-25#%4 zSI;E%()ci?iJK215vvbei_h8>FHW`os>2Q`;Yy{^bYq{5FI&F-r5~foe0KLhB;?(dm0MG&Gz_ii%MksKRcn_S0{TcQpx5viVisZE?fqb3>5^2BYs@zT~=Y zvG9Y^lC6+(#HhgzJzb;NAw@+B&#dyTuJvJU#)v$$OP^S!NAhB;q$XV{e z!NCMdvjm>FDdnxWz68UxCvL_T7Z;N}efspn()zW)S2ZV1D8dVcei$@cyy4NB+Za z4K71eE#Liy-nWNbY6noMsH>|}&$sw2wIfy~V6tx`6RKZ5$IpUBXck z*Ik>rl%03+I}+0Bu=F9agq4Nmyi0#4q7PDLRU@J|alA06SXxIHW-(j&jN%B;#e`q%6< zxYDeOuiWDeyjO1USA*Em1nkg4{c#_{IXu5Sjoq)GYyR@`vV_Xx=eK4g&9~0*(?|H> zhOpYXPKld$T@}p`)HHKu)V4G9W3s^C?0XtIYV&9)>=R%n(TM)(W{p}7Ms14V<5C2< z`%}1SO?jd>*IeSr5@8Y^Rrw@HAzQe;7WtBDQLlwvMKF7iXwGljyfb`PpdWjh)E_xl za!PQP@%l}95-5ZS-ercc8^XG6mgq?>f9d@rT%h-1Htt<#ftOGm06zaDX3*h0mRAociuEI zfI+`1cRbswu1~gou>E6@4W<*>`JEE;swwz{q$&C;2;{v)x_n4*EL-U%qXI-cK}8J> zY+qz^x~xN-u)`-+y{w@S;6>COZ3e1briO?c-Jx7J+O|CfR8qug#E*>3OL3E&TR0rs z);s@{Zf4mkA`t5bX0@)!#6koqZ^`c2Hv&L-&xUQ(u*{@6Zl{B?DHl+6?NmAM*l zzqtH%Obl{Yb~&-{x6KXJMVJ8=CDxWEv^PP3x!92uOhPIBa2HVB_g|N+sl>1U)oniq z(hkYqYV^H$c%P9G7;umADbiE@A~~%b#LDV1(;9MgVb+P=B_-m8Hi11qLYZ z`wM6-(pS8~0TIyj+UZefZ!XQY+l(?h>mc#~e*hKn4qo{+>dj+VI6Q;7A|A zN#)$@0z4!y!`<>E=SD3K-pJ77qI6qN9@?{@$CNCTaj#xxly7}evsD#-4BZ|bo1ect zp|y+ALKj+9nsDru=e)MQ$XELq!LJ;BQoF#GOo}liRRK1!kWb!6Vt^7E@W90I->PTJ zIZ4F!8-ch!4GR7A`xzR)cjg*>7uo_<;%kVQA6H-iaP5bS?RZ8JoA-P%+sl`eFTiB) zYvtRDN)L#bH*1YS%Erc5Vs3pUI_TB!+OPb4^c6@x$3u7~KX7ZICxo&G317-GpES`B zOnII(N$Ty7dK}zI+_V8iS0~|I94XM)-|QQpGf&hrHTK;^063vC;(RHu_7haq=d?%n z7#jQOh~Yv(?v9b6$^M%^gPMg;Yf~qD`cS@$Fj!K-HDepzxS8^ z;*itT=lk-cYcQ0$Wy>^vJLO}`lt9a!p|TJcIeHMlIU4%$AQSj=mqxaglx~?0V`phk z3|$-?h9|KL7Az2a5Z*97*8#3dMG=eO0rbq~&X4R8ZvP-7KSVV3(io0F=7i5-ectb` zt-|=sOz=CO6apXoF{aCg>Wjp4ZU=n49M86;^lg2_&`lEAeFW2dPA@jf6juPaFCJRJ z2&lLKWuGS-2al9Uy1OJNXUnulzyl2f+v9_G9M-v=oScRnV~A#6Ztq=KLP;0W&eV0z znShP=m`z<;;0ElF+I$o{ZHN74Al5jUf5)iVk`ez};#|$;0HlDJ<>x$w}wPDKgHjz_7Z9 zwqL@*L-lK>Li;<8?n}08?_8+mN?!t^tj=&P6DNK&?^tcaxr)IC{JW|*GP+I?>wWmN zEEnqQ`zuj>)s__FU>zYE;|=~bqE49<2qQ>^0?QMKNtHD#tiQXv z+px2u=#pZHN7?buHk zW-&9E@cqlF-_1^!+1hIu9<7c~I^sv?y}2?)jq5ykYy!y`;ou9431*6!3GELo)9k!N zU?bYac}L!Hl+q|GT^6r#g~4N5hHu^B!&j4i2&6M}-zN7wEmgcEfN@6|1azq&{+iSw zu~!OCSgn)oFC_+Q-Byu$G5for|r>@(9%ity-uW_rQ=_B66r z8K7V0h}9MGb8q0o>(8&Yf*YycPS?_9JROlPpL;jV-1s=p4I3scq~aGsu{YZl{Z{~g zjY1pdpxJK~fZ+Bvp1v2Md)zW&V!qBkK6N9okqwwf{-1}<#JM}aC^(U->h(-Mat>e>Na%&#c1Tw3=;UZc7@6}Nl%Yml33w~~;OPy8BR@1`1YD10>~nq=&X8RkyGawc_hRG^Mgu zJalE}J-Bvq7-rvPBN{#m?dj?1OG`^b$_mZ+DaG7RT(O-O3B1-!pQfY%Qon_^A#n-{ z3Vf7QRNhqsdU^jsh5@pX^73Fc;5P4eElfVZd-bqXY2U0jvfK|tVTqUXi^!os<7|Tlbq0!JeiC5yPYGA<|A)u@@6XxXg@PI#^o&>@`@>Wr#uSsp`6@* zXGou8QNt;S+@*%deE&iRvGl0vESHXVC+!Vx<%eP}fsSdza@-q@xTdInP(^Tc*g#tr z8_33v8#T&Q&HT0#^qyOV6{uVmEY4Ww``|o9is9R=9eVW=E7h{R*W7Y}Kdv;+7?o?r zHTMB(K%;*D20bLSs#)5g+*%`izA=nP6W2G)e8lMbVXgL+1Xho zJ_2au$O0YK@T1UNeEs@$yttSnReaZElE~bRcA;=)I8)5_NQH#GslKc0ujOmT_If}3 zfFzN--KM2F1~UkkUXZz5yS|5S|kNdSH4Tb}&q3@E{3zpN$gnZCY2C z?!6*}+pq95k1Df*Z_|~jydbY#_h*E`S~e*$iMEm-lXd3OU3C32wg%fWpli%Q04~wJ zwN%R9IPRlsExl|^&C6_+pH_lF9} z<=xU9Q^{Xn3&1XTfXBv`DdqAxH+}}5I`%rNA`|G#o_^;Ax{RSIt)}7j!D-aSt#9|& zS)BcrmME8pzF@ZM6w-Q30$NY{I%}PCu+XF)yb53hD1KN9e1x^;N*nT~{FcsiEwkE= zf+l^+1NH=H^+l&zgt{jy461rkRhlUH|x`Nk`?!32V@eDgnP*I8uXa{=)+CsG;jNjITwU z^sf$LY5H|FNxYO7=t>b1IdTIhpe5g!+Gfx&&_(czuQs*s0ut-W1uTmuZbsJb>S+-c zK~@V80q;sN`+#q1<=QNwngjAn1Be+3=vuA#p%2uV=Oy~5r$7~h8%&P*0VO|4s972* z!!rO-crg`kHRA{M+XTfiJ3SX~^ylYvjY<|@XEdj9yhbUHky;={A&?EpSlA&ia@Tvp zEnN+9+>|gj13HUIuwh6fWxyj5Wa6fFnmRQ}y+651gUfUz;+U1`2{ximeBIpE*>M4- z45zK1UgU<=1$yDE0qRu~rTWicv^Wj0 z4K46X7$&=*rjGl4e0;U?^=tYfZ7#pDYr0q72|G-7z*HPwf=p>$FcrZAsmJQw|3K1J zW5VJ-L9U;x1ieZ`!{Qs^8NxF-O({kb0p%wE6x9*Y+b;tK|2W|bP);QFYBi3C;(4`A z>mdtG&%ZvT1bDH9L>&Uw)5kGDE|7xXd=yB#aGHvBhvAkDg&Jy zsTHVR^>G&d=O|@k2;fT&QP>&V^oKP#^DdRMkYT7Sko$BQa0OOtn&oQ_KSLf^It3mk z-@*vVXGKtV&%2=uvj0&#iN?_%OM707=dlSd@tu~R05Rq+jeT6TWE^3oFi&F{-J3Vn_yx?B0x|!Z_-$LXtWMg zKW;3Yqy~0X1G@PkHNRr{^(KPxx;oJTLro6 z^iaxcVAh;w@+m2L7%mVZM3Uk z*CRlA$;2?VTU><;KIx))vucwWm_&*9ENjIw+Ve;r$uCKQGbjo%8rExlEsP!NEdpE)1(Z7p1DAfVHyb0&ERjkp6y73nDAKBZS;$)A-XAi6J#%(E z7>fC>gBO54XzmZh4lDHLHo6`$dLev7;@k=G%ZcOBdgxvDR%V+L^!5Hd{HVONfS4vC z{{-7!<`L$AXKX?Oi?{BmG>j;l+bo)Oyyr{gK!pN3(78g6I4PdnK%}UDHWWOd*^r2e zAPCaiQ@(1*M&6ybzuV0uMC1UEfr2RU0>jYX>p+MM@2Hsg(H9qe-ICWnhCvVU>3}H_ z^#^kzg1x%FzC7*nIN6>eF=7r8DiF9<;c(%St=Q$$^7DLUvm!qK6ONO?8@4Rx< zu$JzE$*Z2FY`V&8AqT01-jb#4Ht>6SC8O3;G}az09^PKdkJtQZN--C&`%qDiD_Fl5uEQik=xh9QAz5nZDFAdf z)SA!S%aWQ)3@5dPZ{ue)r;9mAm>g3KPUPEba*JNQglgNlXvL7DGMQq;d_eA+^D zuDkv}u@A{k@*;Ni8O2?ZG-tLmW+Q%RMeUo0ukzZ|OPkzqsaEzF18}hUk-bru3wXd4 zEeaVsZw(hW{itbgztlgNEmT5QedkR9VeIXdm%R^vC%scl*cK%W@vrLk5y0<+jSj+` zn0VQ6_$$8t$7PsgZ=e|J*j?SgJN2Mo8@Bk^KvN!n- zudQlR*74)~f1vNos`6uXRMNe8$wGx)Boy-(w6!pB)7v0geqR~W#@eqqZV}q7r%)Cx zRl9q+&w6$}^6l(v%JQ~iIGMHxnC{hh9n~DuMs}0Uo2t ze1Q}6n;J4quiM+06JJ4tZm*?a)yRseJ9d9N8g1jWoIgU2zqO)&G%=>D9(>@_n?N4+ z4xX^zwQqfA;i$J?sGdzykIplv%P^0kv+ph+*h=x^ghXbd_V_6rBvh|hA)Upj5h#Y9 z;ABQ)*Z|>dlIgRa*swR@OPcqNN3-UqB^~E2tzunsF5hZz`4YyAK9sv0M1dDJk5{I4 z((h5vEiNr_N`9F6|BaY1p$m&n_F-&aQvZ*Sve^b>ZfG8s8WTag0py_+yLwv4YfkUf)Y_z85o18dPg0}s1G752$jLv~mrEHu1M_OmS_z%$uQsXS zK3WsUjd&bh!gBLw1cpJKNE+irX4FI0Jv1&^1SN-TMs1GcYS!4%M%F=acyupbpYn3Al&k6uyrIH7EO^n33vQVIq;@Wq74?fv z@_szBf@XLFBtQE?x6cHp9XF|NKyx!yoQY2hlXG;OXy0WA*633A)}IJyYz{J(fg)znIhv zTDyvQ2Fmg3b#TJzRBJfi4TZ9Ca40J3O~4U|k{NJ{@Q%C%7g+M0Fg!XrZyzspf5028 z3r?RUCx>~Ge%PM6}#Q8v5< O4rr#1jL%qCTbv&fbl^} zF9JrYhDH-prShPpUJ41pl$KU~u!Y1LeGn2cme?jFcuUk+6Qj}+b+=dw#+K6V`2A;l z*4B(J2Rt@4B4SGmdwKjXspw~N~N)ke+!|oY+QXGpIy`n z7ZvaupLd0>qZ6%aIOy=yXD2yjdU=Y%R;93sO4ie;3}2cwh6$)sYn;~CapKau>Y}gy z~`_X9(Ab*d}RM$|$S$mG1GW`r< z+Lj=$az)>a5J>-Vb=9Pw5rDj%dbLWyhirU@iPFGrG=8|I@X%nB`o&9^CxF~?U7P}Z zz?sSNQkLZ3`9#J~he4nW@tlVZ#c7cyGE6(*jshsdsS( zj+%`$%dHf4hmNVY-9~W*K;w%TP@nV1d9!Sqk$TpY>&$u^-Q4L0067)9FiqntrpSCF z?Q_*gBRs0G_OB+@7dvDe0A`y-%rY1N2@Brj=gtb$AR# zu@yWHz>*5RpF_MHWSDJ5z`lop6?r#m>FNQhTLJ^A3pFXR(~(I4G`@ho*24$cwg3*7 z0Rmtqk=5ApI`Dn3-6&jz%cH5dd7x1Z#sSDL*9}aU)plxust17s+st|kh~ii5SArl8 zhMUz3lK^D)nKFO%O~}UW%~}AQe~nAG&Ej$N8Pw-~h<4(5LuilOF?O+nV^kn{J7PZU(lEFkVlGn^cLC)Jb07AA}lr z)Br`R{F@O309}40l!{D6zO$VG-uFNJR1dcmkenZz_wQm&kXVV8Kme$S!Cb16mHQK8 zprA6|*qTS8^*5$dtnU~_T zRO6>WZF`VWofUXTF@S}%Z3w0+TEG%l;X;4Zjn=J>*DkYv&+~x%4I&KWPFaB;xdI78 z*r}C5CIxLK5u-QP+gIXP-CThlS%J$z=tH8hLgEf=kGf5wNb#!w$i4z6>f;IwCLO@U zAi_k&b)-6fcYz;rpP+2i9YB&?NCLTpvo9=EjCZ3I0^$lQ@F%3!wq(xDg#rh$q{zx* ze_TicT(XpHB^DsjAg<7Di~&O)8NY}!>r#cKNZE=II*AP%A%J$tLe@0emO>;NYYT!| z=#Vv)uwkIn&9X4ld&%zo)`f`1V=Cuyot2h>uwODK{NF8A+PH%Bk*X}!*;q*C^nB!6 z(P_ytpOG3QQ@VfRt0oJasZ7#o>EQQ;ril5yW1s0zX6<~x;KaVr);PJfG6}#5<^`Z9qQFE= zBEL83GhG{*{RirdsYZzB2e(a}AH?s>Rp@89mHw8gF~U4c*Vw&I${50pgkIFP85@rX z@N9pRYM8JwesA=CotA$q&d|Tsn}V3jcJ%!(!arjpx1C4b0q|*Nna*FBiu3%sVlIvI z8jHsF4yR)6)kZ}YH6^aw>!cTJn2*l=SGLz_?hw!Bio(YfLp@&p7Y7_Vf^FgB>V(@W zc^)w_s1N(48D8#S{JYQvg+1KBYM!o-=OJItPJLgR!p8*R@{(w5itmP`3cp9ju;o&V zIyX~iPXN;SrgFWKXH6ZOa@C+=BpvmGN7aC*)m~}TM1gbJ zBL$B-mpwE$#%wNo0B4=c9;0ZVv&$Z?;M}g;M6cQuI_-JYhD+Ty8`o|A1%A#9 tr > th { background-color: #fff; @@ -56,27 +51,34 @@ a { } .ant-menu-light .ant-menu-item-selected { background: rgba(197, 232, 255, 0.8) !important; + +} +.ant-menu-light .ant-menu-item-selected .ant-pro-base-menu-inline-item-text{ + color:#1664ff; } .ant-pro-layout .ant-pro-sider .ant-layout-sider-children { background: #f2f5f7; } -.ant-pro-base-menu-inline-item-title .ant-pro-base-menu-inline-item-text { - color: #1d1d20; - font-size: 16px; +.ant-pro-base-menu-inline-item-title .ant-pro-base-menu-inline-item-text{ + color:#1d1d20; +font-size:16px; } -.ant-pro-layout .ant-pro-sider-menu { +// .ant-menu-light .ant-menu-item-selected{ +// color:#1664ff; +// } +.ant-pro-layout .ant-pro-sider-menu{ padding-top: 40px; } -.ant-pro-global-header-logo-mix { - width: 257px; +.ant-pro-global-header-logo-mix{ height: 75px; - margin-left: -16px; - padding-left: 28px; - background: #f2f5f7; border-bottom: 1px solid rgba(233, 237, 240, 1); + margin-left: -16px; + width: 257px; + background:#f2f5f7; border-top-right-radius: 20px; + padding-left: 28px; } -.ant-pro-layout .ant-pro-sider .ant-layout-sider-children { +.ant-pro-layout .ant-pro-sider .ant-layout-sider-children{ border-right: unset; border-bottom-right-radius: 20px; } @@ -85,16 +87,21 @@ a { background: #f2f5f7; border-radius: 0px 20px 20px 0px; } - -.ant-drawer .ant-drawer-body { +.ant-pro-layout .ant-pro-layout-content { + background-color: transparent; +} +.ant-drawer .ant-drawer-body{ padding: 0; } -.ant-drawer .ant-drawer-body .ant-row { +.ant-drawer .ant-drawer-body .ant-row{ padding: 0 24px; } -.ant-drawer .ant-drawer-body .ant-form-item { +.ant-drawer .ant-drawer-body .ant-form-item{ margin-bottom: 20px; } +.ant-menu .ant-menu-submenu-title .anticon { + font-size: 16px; +} .ant-table-wrapper .ant-table-pagination.ant-pagination { margin: 0; padding: 21px 16px; @@ -110,10 +117,9 @@ a { height: 94vh; } .ant-pro-layout .ant-pro-layout-container { - height: 100vh; - overflow-y: hidden; + height: 98vh; } -.ant-modal-confirm .ant-modal-confirm-paragraph { +.ant-modal-confirm .ant-modal-confirm-paragraph{ margin: 54px 0 auto; text-align: center; } @@ -124,35 +130,36 @@ a { margin-top: 30px; text-align: center; } -.ant-modal-confirm-btns .ant-btn-default { - width: 110px; - height: 40px; - margin-right: 10px; - color: #1d1d20; - font-size: 18px; - background: rgba(22, 100, 255, 0.06); - border-color: transparent; - border-radius: 10px; +.ant-modal-confirm-btns .ant-btn-default{ + width:110px; +height:40px; +background:rgba(22, 100, 255, 0.06); +border-radius:10px; +color:#1d1d20; +font-size:18px; +margin-right: 10px; +border-color: transparent; } .ant-modal-confirm-btns .ant-btn-default:hover { background: rgba(22, 100, 255, 0.06); border-color: transparent; } -.ant-modal-confirm-btns .ant-btn-primary { - width: 110px; - height: 40px; +.ant-modal-confirm-btns .ant-btn-primary{ + width:110px; + height:40px; + background:#1664ff; + border-radius:10px; font-size: 18px; - background: #1664ff; - border-radius: 10px; } -.ant-modal .ant-input-affix-wrapper { +.ant-modal .ant-input-affix-wrapper{ height: 46px; padding: 1px 11px; } -.ant-modal .ant-select-single { +.ant-modal .ant-select-single{ height: 46px; + } -.ant-modal .ant-select-single .ant-select-selector .ant-select-selection-placeholder { +.ant-modal .ant-select-single .ant-select-selector .ant-select-selection-placeholder{ line-height: 46px; } .ant-modal .ant-modal-close-x { @@ -169,14 +176,13 @@ a { .ant-modal .ant-modal-content { padding: 0; } -.ant-modal-confirm-body-wrapper { - height: 303px; - background-image: url(/assets/images/modal-back.png); - background-repeat: no-repeat; - background-position: top center; - background-size: 100%; - border-radius: 21px; - border-radius: 0; +.ant-modal-confirm-body-wrapper{ +height:303px; +background-image: url(/assets/images/modal-back.png); +background-repeat:no-repeat; +background-size:100%; +background-position: top center; +border-radius: 0; } .ant-modal .ant-modal-content { border-radius: 20px; @@ -204,6 +210,17 @@ a { border-radius: 6px; } +.ant-tabs { + .ant-tabs-nav::before, + div > .ant-tabs-nav::before { + border: none; + } + + .ant-tabs-nav { + margin-bottom: 0; + } +} + // ::-webkit-scrollbar-button { // background: #97a1bd; // } diff --git a/react-ui/src/pages/Dataset/index.less b/react-ui/src/pages/Dataset/index.less index 9ab21750..d22c8dbe 100644 --- a/react-ui/src/pages/Dataset/index.less +++ b/react-ui/src/pages/Dataset/index.less @@ -7,6 +7,7 @@ padding-right: 30px; background-image: url(/assets/images/pipeline-back.png); background-size: 100% 100%; + font-family: 'Alibaba'; } .datasetIntroTopBox { display: flex; @@ -38,6 +39,7 @@ background: #ffffff; border-radius: 10px; box-shadow: 0px 2px 12px rgba(180, 182, 191, 0.09); + font-family: alibaba; .dataButtonList { display: flex; align-items: center; @@ -68,6 +70,7 @@ .datasetBox { font-family: 'Alibaba'; background: #f9fafb; + :global { .ant-tabs-top > .ant-tabs-nav { margin: 0; @@ -117,6 +120,7 @@ margin-right: 10px; padding-top: 15px; background: #ffffff; + font-family: 'Alibaba'; box-shadow: 0px 3px 6px rgba(146, 146, 146, 0.09); .custTab { display: flex; @@ -136,6 +140,7 @@ padding: 15px 20px; overflow-x: hidden; overflow-y: auto; + font-family: 'Alibaba'; .itemTitle { margin-bottom: 15px; color: #1d1d20; @@ -205,6 +210,7 @@ display: flex; flex: 1; flex-direction: column; + font-family: 'Alibaba'; height: 100%; padding: 22px 30px 26px 30px; background: #ffffff; @@ -223,6 +229,7 @@ flex: 1; flex-wrap: wrap; align-content: flex-start; + font-family: 'Alibaba'; width: 103%; .dataItem { position: relative; @@ -238,8 +245,12 @@ position: absolute; top: 20px; left: 20px; - color: #1d1d20; - font-size: 16px; + background: linear-gradient(to right ,rgba(22, 100, 255,0.6) 0,rgba(22, 100, 255,0) 100%); + height: 6px; + line-height: 0px; + color:#1d1d20; + font-size:16px; + } .itemDescripition{ position: absolute; @@ -256,6 +267,8 @@ } .itemTime { position: absolute; + display: flex; + align-items: center; bottom: 22px; left: 20px; color: #808080; @@ -263,12 +276,22 @@ } .itemIcon { position: absolute; + display: flex; + align-items: center; right: 20px; bottom: 22px; color: #808080; font-size: 13px; } } + .dataItem:hover{ + border-color: #1664FF; + box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2) + + } + .dataItem:hover .itemText{ + color: #1664FF; + } } } } diff --git a/react-ui/src/pages/Dataset/personalData.jsx b/react-ui/src/pages/Dataset/personalData.jsx index f5632d0d..3d183016 100644 --- a/react-ui/src/pages/Dataset/personalData.jsx +++ b/react-ui/src/pages/Dataset/personalData.jsx @@ -1,4 +1,6 @@ import { getAccessToken } from '@/access'; +import clock from '@/assets/img/clock.png'; +import creatByImg from '@/assets/img/creatBy.png'; import { addDatesetAndVesion, getAssetIcon, getDatasetList } from '@/services/dataset/index.js'; import { getDictSelectOption } from '@/services/system/dict'; import { PlusCircleOutlined, UploadOutlined } from '@ant-design/icons'; @@ -40,7 +42,7 @@ const PublicData = (React.FC = () => { }; const [queryFlow, setQueryFlow] = useState({ page: 0, - size: 10, + size: 20, name: null, available_range: 0, }); @@ -149,6 +151,11 @@ const PublicData = (React.FC = () => { const onFinishFailed = (errorInfo) => { console.log('Failed:', errorInfo); }; + const onPageChange = (pageNum, pageSize) => { + console.log(pageNum, pageSize); + setQueryFlow({ ...queryFlow, page: pageNum - 1, size: pageSize }); + getDatasetlist({ ...queryFlow, page: pageNum - 1, size: pageSize }); + }; useEffect(() => { getDictSelectOption('available_cluster').then((data) => { setClusterOptions(data); @@ -268,17 +275,18 @@ const PublicData = (React.FC = () => { ? datasetList.map((item) => { return (
routeToIntro(e, item)}> -
{item.name}
+ {item.name}
{item.description}
- {item.create_by} -
-
+ {item.create_by} +
+
+ 最近更新: {moment(item.update_time).format('YYYY-MM-DD')}
@@ -287,7 +295,14 @@ const PublicData = (React.FC = () => { : ''} {/* Demo */} - + { const onFinishFailed = (errorInfo) => { console.log('Failed:', errorInfo); }; + const onPageChange = (pageNum, pageSize) => { + console.log(pageNum, pageSize); + setQueryFlow({ ...queryFlow, page: pageNum - 1, size: pageSize }); + getDatasetlist({ ...queryFlow, page: pageNum - 1, size: pageSize }); + }; useEffect(() => { getAssetIconList(iconParams); getDatasetlist(queryFlow); @@ -217,17 +224,19 @@ const PublicData = (React.FC = () => { ? datasetList.map((item) => { return (
routeToIntro(e, item)}> -
{item.name}
+ {item.name} +
{item.description}
- 最近更新: {moment(item.update_time).format('YYYY-MM-DD')} -
-
- 1582 + {item.create_by} +
+
+ + 最近更新: {moment(item.update_time).format('YYYY-MM-DD')}
); @@ -235,7 +244,14 @@ const PublicData = (React.FC = () => { : ''} {/* Demo */} - + diff --git a/react-ui/src/pages/Model/index.less b/react-ui/src/pages/Model/index.less index 81a18b11..5bf1cc1b 100644 --- a/react-ui/src/pages/Model/index.less +++ b/react-ui/src/pages/Model/index.less @@ -222,35 +222,65 @@ width: 100%; .dataItem { position: relative; - width: 32%; - height: 66px; - margin: 0 15px 18px 0; - background: rgba(128, 128, 128, 0.05); - border-radius: 8px; - box-shadow: 0px 0px 12px rgba(75, 84, 137, 0.05); + width: 23%; + height:164px; + background:#ffffff; + border:1px solid; + border-color:#eaeaea; + border-radius:4px; + margin: 0 20px 25px 0; cursor: pointer; .itemText { position: absolute; - top: 10px; + top: 20px; left: 20px; - color: #1d1d20; - font-size: 15px; + background: linear-gradient(to right ,rgba(22, 100, 255,0.6) 0,rgba(22, 100, 255,0) 100%); + height: 6px; + line-height: 0px; + color:#1d1d20; + font-size:16px; + + } + .itemDescripition{ + position: absolute; + top: 57px; + left: 20px; + padding-right: 28px; + color:#575757; + font-size:14px; + word-break: break-all; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; } .itemTime { position: absolute; - bottom: 10px; + display: flex; + align-items: center; + bottom: 22px; left: 20px; color: #808080; - font-size: 14px; + font-size: 13px; } .itemIcon { position: absolute; + display: flex; + align-items: center; right: 20px; - bottom: 10px; + bottom: 22px; color: #808080; - font-size: 14px; + font-size: 13px; } } + .dataItem:hover{ + border-color: #1664FF; + box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2) + + } + .dataItem:hover .itemText{ + color: #1664FF; + } } } } diff --git a/react-ui/src/pages/Model/personalData.jsx b/react-ui/src/pages/Model/personalData.jsx index a52420c8..152b3450 100644 --- a/react-ui/src/pages/Model/personalData.jsx +++ b/react-ui/src/pages/Model/personalData.jsx @@ -1,4 +1,6 @@ import { getAccessToken } from '@/access'; +import clock from '@/assets/img/clock.png'; +import creatByImg from '@/assets/img/creatBy.png'; import { addModel, getAssetIcon, getModelList } from '@/services/dataset/index.js'; import { PlusCircleOutlined, UploadOutlined } from '@ant-design/icons'; import { Button, Form, Input, Modal, Pagination, Radio, Select, Upload } from 'antd'; @@ -148,6 +150,11 @@ const PublicData = () => { const onFinishFailed = (errorInfo) => { console.log('Failed:', errorInfo); }; + const onPageChange = (pageNum, pageSize) => { + console.log(pageNum, pageSize); + setQueryFlow({ ...queryFlow, page: pageNum - 1, size: pageSize }); + getModelLists({ ...queryFlow, page: pageNum - 1, size: pageSize }); + }; useEffect(() => { getAssetIconList(iconParams); getModelLists(queryFlow); @@ -271,17 +278,19 @@ const PublicData = () => { ? datasetList.map((item) => { return (
routeToIntro(e, item)}> -
{item.name}
+ {item.name} +
{item.description}
- 最近更新: {moment(item.update_time).format('YYYY-MM-DD')} -
-
- 1582 + {item.create_by} +
+
+ + 最近更新: {moment(item.update_time).format('YYYY-MM-DD')}
); @@ -289,7 +298,14 @@ const PublicData = () => { : ''} {/* Demo */} - + { const onFinishFailed = (errorInfo) => { console.log('Failed:', errorInfo); }; + const onPageChange = (pageNum, pageSize) => { + console.log(pageNum, pageSize); + setQueryFlow({ ...queryFlow, page: pageNum - 1, size: pageSize }); + getModelLists({ ...queryFlow, page: pageNum - 1, size: pageSize }); + }; useEffect(() => { getAssetIconList(iconParams); getModelLists(queryFlow); @@ -218,17 +225,19 @@ const PublicData = () => { ? datasetList.map((item) => { return (
routeToIntro(e, item)}> -
{item.name}
+ {item.name} +
{item.description}
- 最近更新: {moment(item.update_time).format('YYYY-MM-DD')} -
-
- 1582 + {item.create_by} +
+
+ + 最近更新: {moment(item.update_time).format('YYYY-MM-DD')}
); @@ -236,7 +245,14 @@ const PublicData = () => { : ''} {/* Demo */} - +