diff --git a/public/react/src/modules/modals/Modals.js b/public/react/src/modules/modals/Modals.js
index 1aaec6402..60485b26a 100644
--- a/public/react/src/modules/modals/Modals.js
+++ b/public/react/src/modules/modals/Modals.js
@@ -34,6 +34,9 @@ render() {
}
.color848282{
color:#848282;
+ }
+ .task-btn{
+ color: #fff !important;
}
`
}
@@ -50,7 +53,7 @@ render() {
:
}
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index d542c225e..1509b2b43 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -32,7 +32,10 @@ class DetailTop extends Component{
getappointmenttype:false,
openpathss:false,
cancel_publics:false,
- cancel_has_publics:false
+ cancel_has_publics:false,
+ applyissuePaths:false,
+ cancelText:undefined,
+ okText:undefined
}
}
componentDidMount(){
@@ -110,21 +113,27 @@ class DetailTop extends Component{
applyissuePath=()=>{
+ this.setState({
+ loadtype:true,
+ Modalstype: true,
+ Modalstopval:` 课程需经过平台审核方可公开使用，公开的课程将对平台所`,
+ modalsMidval:"有人公开可见，若仅本人教学使用则无需申请公开，直接发",
+ Modalsbottomval:"送到课堂即可。",
+ applyissuePaths:true
+ })
+
+ }
+
+ showapplyissuePath=()=>{
let pathid=this.props.match.params.pathId;
let url ="/paths/"+pathid+"/publish.json";
axios.post(url).then((result)=>{
if(result.status===200){
if(result.data.status===0){
- this.setState({
- loadtype:true,
- Modalstype: true,
- Modalstopval: ` 课程需经过平台审核方可公开使用，公开的课程将对平台所`,
- modalsMidval:"有人公开可见。若仅本人教学使用则无需申请公开, 直接发",
- Modalsbottomval:"送到课堂即可.",
- cardsModalsavetype: true,
- })
+
this.props.showNotification(result.data.message)
this.props.getlistdatas();
+ this.cardsModalcancel()
}else if(result.data.status===1){
// window.location.reload();
}
@@ -132,9 +141,7 @@ class DetailTop extends Component{
}).catch((error)=>{
console.log(error);
})
-
-
- }
+ }
postcancelissuePath=()=>{
let pathId=this.props.match.params.pathId;
let url ="/paths/"+pathId+"/cancel_publish.json";
@@ -180,12 +187,15 @@ class DetailTop extends Component{
modalsMidval:'',
modalstyles:'',
cardsModalsavetype:false,
- applyissuePath:false,
+ applyissuePaths:false,
openpathss:false,
cancel_publics:false,
cancel_has_publics:false,
Modalstopval:``,
+ cancelText:undefined,
+ okText:undefined
})
+
}
cardsModalsave=()=>{
@@ -369,13 +379,13 @@ class DetailTop extends Component{
openpaths=()=>{
this.setState({
- loadtype:true,
Modalstype: true,
openpathss:true,
- Modalstopval: "公开申请已提交，请等待管理员的审核",
- modalsMidval:"• 我们将在1-2个工作日内完成审核",
- Loadtype:true,
- modalstyles:"848282"
+ Modalstopval: "公开课程需经过平台标准化审核，审核周期为1-2天，公开",
+ modalsMidval:"的课程将对平台所有人可见。若仅本人教学使用则无需",
+ Modalsbottomval:"申请公开，直接发送到课堂即可",
+ cancelText:"取消申请",
+ okText:"确定申请"
})
}
@@ -433,7 +443,7 @@ class DetailTop extends Component{
render(){
let{detailInfoList}=this.props;
- let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,openpathss,cancel_publics,cancel_has_publics}=this.state;
+ let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,openpathss,cancel_publics,cancel_has_publics,applyissuePaths}=this.state;
const radioStyle = {
display: 'block',
height: '30px',
@@ -470,8 +480,10 @@ class DetailTop extends Component{
modalsTopval={Modalstopval}
modalsBottomval={Modalsbottomval}
modalCancel={cardsModalcancel}
- modalSave={loadtype===true&&openpathss===false?()=>this.cardsModalcancel():cardsModalsavetype===true?()=>this.postcancelissuePath():openpathss===true?()=>this.postopenpaths():cancel_publics===true?()=>this.postcancel_public():cancel_has_publics===true?()=>this.postcancel_has_public():putappointmenttype===true?()=>this.getappointment():()=>this.cardsModalsave()}
+ modalSave={applyissuePaths===true?()=>this.showapplyissuePath():loadtype===true&&openpathss===false?()=>this.cardsModalcancel():cardsModalsavetype===true?()=>this.postcancelissuePath():openpathss===true?()=>this.postopenpaths():cancel_publics===true?()=>this.postcancel_public():cancel_has_publics===true?()=>this.postcancel_has_public():putappointmenttype===true?()=>this.getappointment():()=>this.cardsModalsave()}
loadtype={loadtype}
+ cancelText={this.state.cancelText}
+ okText={this.state.okText}
modalsMidval={this.state.modalsMidval}
modalstyles={this.state.modalstyles}
>
@@ -605,8 +617,8 @@ class DetailTop extends Component{
{
detailInfoList.publish_status===0&&detailInfoList.allow_add_member===true?
发布:""
+ style={{'width':'95px'}}
+ onClick={this.applyissuePath}>申请发布:""
}
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 9ba752827..7527357c0 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -60,7 +60,8 @@ class TPMBanner extends Component {
openshowpublictype:false,
Radiovalue:1,
TextAreaintshow:false,
-
+ cancelText:undefined,
+ okText:undefined,
}
}
@@ -434,6 +435,9 @@ class TPMBanner extends Component {
modalsMidval:undefined,
ModalsBottomval:"",
modalstyles:"",
+ cancelText:undefined,
+ okText:undefined,
+ Loadtype:false,
})
}
ModalSave = () => {
@@ -441,7 +445,10 @@ class TPMBanner extends Component {
let url = "/shixuns/" + id + "/cancel_publish.json";
axios.get(url).then((response) => {
this.props.showSnackbar(response.data.message);
- window.location.reload()
+ // window.location.reload()
+ this.ModalCancel()
+ this.props.getcomponentdidmount()
+
}).catch((error) => {
console.log(error)
});
@@ -461,16 +468,21 @@ class TPMBanner extends Component {
ModalSaveopenpublic= () => {
this.setState({
Modalstype: true,
- Modalstopval: "公开申请已提交，请等待管理员的审核",
- modalsMidval:"• 我们将在1-2个工作日内完成审核",
- ModalCancel: this.eopenpublicupdatadata,
+ Modalstopval:"公开实训需经过平台标准化审核，审核周期为1-2天，",
+ modalsMidval:"公开的实训将对平台所有人可见。若仅本人教学使用",
+ ModalsBottomval:"则无需申请公开, 直接发送到课堂即可。",
+ cancelText:"取消申请",
+ okText:"确定申请",
+ ModalCancel: this.ModalCancel,
ModalSave: this.eopenpublicupdatadata,
- Loadtype:true,
- modalstyles:"848282"
+ // Loadtype:true,
+ // modalstyles:"848282"
})
}
eopenpublicupdatadata=()=>{
- window.location.reload()
+ // window.location.reload()
+ this.ModalCancel()
+ this.props.getcomponentdidmount()
}
openpublic=()=>{
let id = this.props.match.params.shixunId;
@@ -490,7 +502,9 @@ class TPMBanner extends Component {
let url = `/shixuns/${id}/cancel_apply_public.json`;
axios.get(url).then((response) => {
if(response.data.status===0){
- window.location.reload()
+ // window.location.reload()
+ this.ModalCancel()
+ this.props.getcomponentdidmount()
}
}).catch((error) => {
console.log(error)
@@ -522,7 +536,10 @@ class TPMBanner extends Component {
evaluation_set_position = response.data.evaluation_set_position
}
if(response.data.status===0){
- window.location.reload()
+ // window.location.reload()
+ this.applyreleaseopen()
+ // this.ModalCancel()
+ this.props.getcomponentdidmount()
}else{
this.setState({
Issuevisible: true,
@@ -536,13 +553,23 @@ class TPMBanner extends Component {
console.log(error)
});
};
+ applyreleaseopen = () => {
+ this.setState({
+ Modalstype: true,
+ Loadtype:true,
+ Modalstopval: "实训发布后即可发送课堂使用",
+ ModalSave: this.ModalCancel,
+ })
+ }
hiddenIssuevisible = (val) => {
this.setState({
Issuevisible: false
})
if (val === 0 || val === 1) {
- window.location.reload()
+ // window.location.reload()
+ this.ModalCancel()
+ this.props.getcomponentdidmount()
}
}
@@ -803,7 +830,9 @@ class TPMBanner extends Component {
hidestartshixunsreplacevalue,
Forkvisibletype,
AccountProfiletype,
- isIE
+ isIE,
+ cancelText,
+ okText,
} = this.state;
let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
let challengeBtnTipText = '';
@@ -900,6 +929,8 @@ class TPMBanner extends Component {
modalsMidval={this.state.modalsMidval}
loadtype={this.state.Loadtype}
modalstyles={this.state.modalstyles}
+ cancelText={this.state.cancelText}
+ okText={this.state.okText}
/> : ""}
diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index 7c7a706c5..2a650e3d0 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -412,6 +412,7 @@ class TPMIndex extends Component {
{...this.props}
{...this.state}
is_jupyter={this.state. is_jupyter}
+ getcomponentdidmount={()=>this.getcomponentdidmount()}
>
}