diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 74016634f..b43d86640 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -951,10 +951,10 @@ class TPMBanner extends Component { {shixunsDetails.shixun_status === 0 && this.props.identity < 5 ? +
                           
您编辑完成后,可以马上使用到自
-
己的课堂和实训课程哦
- Close +
己的课堂和实训课程哦
+
} trigger="click" diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index 8e7b0b93a..12a6c4a70 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -41,13 +41,14 @@ export default class TPMsettings extends Component { axios.get(Url).then((response) => { // alert(response.data.shixun.choice_standard_scripts) if (response.status === 200) { - if (response.data.shixun.scope_partment) { - if (response.data.shixun.scope_partment.length > 0) { - this.setState({ - scopetype: true - }) - } + if(response.data){ + if (response.data.shixun&&response.data.shixun.scope_partment.length > 0) { + this.setState({ + scopetype: true + }) + } } + this.setState({ data: response.data })