From 377199683a5ef57983fd71e27296d816a4b3bc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 20:10:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/TPMBanner.js | 4 ++-- public/react/src/modules/tpm/shixuns/css/TPMBanner.css | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index a43bacd5e..55a26563c 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -1208,7 +1208,7 @@ class TPMBanner extends Component { {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0? - <div className="fr user_default_btn user_blue_btn mr20" + <div className="fr kaike kkbth mr20" style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}> <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}> <span className="flex1 edu-txt-center fl font-18" @@ -1262,7 +1262,7 @@ class TPMBanner extends Component { </div> </Modal> {!!shixunsDetails.fork_num && - <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNum" data-tip-down="Fork实训列表"> + <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNumst" data-tip-down="Fork实训列表"> {shixunsDetails.fork_num} </Link> } diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css index f5970a55b..54f25b590 100644 --- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css +++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css @@ -156,3 +156,4 @@ a:active{text-decoration:none;} box-sizing: border-box; color: #ffffff !important; } +.forkNumst{display: block;float: left;width: 36px;text-align: center;border-left: 1px solid #ffffff !important;color: #ffffff!important; } From 9781f407a527a8aa0d74d392f81f227915413a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 20:15:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/tpm/shixunchild/Collaborators/Collaborators.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js index 747a1cbe6..30c752a39 100644 --- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js +++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js @@ -634,7 +634,7 @@ class Collaborators extends Component { <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14"> <p className="yslwushiwidth90 sortinxdirection"> - <p className="mr20 font-16 w70">{item.user.identity}</p> + <p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?"mr20 font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p> <p className={item.user.school_name===null||item.user.school_name===""?"":"mr40 font-16 maxnamewidth150"}>{item.user.school_name}</p> <p className="fabushixunwidth">发布实训项目 <span className="fabushixunwidthcolor ml2">{item.user.user_shixuns_count}</span></p> </p> From aa3714724e013300312e74e781202b625040c13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 20:16:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/tpm/shixunchild/Collaborators/Collaborators.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js index 30c752a39..7a8e2ed75 100644 --- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js +++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js @@ -634,7 +634,7 @@ class Collaborators extends Component { <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14"> <p className="yslwushiwidth90 sortinxdirection"> - <p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?"mr20 font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p> + <p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p> <p className={item.user.school_name===null||item.user.school_name===""?"":"mr40 font-16 maxnamewidth150"}>{item.user.school_name}</p> <p className="fabushixunwidth">发布实训项目 <span className="fabushixunwidthcolor ml2">{item.user.user_shixuns_count}</span></p> </p>