From c52cad36dda69dc0be7d5f4224296866ec7b5def Mon Sep 17 00:00:00 2001
From: dingyongkang <837816638@qq.com>
Date: Wed, 26 Feb 2020 18:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  4 +-
 .../react/src/forge/Order/MilepostDetail.js   | 42 ++++++++++++++++---
 .../react/src/forge/Version/UpdateVersion.js  |  4 +-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 1f57d0ff0..1a12e3166 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -47,8 +47,8 @@ export function initAxiosInterceptors(props) {
     // TODO 读取到package.json中的配置？
 
 			var //proxy = "http://localhost:3000"
-            //  proxy="http://123.59.135.93:56666"
-            proxy="http://localhost:3000"
+              proxy="http://123.59.135.93:56666"
+            //proxy="http://localhost:3000"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/forge/Order/MilepostDetail.js b/public/react/src/forge/Order/MilepostDetail.js
index 048ec4e36..09bc8f958 100644
--- a/public/react/src/forge/Order/MilepostDetail.js
+++ b/public/react/src/forge/Order/MilepostDetail.js
@@ -44,6 +44,7 @@ class MilepostDetail extends Component{
       //设置选择高亮
       openselect:1,
       closeselect:undefined,
+      miledata:undefined
       // status_type: undefined
     }
   }
@@ -51,6 +52,35 @@ class MilepostDetail extends Component{
   componentDidMount=()=>{
     this.getSelectList();
     this.getIssueList();
+    this.getmeil();
+  }
+
+  getmeil=()=>{
+    const { projectsId } = this.props.match.params;
+    const { meilid } = this.props.match.params;
+    const url = `/projects/${projectsId}/versions/${meilid}/edit.json`;
+    axios.get(url,{
+      params:{
+        projectsId,meilid
+      }
+    }).then((result)=>{
+      if(result){
+        this.setState({
+            miledata:result.data,
+    
+        })
+        this.props.form.setFieldsValue({
+            name:result.data.name,
+            description:result.data.description
+          });
+
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+
+
+
   }
 
   getSelectList=()=>{
@@ -70,8 +100,8 @@ class MilepostDetail extends Component{
 
   // 获取列表数据
   getIssueList=(page,limit,search,author_id,assigned_to_id,id,value,status_type)=>{
-    const { projectsId } = this.props.match.params;
-    const url = `/projects/${projectsId}/issues.json`;
+    const { projectsId,meilid} = this.props.match.params;
+    const url = `/projects/${projectsId}/versions/${meilid}.json`;
     axios.get(url,{
       params:{
         page,limit,search,author_id,assigned_to_id,status_type,
@@ -167,7 +197,7 @@ class MilepostDetail extends Component{
 
   render(){
 
-    const { issue_chosen , issues , limit , page , search_count , data , assigned_to_id , author_id , isSpin,openselect,closeselect } = this.state;
+    const { issue_chosen , issues , limit , page , search_count , data , miledata , author_id , isSpin,openselect,closeselect } = this.state;
     const { projectsId,meilid } = this.props.match.params;
 
     const Paginations = (
@@ -183,7 +213,7 @@ class MilepostDetail extends Component{
     return(
       <div className="main">
         <div className="topWrapper">
-          <p></p>
+          <p>{miledata&&miledata.name}</p>
           <div className="topWrapper">
           <Link to={`/projects/${projectsId}/orders/${meilid}/meilpost`} className="topWrapper_btn" style={{marginRight:15}}>编辑里程碑</Link>
           <Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建工单</Link>
@@ -192,8 +222,8 @@ class MilepostDetail extends Component{
         </div>
         <div className="topWrapper" style={{borderBottom:"none"}}>
           <p className="topWrapper_type">
-            <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_count}个开启中</li>
-            <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_count}个已关闭</li>
+            <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_issues_count}个开启中</li>
+            <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_issues_count}个已关闭</li>
             {/* <span onClick={this.openorder} className={author_id ? "active":""}>{data && data.open_count}个开启中</span>
             <span onClick={this.closeorder} className={author_id ? "active":""}>{data && data.close_count}个已关闭</span> */}
           </p>
diff --git a/public/react/src/forge/Version/UpdateVersion.js b/public/react/src/forge/Version/UpdateVersion.js
index 4b2c332f0..d9eebeddd 100644
--- a/public/react/src/forge/Version/UpdateVersion.js
+++ b/public/react/src/forge/Version/UpdateVersion.js
@@ -56,7 +56,8 @@ class NewVersion extends Component{
       }
     }).then((result)=>{
         if(result){
-          this.props.history.push(`/projects/${projectsId}/orders`);
+          this.props.history.push(`/projects/${projectsId}/version`);
+
         }
       }).catch((error)=>{
         console.log(error);
@@ -180,7 +181,6 @@ class NewVersion extends Component{
         <a className='topWrapper_btn_delete fr' onClick={()=>this.deleteversion()} style={{marginLeft:15}}>删除发布</a>  
         <a className='topWrapper_btn fr' onClick={()=>this.handleSubmit()} style={{marginRight:15}}>编辑发布信息</a>
         <Link to={`/projects/${projectsId}/version`} style={{marginRight:30}} className='topWrapper_btn fr'>取消</Link>
-
         </div>
         </Form>
     </div>