From 481f7503f5cb8468570314256b1992c67d9fa4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 13 Dec 2019 20:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/elearning/YslDetailCards.js |  1 +
 .../shixunHomework/ShixunhomeWorkItem.js        |  6 +++++-
 .../src/modules/paths/PathDetail/Addshixuns.js  | 17 +++++++++--------
 .../modules/tpm/TPMsettings/Configuration.js    | 15 +++++----------
 .../src/modules/tpm/newshixuns/Newshixuns.js    |  5 +++--
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js
index 55bed2b5e..6ca63a42a 100644
--- a/public/react/src/modules/courses/elearning/YslDetailCards.js
+++ b/public/react/src/modules/courses/elearning/YslDetailCards.js
@@ -529,6 +529,7 @@ class YslDetailCards extends Component{
 											{
 												this.props.isAdmin()===true?
 													<DetailCardsEditAndEdit
+														{...this.props}
 														idsum={idsum}
 														keys={key}
 														pathCardsedittype={pathCardsedittype}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 2a8a893cb..fc39effdd 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -355,11 +355,15 @@ class ShixunhomeWorkItem extends Component{
 							   .homepagePostSettingbox{
 								   width:139px !important;
 								 }
+								 .colorfff{
+								  color:#fff !important;
+								 }
 								`
 								}
 							</style>
 							{this.props.isAdmin?<span onClick={(event)=>this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}>
-                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:""}
+                {discussMessage&&discussMessage.shixun_status>1?<Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>:
+                <a className={"btn colorfff font-16 fontweight400"}>实训详情</a>}
 								{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16 fontweight400"}>重命名</a>:""}
 								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
diff --git a/public/react/src/modules/paths/PathDetail/Addshixuns.js b/public/react/src/modules/paths/PathDetail/Addshixuns.js
index 634ce281f..a4819ed76 100644
--- a/public/react/src/modules/paths/PathDetail/Addshixuns.js
+++ b/public/react/src/modules/paths/PathDetail/Addshixuns.js
@@ -69,6 +69,7 @@ class Addshixuns extends Component {
 			labelCol: { span: 4 },
 			wrapperCol: { span: 14 },
 		};
+		console.log(this.props)
 		return(
 			<Modal
 				className={this.props.className}
@@ -92,14 +93,14 @@ class Addshixuns extends Component {
 				</style>:""}
 
 					<div className="task-popup-content">
-						<Form {...formItemLayout}>
-							<Form.Item label="实训类型">
-									<Radio.Group value={this.state.is_jupyter} onChange={this.GrouponChange}>
-										<Radio value="1">普通实训</Radio>
-										<Radio value="2">jupyter实训</Radio>
-									</Radio.Group>
-							</Form.Item>
-						</Form>
+						{/*<Form {...formItemLayout}>*/}
+						{/*	<Form.Item label="实训类型">*/}
+						{/*			<Radio.Group value={this.state.is_jupyter} onChange={this.GrouponChange}>*/}
+						{/*				<Radio value="1">普通实训</Radio>*/}
+						{/*				<Radio value="2">jupyter实训</Radio>*/}
+						{/*			</Radio.Group>*/}
+						{/*	</Form.Item>*/}
+						{/*</Form>*/}
 						<p className="task-popup-text-center font-16">
 								<span style={{ "line-height":"30px"}}>实训名称：</span>
 									<span><Input style={{ width:"80%"}} className="yslzxueshisy " placeholder="请输入60字以内的实训名称" onChange={this.handleChange}  addonAfter={String(this.state.shixunname===undefined?0:this.state.shixunname.length)+"/60"}  maxLength={60} />
diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index 79f253191..070f5b156 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -121,8 +121,9 @@ export default class Shixuninformation extends Component {
   }
 
   onSubmits = () => {
-
     let {can_copy, use_scope, scope_partment, opening_time,oldscope_partment} = this.state;
+
+
     if(this.state.opentime===true){
       if(opening_time===null){
         this.setState({
@@ -143,9 +144,7 @@ export default class Shixuninformation extends Component {
 
     let id = this.props.match.params.shixunId;
     let url = `/shixuns/${id}/update_permission_setting.json`;
-    this.setState({
-      loading: true
-    })
+
     axios.post(url,
       {
         scope_partment: list,
@@ -168,14 +167,10 @@ export default class Shixuninformation extends Component {
         this.props.getdatas("3")
       }
     }).catch((error) => {
-      this.setState({
-        loading: false
-      })
+
 
     })
-    this.setState({
-      loading: false
-    })
+
   }
   CheckboxonChange = (e) => {
     this.setState({
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index c2ec0d5ef..8355efb52 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -431,6 +431,7 @@ class Newshixuns extends Component {
         return isLt150M;
       },
     }
+
     return (
       <div className="newMain clearfix">
         <style>
@@ -455,14 +456,14 @@ class Newshixuns extends Component {
               </div>
               <div className="padding10-20  color-grey-3 clearfix">
                 <Form>
-                  <Form.Item label="实训类型">
+                  {this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true?<Form.Item label="实训类型">
                     {getFieldDecorator('is_jupyter')(
                       <Radio.Group onChange={this.RadiovalueonChange}>
                         <Radio value="1">普通实训</Radio>
                         <Radio value="2">Jupyter实训</Radio>
                       </Radio.Group>,
                     )}
-                  </Form.Item>
+                  </Form.Item>:""}
                   <Form.Item
                     label="名称"
                     className="mt15"