From b4f731ea0a7b6d91e529cbefeb04824374a07955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Sat, 22 Jun 2024 19:32:44 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9glcc=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/timerShaft/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 37a1bf372..2890f305c 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -34,7 +34,7 @@ function TimerShaft(props) { }, { title: "Step2", - date: "7.1-8.18", + date: "7.9-8.18", content: "项目开发第一阶段", }, { From 13c6b618961699d4f7d2169b60ee6c29c9b69509 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 25 Jun 2024 11:06:10 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=94=B9=E4=B8=BAcookie=E4=BF=9D=E5=AD=98=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E5=A4=A9=E6=9C=89=E6=95=88=E6=9C=9F=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Component/NoticeModal/SystemNotice.jsx | 51 +++++++++---------- src/modules/tpm/TPMIndexHOC.js | 5 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 78619f18b..79fafefd3 100644 --- a/src/forge/Component/NoticeModal/SystemNotice.jsx +++ b/src/forge/Component/NoticeModal/SystemNotice.jsx @@ -3,42 +3,41 @@ import { Modal , Button } from 'antd'; import './Index.scss'; import '../../css/index.scss'; import RenderHtml from '../../../components/render-html'; -// import cookie from 'react-cookies'; -import axios from 'axios'; +import cookie from 'react-cookies'; +// import axios from 'axios'; -function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice}){ +function SystemNotice({system_notification,history}){ const [ visible , setVisible ] = useState(false); useEffect(()=>{ - - if((system_notification && !system_notification.is_read) && showNotice && login){ + if(system_notification && !cookie.load('notice_stage')){ setVisible(true); } - },[system_notification,login]) + },[system_notification]) function sureContinue() { - if(login && ( system_notification && system_notification.id )){ - const url = `/users/${login}/system_notification_histories.json`; - axios.post(url,{ - system_notification_id:system_notification.id - }).then(result=>{ - setVisible(false); - hideSystemNotice(); - }).catch(error=>{ - setVisible(false); - hideSystemNotice(); - }) - }else{ - setVisible(false); - hideSystemNotice(); - } - // cookie.remove('notice_stage'); + // if(login && ( system_notification && system_notification.id )){ + // const url = `/users/${login}/system_notification_histories.json`; + // axios.post(url,{ + // system_notification_id:system_notification.id + // }).then(result=>{ + // setVisible(false); + // hideSystemNotice(); + // }).catch(error=>{ + // setVisible(false); + // hideSystemNotice(); + // }) + // }else{ + // setVisible(false); + // hideSystemNotice(); + // } + cookie.remove('notice_stage'); - // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天 - // // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟 - // cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" }); + let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天 + // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟 + cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" }); - // setVisible(false); + setVisible(false); } return ( diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index b62237e0a..62f444cfe 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -298,11 +298,10 @@ export function TPMIndexHOC(WrappedComponent) { return (
- {organizeDetail && organizeDetail.nickname} - {organizeDetail && organizeDetail.is_admin ? - 设置 - :""} + {organizeDetail && organizeDetail.nickname} + {organizeDetail && ( +
新闻动态
{organizeDetail.news_title} @@ -228,6 +227,7 @@ function List(props){ showCompeleteDialog={props.showCompeleteDialog} completeProfile={props.completeProfile} history={props.history} + enterpriseOpened = {enterpriseOpenInfo.isOpen} />
{data && data.sectionHelperTitle}
-欢迎使用 - - {project && project.name} - - Wiki
-Wiki主要是您项目的产品设计、文档描述、注释等等
- - - { - isManager ?该项目暂时没有创建Wiki
- } -{wikiDetail.title}
+欢迎使用 + + {project && project.name} + + Wiki
+Wiki主要是您项目的产品设计、文档描述、注释等等
+该项目暂时没有创建Wiki
+ } +*wd{6f>q?+z+$d9z2oJ4-6`xx>o-Pe$lw4by@{-XOC@( (I9-z-nD+wsC=f`HHE)^=oRtRPH**(SAyxOr&r@w
zOM*3cuY!D+qcsDs)_e<=bJQ--%&BK;ccbMm(>od^3hMMXx3@m(kT-uOhZKnwJIi
z=7`p@jFn`spKL9qXSPPxC})JiLy0X e>p37Gyo}QK;1~AsgONnIRXAh6o!wcR-$ogQyZH6!5Z>{b-^Q*-Q26yoKQ=B4
zM-=+?C==SeJDX2s_=nFCT;h%Rer0-@KMfc-W_Umey89Q*IrA1aAl@TJ`?7vIIB*P`
zq!8Qu{&T4B+tWRlVzNAWCT?>;dfBnEx K)fpS<*vLzk?V*@V31
z_|Z!*`%pR+PrU!K!$*&Qu@Aa>jOW58*OyOhddF#8tSl~b{mZv5>m~zh`<$UPTbwh0
zB!^3r?lDapIlQt1Lr<{*4&>_G^u|67Ya=5)1uhh1iE{&fw$ip(x}9Von;rr{Il^0nu`;Ud5=*6k6|92cpH34;+Nw~6OZA%Eb$n@F^R_rMn3Qu
z!7CDv(YZ45v*P|A%MN(-_Nv6ACs!vPm0pv0TsSWA$a`(#asIl*Z^G9nehVI-_#OC$
z#P7y82GPs=NK8ol0X#AB2XPbz{xH5d@n>)p4E`LRl=$=b*2G)m+Y-ME-=6r3cyi*@
zy{rI-2XAeQ0n0K
zlCmz2VTH0D{vav!a11e&hWNvztdC>3p)|oCC#5Nlp@-4}f0C3|_|s~5{%=jq3sV(uweIzO(1oEsD#;PLC>W9cG<;p-QzsoG^oVqKbh^&Sst2
zOxE1)g6=f#{1B5!$z;F5s-;g#!