From 246782f961290d4fd90a44945416696e02f23489 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 6 Jan 2021 16:23:59 +0800
Subject: [PATCH] link

---
 src/forge/DevOps/About.jsx |  4 ++--
 src/forge/Main/Detail.js   | 19 ++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index ba4c7667..82bee8e7 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -173,8 +173,8 @@ function About(props, ref) {
         <img src={activate} alt="" width="250px" />
         <P>定义DevOps工作流，帮助您检测bug、发布代码…</P>
         {
-          CurrentLogin !== AuthorLogin &&  (step === undefined || (step && step < 1)) &&
-          <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>
+          CurrentLogin !== AuthorLogin ?
+          <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>:""
         }
         <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
           了解什么是DevOps？
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index baa6169d..116ef2c3 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -10,17 +10,6 @@ import Loading from '../../Loading';
 
 import axios from 'axios';
 
-import img_1 from '../Images/1.png';
-import img_2 from '../Images/2.png';
-import img_3 from '../Images/3.png';
-import img_6 from '../Images/6.png';
-import img_7 from '../Images/7.png';
-import img_parise from '../Images/parise.png';
-import img_focus from '../Images/focus.png';
-import img_parised from '../Images/parised.png';
-import img_focused from '../Images/focused.png';
-import img_fork from '../Images/fork.png';
-import img_milepost from '../Images/milepost.png';
 const Setting = Loadable({
   loader: () => import('../Settings/Index'),
   loading: Loading,
@@ -125,9 +114,9 @@ const DevIndex = Loadable({
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(pathname){
+function checkPathname(projectsId,owner,pathname){
   let name = "";
-  if(pathname){
+  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
     if(pathname.indexOf("/about")>-1){
       name="about"
     }else if(pathname.indexOf("/issues")>-1 ||pathname.indexOf("Milepost") > 0){
@@ -140,7 +129,7 @@ function checkPathname(pathname){
       name="activity"
     }else if(pathname.indexOf("/setting")>-1){
       name="setting"
-    }else if(pathname.indexOf("/devops")>-1){
+    }else if(pathname.indexOf(`/devops`)>-1){
       name="devops"
     }
   }
@@ -377,9 +366,9 @@ class Detail extends Component {
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
-    let pathname = checkPathname(url);
 
     const { projectsId , owner } = this.props.match.params;
+    let pathname = checkPathname(projectsId,owner,url);
 
     const { state } = this.props.history.location;