调整tpm 相关

public/react/config/webpack.config.dev.js

@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-	//devtool: "source-map",  // 开启调试
+	devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/src/modules/tpm/TPMIndex.js

@@ -301,9 +301,6 @@ class TPMIndex extends Component {
       }else if(location.pathname.indexOf('/settings')!=-1){
         selectedKeys="9"
       }
-      console.log("进入")
-      console.log(selectedKeys)
-
       this.setState({
         selectedKeys:selectedKeys
       })
@@ -364,9 +361,8 @@ class TPMIndex extends Component {
                   }
                 </style>
               <Row type="flex" className={"backgroudwhite"}>
-                <Col span={5}></Col>
-
-                <Col span={14}>
+                  <div className={"educontent clearfix"}>
+                    <Col span={24}>
 
                       <Menu onClick={this.handleClick} selectedKeys={[this.state.selectedKeys]} mode="horizontal">
 
@@ -414,12 +410,8 @@ class TPMIndex extends Component {
                           </div>
                         }
                       </Menu>
-
-
-
                     </Col>
-
-                <Col span={5}></Col>
+                  </div>
               </Row>
 
                    {/*筛选*/}

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css

@@ -134,3 +134,23 @@
     border-right: 1px solid #eeeeee;
     border-bottom: 1px solid #eeeeee;
 }
+
+.space-between{
+    justify-content:space-between
+}
+
+.heighthezuo34{
+    height:34px;
+    line-height: 34px;
+}
+.hezuozhe660{
+    width: 660px;
+}
+
+.color333hezuo{
+    color:#333333;
+}
+
+.color888hezuo{
+    color:#888888;
+}

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -453,29 +453,52 @@ class Collaborators extends Component {
 		// console.log(Searchadmin)
 		return (
             <React.Fragment>
-                <p className=" mt30 sortinxdirection"
+              <style>
+                {
+                  `
+                  .sortinxdirectionbox{
+                      height: 76px;
+                      border-bottom: 1px solid #F4F4F4;
+                  }
+                  .pt25{
+                    padding-top:25px;
+                  }
+                  `
+                }
+              </style>
+                <p className="sortinxdirection sortinxdirectionbox"
                    style={{display:this.props.identity<5?"flex":"none"}}
                 >
 									<div className="yslwushiwidth">
-										<p  className="edu-default-btn edu-greenback-btn  ml20 height28 yslwushiwidthcolortest">共{collaboratorList&&collaboratorList.length}人</p>
+										<p  className="edu-default-btn edu-greenback-btn  ml20 height28 mt25 color333hezuo">{collaboratorList&&collaboratorList.length}人</p>
 									</div>
 
-									<div className="yslwushiwidth xaxisreverseorder">
-										<a onClick={() => this.showCollaboratorsvisible("cooperation")}
-											 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton"
-											 data-remote="true">
-											<span className={"line27"}>+ </span>添加合作者
-										</a>
-										<a onClick={() => this.showCollaboratorsvisible("admin")}
+									<div className="yslwushiwidth xaxisreverseorder pt25">
+										{/*<a onClick={() => this.showCollaboratorsvisible("cooperation")}*/}
+										{/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton"*/}
+										{/*	 data-remote="true">*/}
+										{/*	<span className={"line27"}>+ </span>添加合作者*/}
+										{/*</a>*/}
+										{/*<a onClick={() => this.showCollaboratorsvisible("admin")}*/}
+										{/*	 style={{display:this.props.identity===1?"flex":"none"}}*/}
+										{/*	 data-remote="true"*/}
+										{/*	 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">*/}
+										{/*	<p style={{*/}
+										{/*		textAlign: "center",*/}
+										{/*		width:'100%',*/}
+										{/*		lineHeight: "29px",*/}
+										{/*	}}>更换管理员</p>*/}
+										{/*</a>*/}
+                    <Button type="primary"
+                            onClick={() => this.showCollaboratorsvisible("cooperation")}
+                            className="edu-default-btn edu-greenback-btn  mr20 heighthezuo34 yslwushiwidthbuton"
+                    >添加合作者</Button>
+                    <Button type="primary" ghost
                             style={{display:this.props.identity===1?"flex":"none"}}
-											 data-remote="true"
-											 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">
-											<p style={{
-												textAlign: "center",
-												width:'100%',
-												lineHeight: "29px",
-											}}>更换管理员</p>
-										</a>
+                            onClick={() => this.showCollaboratorsvisible("admin")}
+                            className="edu-default-btn  mr20 heighthezuo34">
+                      更换管理员
+                    </Button>
 
 									</div>
 
@@ -633,10 +656,10 @@ class Collaborators extends Component {
                                         </p>
 
                                         <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===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>
+																					<p className="hezuozhe660 sortinxdirection space-between">
+																						{/*<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">发布实训项目&nbsp;&nbsp;<span className="fabushixunwidthcolor ml2">{item.user.user_shixuns_count}</span></p>
+																						<p className="fabushixunwidth color888hezuo">发布实训项目&nbsp;&nbsp;<span className="ml2">{item.user.user_shixuns_count}</span></p>
 																					</p>
 																					<div className="xaxisreverseorder yslwushiwidth10">
 																						{item.user.shixun_manager === true ? "" :