diff --git a/public/react/public/css/css_min_all.css b/public/react/public/css/css_min_all.css index cf453ac21..431a4da8e 100755 --- a/public/react/public/css/css_min_all.css +++ b/public/react/public/css/css_min_all.css @@ -1883,9 +1883,8 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40 .newupload_nav li:last-child{ border-right: none;} .newupload_nav li a{font-size:12px; color:#444;} .newupload_nav_hover{ background: #3498db; } -.newupload_nav_nomal { } .newupload_nav_hover a{color: #fff !important; } - +.markdown-body { text-align: justify;word-break: break-all;} .bor-reds{ border:1px solid #FF0000!important; border-radius: 4px; @@ -1894,6 +1893,7 @@ a:hover.task_icons_close{background: url(../images/popup/sy_icons_close.png) -40 border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; } + @charset "UTF-8"; /*! diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index f628b1e5c..48386e675 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -2934,7 +2934,7 @@ a.singlepublishtwo{ padding: 40px !important; } .editormd-html-preview{ - width: 94% !important; + width: 100% !important; color: #323232 !important; } #homework_editorMd_description hr{ @@ -3478,3 +3478,9 @@ a.singlepublishtwo{ /*width: auto !important;*/ /*max-width: 600px !important;*/ /*}*/ + + +.markdown-body { + text-align: justify; + word-break: break-all; +} \ No newline at end of file diff --git a/public/react/src/modules/courses/shixunHomework/Challenges.css b/public/react/src/modules/courses/shixunHomework/Challenges.css index 2183fd708..8ae2c002c 100644 --- a/public/react/src/modules/courses/shixunHomework/Challenges.css +++ b/public/react/src/modules/courses/shixunHomework/Challenges.css @@ -1,5 +1,5 @@ .editormd-html-preview, .editormd-preview-container { - width: 95% !important; + width: 100% !important; } .Finish_button{ height: 30px; diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 2326a4fe6..438df7b05 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1667,7 +1667,7 @@ class Listofworksstudentone extends Component { ], yslpros: false, datajs: [], - homework_status: [], + homework_status: undefined, } } @@ -3597,7 +3597,14 @@ class Listofworksstudentone extends Component { starttimesend={this.state.starttimesend} typs={this.state.typs} /> : ""} - { + {homework_status===undefined? +
+
+
+ +
+
+
: homework_status && homework_status.length === 0 ?
@@ -3609,11 +3616,7 @@ class Listofworksstudentone extends Component {
:
- -
- - diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index c9d1c40d4..f72c4ac94 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?66`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?66`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?66`)); // $('head').append($('') diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js index d3ebba9b3..56b9a4dc3 100644 --- a/public/react/src/modules/tpm/jupyter/index.js +++ b/public/react/src/modules/tpm/jupyter/index.js @@ -146,12 +146,12 @@ function JupyterTPI (props) { title: '更新通知', content: (
{stopposttpip(1)} -

关卡任务的代码文件有更新啦

-

更新操作将保留已完成的评测记录和成绩

-

还未完成评测的任务代码，请自行保存

+

该实训已更新，更新后您编写的实训代码将会丢失

+

如有需要请先导出代码再进行更新

+ {/*

还未完成评测的任务代码，请自行保存

*/}
), - okText: '确定', - cancelText: '取消', + okText: '立即更新', + cancelText: '稍后再说', onOk () { syncJupyterCode(myshixun_identifier, '同步成功'); },onCancel() { diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 34f71fb1e..83d8fb15d 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -1,5 +1,5 @@ .editormd-html-preview, .editormd-preview-container { - width: 95% !important; + width: 100% !important; } .Finish_button{ height: 30px; diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 28f7cdfdf..2070f4b39 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -2939,7 +2939,7 @@ a.singlepublishtwo{ padding: 40px !important; } .editormd-html-preview{ - width: 94% !important; + width:100% !important; color: #323232 !important; } #homework_editorMd_description hr{ @@ -3798,4 +3798,9 @@ a.singlepublishtwo{ .ant-drawer{ z-index: 10000 !important; +} + +.markdown-body { + text-align: justify; + word-break: break-all; } \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 84bca6a78..9de4bfb1d 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -821,3 +821,7 @@ html>body #ajax-indicator { position: fixed; } .footer_con-p{ color: #898989 !important; } +.markdown-body { + text-align: justify; + word-break: break-all; +} \ No newline at end of file