+
+
+
+
:
""
)
@@ -346,7 +367,7 @@ class Challengesjupyter extends Component {
{
admin===true||business===true||mysidentity===true?
任务详情
（请将实训题目写在下方并保存）
-
+ {
+ enlarge===true?
+ this.onclki(false)}>
+ :
+ this.onclki(true)}>
+ }
this.modifyjupyter(this.state)}>
导入
-
+
{
this.state.jupyter_url===null || this.state.jupyter_url===undefined?
(
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index 9ff7f0564..d18370a51 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -190,3 +190,28 @@
line-height: 30px;
}
+.fangdaone{
+ height: 63px;
+ width: 100%;
+ position: fixed;
+ top: 0px;
+ left: 0px;
+ z-index: 999999;
+ right: 0px;
+}
+
+.fangdatwo{
+ height: 100%;
+ width: 100%;
+ position: fixed;
+ top:0px;
+ margin-top: 63px;
+ bottom: 0px;
+ left: 0px;
+ z-index: 999999;
+ right: 0px;
+}
+
+.jupyterswidth{
+ width: 1140px;
+}
From 6bbce2ca8eaa6e9079ccf30f112ffed866c6b3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 19 Dec 2019 20:15:06 +0800
Subject: [PATCH 06/63] =?UTF-8?q?jupyter=20=E5=8E=BB=E6=8E=89=E5=BA=94?=
=?UTF-8?q?=E7=94=A8=20=E5=8A=A0=E4=B8=8A=20=E6=94=BE=E5=A4=A7=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Challenges/Challengesjupyter.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index e34aaa169..7d459ce5f 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -308,9 +308,11 @@ class Challengesjupyter extends Component {
:
(
admin===true||business===true||mysidentity===true?
-
+
-
+
@@ -367,7 +369,7 @@ class Challengesjupyter extends Component {
{
admin===true||business===true||mysidentity===true?
{
const mapStateToProps = (state) => {
- const {user_program_identifier, hack, userTestInput, editor_code} = state.ojForUserReducer;
+ const {
+ user_program_identifier,
+ hack,
+ userTestInput,
+ editor_code,
+ notice,
+ hadCodeUpdate
+ } = state.ojForUserReducer;
// const { language, code } = hack;
return {
hack,
+ notice,
+ hadCodeUpdate,
editor_code,
input: userTestInput,
submitInput: hack.input,
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index b498c4d22..672fff455 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -58,15 +58,6 @@ class TPMBanner extends Component {
}
}
- // star_info:[0, 0, 0, 0, 0, 0],
- // star_infos:[0, 0, 0, 0, 0, 0],
- // shixunsDetails:{},
- // shixunId: undefined,
- // componentWillReceiveProps(newProps, newContext){
- // this.setState({
- // shixunsDetails: newProps.shixunsDetails
- // });
- // }
IEVersion = () => {
var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
@@ -118,31 +109,50 @@ class TPMBanner extends Component {
if (prevProps != this.props) {
let shixunopenprocess=window.localStorage.shixunopenprocess;
let openopenpublictype=window.localStorage.openopenpublictype;
- if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 0 && this.props.identity < 5){
- if(shixunopenprocess===undefined||shixunopenprocess===false){
- this.setState({
- openknow:true
- })
- }else{
- this.setState({
- openknow:false
- })
+ if(this.props.status===0&&this.props.openknows===false){
+
+ if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 0 && this.props.identity < 5){
+ if(shixunopenprocess===undefined||shixunopenprocess===false){
+ this.setState({
+ openknow:true
+ })
+ }else{
+ this.setState({
+ openknow:false
+ })
+ }
}
+ }else{
+ this.setState({
+ openknow:false
+ })
}
- if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 2 && this.props.shixunsDetails&&this.props.shixunsDetails.public===0 && this.props.identity < 5){
- if(openopenpublictype===undefined||openopenpublictype===false){
- this.setState({
- openshowpublictype:true
- })
- }else{
- this.setState({
- openshowpublictype:false
- })
+
+
+ if(this.props.public===0&&this.props.status>1&&this.props.openknows===false){
+ if(this.props.shixunsDetails&&this.props.shixunsDetails.shixun_status === 2 && this.props.shixunsDetails&&this.props.shixunsDetails.public===0 && this.props.identity < 5){
+ if(openopenpublictype===undefined||openopenpublictype===false){
+ this.setState({
+ openshowpublictype:true
+ })
+ }else{
+ this.setState({
+ openshowpublictype:false
+ })
+ }
}
+ }else{
+ this.setState({
+ openshowpublictype:false
+ })
}
+
+
}
}
+
+
componentDidMount() {
let thiisie = this.IEVersion();
@@ -155,6 +165,7 @@ class TPMBanner extends Component {
isIE: false
})
}
+
}
/*
@@ -784,7 +795,8 @@ class TPMBanner extends Component {
};
//
// console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter)
-
+ // console.log(this.props)
+ // console.log(this.state)
return (
shixunsDetails === undefined ? "" :
@@ -796,6 +808,9 @@ class TPMBanner extends Component {
height: 180px !important;
padding-top:35px !important;
}
+ .ant-popover{
+ z-index:1000 !important;
+ }
`
}
diff --git a/public/react/src/modules/tpm/TPMIndex.js b/public/react/src/modules/tpm/TPMIndex.js
index d79bae95b..c44d8ce51 100644
--- a/public/react/src/modules/tpm/TPMIndex.js
+++ b/public/react/src/modules/tpm/TPMIndex.js
@@ -207,6 +207,7 @@ class TPMIndex extends Component {
propaedeutics:response.data.propaedeutics,
status: response.data.shixun_status,
secret_repository: response.data.secret_repository,
+ public:response.data.public,
is_jupyter:response.data.is_jupyter=== undefined||response.data.is_jupyter===null?false:response.data.is_jupyter,
});
@@ -295,10 +296,6 @@ class TPMIndex extends Component {
// this.getnavdatas()
}
- // componentDidUpdate=()=>{
- // this.getnavdatas()
- // }
-
setLoadingContent = (isLoadingContent) => {
this.setState({ loadingContent: isLoadingContent })
}
@@ -307,9 +304,6 @@ class TPMIndex extends Component {
getnavdatas=()=>{
let selectedKeys;
const {location} = this.props;
-
- console.log(location.pathname)
-
if(location.pathname.indexOf('/challenges')!=-1){
selectedKeys="1"
}else if(location.pathname.indexOf('/propaedeutics')!=-1){
@@ -385,6 +379,9 @@ class TPMIndex extends Component {
margin:0 40px 0 0;
padding:0px;
}
+ .ant-popover{
+ z-index:1000 !important;
+ }
`
}
diff --git a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
index 681cbc956..a98f68223 100644
--- a/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/LearningSettings.js
@@ -215,9 +215,9 @@ export default class Shixuninformation extends Component {
multi_webssh: false
})
} else {
- this.setState({
- multi_webssh: true
- })
+ // this.setState({
+ // multi_webssh: true
+ // })
}
this.setState({
opensshRadio: e.target.value
diff --git a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
index 200880019..66e1da8dd 100644
--- a/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
+++ b/public/react/src/modules/tpm/TPMsettings/Shixuninformation.js
@@ -50,6 +50,14 @@ class Shixuninformation extends Component {
}
componentDidMount() {
+ let query=this.props.location.search
+ const types = query.split('?edit=')
+ if(types[1]==="1"){
+ let anchorElement = document.getElementById("newcourseContentMD");
+ if(anchorElement){
+ this.scrollToAnchor("newcourseContentMD");
+ }
+ }
}
@@ -113,6 +121,7 @@ class Shixuninformation extends Component {
selectright: this.props.data && this.props.data.shixun.choice_small_type,
})
this.contentMdRef.current.setValue(this.props.data && this.props.data.shixun.description);
+
}
}
}
@@ -807,16 +816,20 @@ class Shixuninformation extends Component {
)}
+
+
diff --git a/public/react/src/modules/tpm/challengesnew/TPManswer.js b/public/react/src/modules/tpm/challengesnew/TPManswer.js
index 9c9a23a12..9187e09b0 100644
--- a/public/react/src/modules/tpm/challengesnew/TPManswer.js
+++ b/public/react/src/modules/tpm/challengesnew/TPManswer.js
@@ -302,11 +302,11 @@ export default class TPManswer extends Component {
className="color-grey-6 fr font-15 mt3">返回
{prev_challenge === undefined ? "" :
- 上一关
+ 上一关
}
{next_challenge === undefined ? "" :
- 下一关
+ 下一关
}
返回
{prev_challenge === undefined ? "" :
- 上一关
+ 上一关
}
{next_challenge === undefined ? "" :
- 下一关
+ 下一关
}
返回
{ next_challenge===undefined?"":
- 下一关
+ 下一关
}
{ prev_challenge===undefined?"":
- 上一关
+ 上一关
}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index d70f22a0a..34eb1a075 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -824,11 +824,11 @@ export default class TPMevaluation extends Component {
className="color-grey-6 fr font-15 mt3">返回
{prev_challenge === undefined ? "" :
- 上一关
+ 上一关
}
{next_challenge === undefined ? "" :
- 下一关
+ 下一关
}
返回
{ prev_challenge===undefined?"":
- 上一关
+ 上一关
}
{ next_challenge===undefined?"":
- 下一关
+ 下一关
}
{
@@ -97,11 +99,11 @@ class TPMRightSection extends Component {
- {TPMRightSectionData&&TPMRightSectionData.complete_count!=null?
任务详情
（请将实训题目写在下方并保存）
-
)
}
diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js
index 669a8a693..af46d0aef 100644
--- a/public/react/src/modules/developer/studentStudy/rightpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/rightpane/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 14:59:51
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 16:50:40
+ * @LastEditTime: 2019-12-19 19:13:05
*/
import React, { useState, useEffect } from 'react';
import {connect} from 'react-redux';
@@ -20,8 +20,11 @@ const RightPane = (props) => {
submitUserCode,
input,
hack,
+ notice,
updateCode,
+ hadCodeUpdate,
editor_code,
+ updateNotice,
saveUserInputCode,
restoreInitialCode,
saveUserCodeForInterval
@@ -29,6 +32,7 @@ const RightPane = (props) => {
const [editorCode, setEditorCode] = useState('');
+ let initFlag = true;
useEffect(() => {
if (editor_code) {
setEditorCode(editor_code);
@@ -48,7 +52,12 @@ const RightPane = (props) => {
// 代码块内容变化时
const handleCodeChange = (code) => {
// 保存用户提交的代码块
- console.log(code);
+ setEditorCode(code);
+ // 第一次回填代码内容时不更新;
+ if (initFlag) {
+ initFlag = false;
+ return;
+ }
if (!timer) {
timer = setInterval(() => {
clearInterval(timer);
@@ -69,13 +78,21 @@ const RightPane = (props) => {
restoreInitialCode(identifier, '恢复初始代码成功');
}
+ // 更新代码
+ const handleUpdateNotice = () => {
+ updateNotice && updateNotice();
+ };
+
return (
+
{
this.state.jupyter_url===null || this.state.jupyter_url===undefined?
(
@@ -376,7 +378,7 @@ class Challengesjupyter extends Component {
:""
)
:
-
From 97a432fa6a82c6da66391c0bc36ac1d414ceecb7 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, 20 Dec 2019 09:11:39 +0800
Subject: [PATCH 07/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/colleges_controller.rb | 12 +-
app/controllers/hacks_controller.rb | 4 +-
.../homework_commons_controller.rb | 14 +-
app/controllers/myshixuns_controller.rb | 2 +-
app/models/curriculum.rb | 4 -
app/models/curriculum_direction.rb | 4 -
app/models/hack_user_lastest_code.rb | 2 +-
app/models/item_bank.rb | 2 -
app/models/knowledge_point.rb | 5 -
app/models/knowledge_point_container.rb | 3 -
.../colleges/student_shixun.json.jbuilder | 2 +-
app/views/colleges/teachers.json.jbuilder | 2 +-
...1218070922_create_curriculum_directions.rb | 9 -
.../20191218071017_create_curriculums.rb | 10 -
.../20191218071111_create_knowledge_points.rb | 11 -
...71343_create_knowledge_point_containers.rb | 12 -
...1219120819_modify_description_for_hacks.rb | 10 +
public/react/package.json | 1 +
public/react/public/js/jupyter.js | 32 +-
public/react/src/App.js | 13 +-
public/react/src/college/College.js | 1259 +++++++++++++++++
.../college/colleagechart/Colleagechart.js | 84 ++
.../college/colleagechart/Colleagechartzu.js | 149 ++
.../src/college/colleagecss/colleage.css | 213 +++
.../common/components/comment/CommentForm.js | 116 ++
.../common/components/comment/CommentIcon.js | 32 +
.../common/components/comment/CommentItem.js | 165 +++
.../common/components/comment/CommentList.js | 20 +
.../src/common/components/comment/index.js | 22 +
.../src/common/components/comment/index.scss | 111 ++
.../src/common/quillForEditor/ImageBlot.js | 54 +
.../src/common/quillForEditor/deepEqual.js | 47 +
.../react/src/common/quillForEditor/index.js | 166 +++
.../react/src/common/reactQuill/ImageBlot.js | 54 +
.../react/src/common/reactQuill/ReactQuill.js | 45 +
.../react/src/common/reactQuill/deepEqual.js | 47 +
public/react/src/common/reactQuill/flatten.js | 26 +
public/react/src/common/reactQuill/index.js | 108 ++
public/react/src/common/reactQuill/index.scss | 32 +
public/react/src/common/reactQuill/lib.js | 13 +
.../src/common/reactQuill/useDeepEqualMemo.js | 27 +
.../src/common/reactQuill/useMountQuill.js | 148 ++
.../react/src/common/reactQuill/useQuill.js | 60 +
.../src/common/reactQuill/useQuillOnChange.js | 33 +
.../common/reactQuill/useQuillPlaceholder.js | 22 +
.../common/reactQuill/useQuillValueSync.js | 31 +
.../src/modules/developer/DeveloperHome.js | 21 +-
.../components/controlSetting/index.js | 24 +-
.../components/controlSetting/index.scss | 7 +-
.../developer/components/execResult/index.js | 14 +-
.../developer/components/initTabCtx/index.js | 7 +-
.../components/initTabCtx/index.scss | 3 +-
.../components/monacoSetting/index.js | 3 +-
.../components/myMonacoEditor/index.js | 59 +-
.../components/myMonacoEditor/index.scss | 33 +-
.../modules/developer/newOrEditTask/index.js | 102 +-
.../developer/newOrEditTask/index.scss | 16 +-
.../leftpane/editorTab/AddTestDemo.js | 24 +-
.../newOrEditTask/leftpane/editorTab/index.js | 53 +-
.../leftpane/editorTab/index.scss | 5 +
.../developer/newOrEditTask/leftpane/index.js | 22 -
.../newOrEditTask/leftpane/prevTab/index.js | 77 +-
.../newOrEditTask/rightpane/index.scss | 5 +-
.../modules/developer/split_pane_resizer.scss | 6 +-
.../modules/developer/studentStudy/index.js | 63 +-
.../modules/developer/studentStudy/index.scss | 2 +-
.../studentStudy/leftpane/comment/index.js | 13 +-
.../studentStudy/leftpane/comment/index.scss | 8 +
.../developer/studentStudy/leftpane/index.js | 63 +-
.../studentStudy/leftpane/index.scss | 7 +
.../leftpane/taskDescription/index.js | 18 +-
.../developer/studentStudy/rightpane/index.js | 32 +-
public/react/src/modules/tpm/TPMBanner.js | 71 +-
public/react/src/modules/tpm/TPMIndex.js | 11 +-
.../tpm/TPMsettings/LearningSettings.js | 6 +-
.../tpm/TPMsettings/Shixuninformation.js | 13 +
.../modules/tpm/challengesnew/TPManswer.js | 4 +-
.../modules/tpm/challengesnew/TPManswer2.js | 4 +-
.../tpm/challengesnew/TPMchallengesnew.js | 4 +-
.../tpm/challengesnew/TPMevaluation.js | 4 +-
.../modules/tpm/challengesnew/TPMquestion.js | 4 +-
.../modules/tpm/component/TPMRightSection.js | 6 +-
.../src/modules/tpm/component/TPMright.css | 5 +
.../tpm/shixunchild/Challenges/Challenges.js | 42 +-
.../Challenges/Challengesjupyter.js | 45 +-
.../Collaborators/Collaborators.css | 9 +
.../Collaborators/Collaborators.js | 11 +-
.../src/modules/tpm/shixuns/ShixunCardList.js | 2 +-
public/react/src/redux/actions/actionTypes.js | 5 +-
public/react/src/redux/actions/common.js | 4 +-
public/react/src/redux/actions/index.js | 4 +-
public/react/src/redux/actions/ojForUser.js | 45 +-
public/react/src/redux/actions/ojForm.js | 20 +-
.../src/redux/reducers/ojForUserReducer.js | 29 +-
.../react/src/redux/reducers/ojFormReducer.js | 4 +-
public/react/src/services/ojService.js | 15 +-
spec/models/curriculum_direction_spec.rb | 5 -
spec/models/curriculum_spec.rb | 5 -
spec/models/knowledge_point_container_spec.rb | 5 -
spec/models/knowledge_point_spec.rb | 5 -
100 files changed, 3821 insertions(+), 491 deletions(-)
delete mode 100644 app/models/curriculum.rb
delete mode 100644 app/models/curriculum_direction.rb
delete mode 100644 app/models/knowledge_point.rb
delete mode 100644 app/models/knowledge_point_container.rb
delete mode 100644 db/migrate/20191218070922_create_curriculum_directions.rb
delete mode 100644 db/migrate/20191218071017_create_curriculums.rb
delete mode 100644 db/migrate/20191218071111_create_knowledge_points.rb
delete mode 100644 db/migrate/20191218071343_create_knowledge_point_containers.rb
create mode 100644 db/migrate/20191219120819_modify_description_for_hacks.rb
create mode 100644 public/react/src/college/College.js
create mode 100644 public/react/src/college/colleagechart/Colleagechart.js
create mode 100644 public/react/src/college/colleagechart/Colleagechartzu.js
create mode 100644 public/react/src/college/colleagecss/colleage.css
create mode 100644 public/react/src/common/components/comment/CommentForm.js
create mode 100644 public/react/src/common/components/comment/CommentIcon.js
create mode 100644 public/react/src/common/components/comment/CommentItem.js
create mode 100644 public/react/src/common/components/comment/CommentList.js
create mode 100644 public/react/src/common/components/comment/index.js
create mode 100644 public/react/src/common/components/comment/index.scss
create mode 100644 public/react/src/common/quillForEditor/ImageBlot.js
create mode 100644 public/react/src/common/quillForEditor/deepEqual.js
create mode 100644 public/react/src/common/quillForEditor/index.js
create mode 100644 public/react/src/common/reactQuill/ImageBlot.js
create mode 100644 public/react/src/common/reactQuill/ReactQuill.js
create mode 100644 public/react/src/common/reactQuill/deepEqual.js
create mode 100644 public/react/src/common/reactQuill/flatten.js
create mode 100644 public/react/src/common/reactQuill/index.js
create mode 100644 public/react/src/common/reactQuill/index.scss
create mode 100644 public/react/src/common/reactQuill/lib.js
create mode 100644 public/react/src/common/reactQuill/useDeepEqualMemo.js
create mode 100644 public/react/src/common/reactQuill/useMountQuill.js
create mode 100644 public/react/src/common/reactQuill/useQuill.js
create mode 100644 public/react/src/common/reactQuill/useQuillOnChange.js
create mode 100644 public/react/src/common/reactQuill/useQuillPlaceholder.js
create mode 100644 public/react/src/common/reactQuill/useQuillValueSync.js
create mode 100644 public/react/src/modules/developer/studentStudy/leftpane/comment/index.scss
delete mode 100644 spec/models/curriculum_direction_spec.rb
delete mode 100644 spec/models/curriculum_spec.rb
delete mode 100644 spec/models/knowledge_point_container_spec.rb
delete mode 100644 spec/models/knowledge_point_spec.rb
diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index 71009d2dd..707255866 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -21,7 +21,7 @@ class CollegesController < ApplicationController
# 实训总数
@shixuns_count = Shixun.visible.joins('left join user_extensions on user_extensions.user_id = shixuns.user_id')
.where(user_extensions: { school_id: current_school.id }).count
- render json: { teachers_count: @teachers_count, students_count: @students_count, courses_count: @courses_count, shixuns_count: @shixuns_count }
+ render json: { teachers_count: @teachers_count, students_count: @students_count, courses_count: @courses_count, shixuns_count: @shixuns_count, school: current_school.name }
end
def shixun_time
@@ -44,8 +44,8 @@ class CollegesController < ApplicationController
(SELECT count(c.id) FROM courses c, course_members m WHERE c.id != 1309 and m.course_id = c.id AND m.user_id=users.id AND m.role in (1,2,3) and c.school_id = #{current_school.id} AND c.is_delete = 0) as course_count
FROM `users`, user_extensions ue where ue.school_id=#{current_school.id} and users.id=ue.user_id and ue.identity=0 ORDER BY publish_shixun_count desc, course_count desc, id desc LIMIT 10")
# ).order("publish_shixun_count desc, experience desc").limit(10)
- @teacher_count = UserExtension.where(school_id: current_school.id)
- .select('SUM(IF(identity=0, 1, 0)) AS teachers_count').first.teachers_count
+ # @teacher_count = UserExtension.where(school_id: current_school.id)
+ # .select('SUM(IF(identity=0, 1, 0)) AS teachers_count').first.teachers_count
@teachers =
@teachers.map do |teacher|
course_ids = Course.find_by_sql("SELECT c.id FROM courses c, course_members m WHERE c.id != 1309 and m.course_id = c.id AND m.role in (1,2,3) AND m.user_id=#{teacher.id} AND c.is_delete = 0 and c.school_id = #{current_school.id}")
@@ -99,7 +99,7 @@ class CollegesController < ApplicationController
@course_count = courses.size
courses = courses.left_joins(practice_homeworks: { student_works: { myshixun: :games } })
- .select('courses.id, courses.name, courses.is_end, sum(games.evaluate_count) evaluating_count')
+ .select('courses.id, courses.name, courses.is_end, IFNULL(sum(games.evaluate_count), 0) evaluating_count')
.group('courses.id').order('is_end asc, evaluating_count desc')
@courses = paginate courses
@@ -117,7 +117,7 @@ class CollegesController < ApplicationController
# 学生实训
def student_shixun
- @student_count = User.joins(:user_extension).where(user_extensions: { school_id: current_school.id, identity: 1 }).count
+ # @student_count = User.joins(:user_extension).where(user_extensions: { school_id: current_school.id, identity: 1 }).count
@students = User.joins(:user_extension).where(user_extensions: { school_id: current_school.id, identity: 1 }).includes(:user_extension).order('experience desc').limit(10)
student_ids = @students.map(&:id)
@@ -158,7 +158,7 @@ class CollegesController < ApplicationController
return true if current_user.admin_or_business? # 超级管理员|运营
return true if current_college.is_a?(Department) && current_college.member?(current_user) # 部门管理员
return true if current_user.is_teacher? && current_user.school_id == current_school.id # 学校老师
- return true if current_school.customers.exists? && current_user.partner&.partner_customers&.exists?(customer_id: current_school.customer_id)
+ # return true if current_school.customers.exists? && current_user.partner&.partner_customers&.exists?(customer_id: current_school.customer_id)
false
end
diff --git a/app/controllers/hacks_controller.rb b/app/controllers/hacks_controller.rb
index cab952a04..b7f6a30a2 100644
--- a/app/controllers/hacks_controller.rb
+++ b/app/controllers/hacks_controller.rb
@@ -9,9 +9,11 @@ class HacksController < ApplicationController
def start
# 未发布的编程题，只能作者、或管理员访问
start_hack_auth
- user_hack = @hack.hack_user_lastest_codes.mine(current_user.id)
+ user_hack = @hack.hack_user_lastest_codes.where(user_id: current_user.id).first
+ logger.info("#user_hack: #{user_hack}")
identifier =
if user_hack.present?
+ logger.info("#####user_hack_id:#{user_hack.id}")
user_hack.identifier
else
user_identifier = generate_identifier HackUserLastestCode, 12
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 8a1c07ddf..3a60dcde5 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -167,7 +167,11 @@ class HomeworkCommonsController < ApplicationController
if params[:work_status].present?
params_work_status = params[:work_status]
work_status = params_work_status.map{|status| status.to_i}
- @student_works = @student_works.where(compelete_status: work_status)
+ if @homework.homework_type == "practice"
+ @student_works = @student_works.where(compelete_status: work_status)
+ else
+ @student_works = @student_works.where(work_status: work_status)
+ end
end
# 分班情况
@@ -1497,8 +1501,12 @@ class HomeworkCommonsController < ApplicationController
@user = @student_work.user
tip_exception("当前用户无作品可以显示") if @student_work.nil?
# 查询最新一次的查重标识query_id
- group_id = @course.course_members.where(user_id: params[:user_id]).pluck(:course_group_id).first
- query_id = @homework.homework_group_reviews.where(:course_group_id => group_id).last.try(:query_id)
+ group_id = @course.students.where(user_id: params[:user_id]).pluck(:course_group_id).first
+ homework_group_review = @homework.homework_group_reviews.where(:course_group_id => group_id).last || @homework.homework_group_reviews.last
+ query_id = homework_group_review.try(:query_id)
+ Rails.logger.info("##################------query_id: #{query_id}")
+ tip_exception(-1, "query_id有误") unless query_id.present?
+
results = ReviewService.query_result({user_id: params[:user_id], query_id: query_id})
@shixun = @homework.shixuns.take
if results.status == 0
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 987f4873a..0e9ba477a 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -247,7 +247,7 @@ class MyshixunsController < ApplicationController
def update_file
begin
@hide_code = Shixun.where(id: @myshixun.shixun_id).pluck(:hide_code).first
- tip_exception("技术平台为空!") if @myshixun.mirror_name.blank?
+ tip_exception("实验环境不能为空，请查看实训模板的环境配置项是否正确!") if (@myshixun.mirror_name.blank? || @myshixun.mirror_name.first.to_s == "-1")
path = params[:path].strip unless params[:path].blank?
game_id = params[:game_id]
game = Game.find(game_id)
diff --git a/app/models/curriculum.rb b/app/models/curriculum.rb
deleted file mode 100644
index 0b78814bc..000000000
--- a/app/models/curriculum.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class Curriculum < ApplicationRecord
- belongs_to :curriculum_direction
- has_many :knowledge_points, dependent: :destroy
-end
diff --git a/app/models/curriculum_direction.rb b/app/models/curriculum_direction.rb
deleted file mode 100644
index 1c9211559..000000000
--- a/app/models/curriculum_direction.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-class CurriculumDirection < ApplicationRecord
- has_many :curriculums
- has_many :knowledge_points
-end
diff --git a/app/models/hack_user_lastest_code.rb b/app/models/hack_user_lastest_code.rb
index b4a707603..830f16dde 100644
--- a/app/models/hack_user_lastest_code.rb
+++ b/app/models/hack_user_lastest_code.rb
@@ -8,7 +8,7 @@ class HackUserLastestCode < ApplicationRecord
belongs_to :user
has_many :hack_user_codes, dependent: :destroy
has_one :hack_user_debug
- scope :mine, ->(author_id){ find_by(user_id: author_id) }
+ scope :mine, ->(author_id){ where(user_id: author_id).first }
scope :mine_hack, ->(author_id){ where(user_id: author_id) }
scope :passed, -> {where(status: 1)}
diff --git a/app/models/item_bank.rb b/app/models/item_bank.rb
index 32c349e34..8078a55e0 100644
--- a/app/models/item_bank.rb
+++ b/app/models/item_bank.rb
@@ -3,8 +3,6 @@ class ItemBank < ApplicationRecord
# item_type: 0 单选 1 多选 2 判断 3 填空 4 简答 5 实训 6 编程
enum item_type: { SINGLE: 0, MULTIPLE: 1, JUDGMENT: 2, COMPLETION: 3, SUBJECTIVE: 4, PRACTICAL: 5, PROGRAM: 6 }
- belongs_to :curriculum
- belongs_to :curriculum_direction
belongs_to :user
has_one :item_analysis, dependent: :destroy
diff --git a/app/models/knowledge_point.rb b/app/models/knowledge_point.rb
deleted file mode 100644
index 3d75b66a1..000000000
--- a/app/models/knowledge_point.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class KnowledgePoint < ApplicationRecord
- belongs_to :curriculum_direction
- belongs_to :curriculum
- has_many :knowledge_point_containers, dependent: :destroy
-end
diff --git a/app/models/knowledge_point_container.rb b/app/models/knowledge_point_container.rb
deleted file mode 100644
index ea73d00e7..000000000
--- a/app/models/knowledge_point_container.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class KnowledgePointContainer < ApplicationRecord
- belongs_to :knowledge_point
-end
diff --git a/app/views/colleges/student_shixun.json.jbuilder b/app/views/colleges/student_shixun.json.jbuilder
index 431603afa..97e418148 100644
--- a/app/views/colleges/student_shixun.json.jbuilder
+++ b/app/views/colleges/student_shixun.json.jbuilder
@@ -7,4 +7,4 @@ json.teachers @students do |student|
json.grade student.grade
json.experience student.experience
end
-json.student_count @student_count
\ No newline at end of file
+# json.student_count @student_count
\ No newline at end of file
diff --git a/app/views/colleges/teachers.json.jbuilder b/app/views/colleges/teachers.json.jbuilder
index 29b383fa4..1308f0cf4 100644
--- a/app/views/colleges/teachers.json.jbuilder
+++ b/app/views/colleges/teachers.json.jbuilder
@@ -8,4 +8,4 @@ json.teachers @teachers do |teacher|
json.complete_rate teacher['complete_rate']
json.publish_shixun_count teacher['publish_shixun_count']
end
-json.teacher_count @teacher_count
\ No newline at end of file
+# json.teacher_count @teacher_count
\ No newline at end of file
diff --git a/db/migrate/20191218070922_create_curriculum_directions.rb b/db/migrate/20191218070922_create_curriculum_directions.rb
deleted file mode 100644
index 9203aa435..000000000
--- a/db/migrate/20191218070922_create_curriculum_directions.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateCurriculumDirections < ActiveRecord::Migration[5.2]
- def change
- create_table :curriculum_directions do |t|
- t.string :name
-
- t.timestamps
- end
- end
-end
diff --git a/db/migrate/20191218071017_create_curriculums.rb b/db/migrate/20191218071017_create_curriculums.rb
deleted file mode 100644
index 885f2a676..000000000
--- a/db/migrate/20191218071017_create_curriculums.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateCurriculums < ActiveRecord::Migration[5.2]
- def change
- create_table :curriculums do |t|
- t.string :name
- t.references :curriculum_direction, index: true
-
- t.timestamps
- end
- end
-end
diff --git a/db/migrate/20191218071111_create_knowledge_points.rb b/db/migrate/20191218071111_create_knowledge_points.rb
deleted file mode 100644
index 2f748d266..000000000
--- a/db/migrate/20191218071111_create_knowledge_points.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateKnowledgePoints < ActiveRecord::Migration[5.2]
- def change
- create_table :knowledge_points do |t|
- t.string :name
- t.references :curriculum_direction, index: true
- t.references :curriculum, index: true
-
- t.timestamps
- end
- end
-end
diff --git a/db/migrate/20191218071343_create_knowledge_point_containers.rb b/db/migrate/20191218071343_create_knowledge_point_containers.rb
deleted file mode 100644
index 0b6944ea7..000000000
--- a/db/migrate/20191218071343_create_knowledge_point_containers.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateKnowledgePointContainers < ActiveRecord::Migration[5.2]
- def change
- create_table :knowledge_point_containers do |t|
- t.references :knowledge_point
- t.integer :container_id
- t.string :container_type
-
- t.timestamps
- end
- add_index :knowledge_point_containers, [:knowledge_point_id, :container_id, :container_type], name: "container_index", unique: true
- end
-end
diff --git a/db/migrate/20191219120819_modify_description_for_hacks.rb b/db/migrate/20191219120819_modify_description_for_hacks.rb
new file mode 100644
index 000000000..3cc45fd5d
--- /dev/null
+++ b/db/migrate/20191219120819_modify_description_for_hacks.rb
@@ -0,0 +1,10 @@
+class ModifyDescriptionForHacks < ActiveRecord::Migration[5.2]
+ def change
+ change_column :hacks, :description, :longtext
+ change_column :hack_codes, :code, :longtext
+ change_column :hack_user_lastest_codes, :code, :longtext
+ change_column :hack_user_codes, :code, :longtext
+ change_column :hack_user_debugs, :code, :longtext
+
+ end
+end
diff --git a/public/react/package.json b/public/react/package.json
index 66db5e6f8..144292feb 100644
--- a/public/react/package.json
+++ b/public/react/package.json
@@ -61,6 +61,7 @@
"prop-types": "^15.6.1",
"qs": "^6.6.0",
"quill": "^1.3.7",
+ "quill-delta-to-html": "^0.11.0",
"raf": "3.4.0",
"rc-form": "^2.1.7",
"rc-pagination": "^1.16.2",
diff --git a/public/react/public/js/jupyter.js b/public/react/public/js/jupyter.js
index 8d76a9a7f..6e52088c3 100644
--- a/public/react/public/js/jupyter.js
+++ b/public/react/public/js/jupyter.js
@@ -1,11 +1,29 @@
-//用于嵌入到jupyter pod中的js
-//guange 2019.12.18
-
-window.onload=function(){
- require(["base/js/namespace"],function(Jupyter) {
- Jupyter.notebook.save_checkpoint();
- });
+ window.onload=function(){
+ // require(["base/js/namespace"],function(Jupyter) {
+ // Jupyter.notebook.save_checkpoint();
+ // });
+ $('.navbar-nav').children().eq(7).css({'display':'none'})
+ console.log($('.navbar-nav').children().eq(7))
}
+
+// //子目标父窗口接收子窗口发送的消息
+// let message = {type: 'open', link:'需要发送的消息'};
+// //子窗口向父窗口发送消息，消息中包含我们想跳转的链接
+// window.parent.postMessage(message,'需要发送的消息');
+
+
+
+ // //目标父窗口接收子窗口发送的消息
+ // window.addEventListener('message', (e)=>{
+ // let origin = event.origin || event.originalEvent.origin;
+ // if (origin !== '需要发送的消息') {
+ // return;
+ // }else {
+ // //更换iframe的src,实现iframe页面跳转
+ // 执行方法
+ // }
+ // },false);
+
\ No newline at end of file
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 93b293e36..07fd13e49 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -72,6 +72,7 @@ const Otherlogin=Loadable({
loading: Loading,
})
+
const Otherloginstart=Loadable({
loader: () => import('./modules/login/Otherloginstart'),
loading: Loading,
@@ -300,6 +301,11 @@ const Developer = Loadable({
loader: () => import('./modules/developer'),
loading: Loading
})
+// 学院统计
+const College = Loadable({
+ loader: () => import('./college/College'),
+ loading: Loading
+})
// 开发者编辑模块
const NewOrEditTask = Loadable({
@@ -614,7 +620,10 @@ class App extends Component {
{/*/>*/}
-
+ ( ( (![]({getImageUrl("images/educoder/competition/1.png")}/)
+ :record.id===2?
+ ![]({getImageUrl("images/educoder/competition/2.png")}/)
+ :record.id===3?
+ ![]({getImageUrl("images/educoder/competition/3.png")}/)
+ :record.id
+ }
+
+ )
+ },
+ {
+ title: '姓名',
+ dataIndex: 'name',
+ key: 'name',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth105",
+ width:'100px',
+ render: (text, record) => (
+ {
+ record.name
+ }
+
+ )
+ },
+ {
+ title: '学号',
+ dataIndex: 'studentid',
+ key: 'studentid',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth175",
+ render: (text, record) => (
+
+ {
+ record.student_id
+ }
+
+ ),
+ },
+ {
+ title: '完成实训',
+ key: 'training',
+ dataIndex: 'training',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth255",
+ render: (text, record) => (
+
+ {
+ record.shixun_count
+ }
+
+ )
+ },
+ {
+ title: '在学实训',
+ dataIndex: 'learning',
+ key: 'learning',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.study_shixun_count
+ }
+
+ )
+
+ },
+ {
+ title: '金币',
+ dataIndex: 'goldcoin',
+ key: 'goldcoin',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.grade
+ }
+
+ ),
+ },
+ {
+ title: '经验值',
+ dataIndex: 'empirical',
+ key: 'empirical',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.experience
+ }
+
+ )
+ },
+ ],
+ school:"",
+ teachers_count:null,
+ students_count:null,
+ courses_count:null,
+ shixuns_count:null,
+ shixun_report_count:null,
+ shixun_time:null,
+ courses:null,
+ course_count:0,
+ pages:1,
+ limits:10,
+ teachers:null,
+ teacher_count:0,
+ students:null,
+ student_count:0,
+ shixun_chart_data:null,
+ shixun_chart_datanames:null,
+ studentionsnames:null,
+ studentionsvalues:null
+ }
+
+ }
+
+
+ componentDidMount(){
+ console.log("College");
+ console.log(this.props.match.params.id);
+ this.gettop();
+ this.Numberofinternshipreports();
+ this.Actualcombattimeoftrainees();
+ this.Classnumber(1,10);
+ this.Teacherranking(1,10);
+ this.Studentranking(1,10);
+ this.Onlinetraining();
+ this.Hottest();
+ }
+ //头部
+ gettop=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/statistics.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ }else{
+ this.setState({
+ teachers_count:response.data.teachers_count,
+ students_count:response.data.students_count,
+ courses_count:response.data.courses_count,
+ shixuns_count:response.data.shixuns_count,
+ school:response.data.school,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ });
+ }
+
+ //获取实训报告数
+ Numberofinternshipreports=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/shixun_report_count.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ shixun_report_count:0,
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ shixun_report_count:0,
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ shixun_report_count:0,
+ })
+ return
+ }
+ this.setState({
+ shixun_report_count:response.data.shixun_report_count,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ shixun_report_count:0,
+ })
+ });
+ }
+
+ //学员实战时间
+ Actualcombattimeoftrainees=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/shixun_time.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ shixun_time:0,
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ shixun_time:0,
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ shixun_time:0,
+ })
+ return
+ }
+ this.setState({
+ shixun_time:response.data.shixun_time,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ shixun_time:0,
+ })
+ });
+ }
+
+ //课堂信息
+ Classnumber=(page,per_page)=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/course_statistics.json`;
+ this.setState({
+ coursesloading:true
+ })
+ axios.get(url,{params:{
+ page:page,
+ per_page:per_page,
+ }
+ }).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ return
+ }
+ this.setState({
+ courses:response.data.courses,
+ course_count:response.data.course_count,
+ page:page,
+ limit:per_page
+ })
+ }
+ this.setState({
+ coursesloading:false
+ })
+ }).catch((error) => {
+ this.setState({
+ courses:[],
+ course_count:0,
+ coursesloading:false
+ })
+ });
+ }
+
+ //教师排名
+ Teacherranking=(page,per_page)=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/teachers.json`;
+ this.setState({
+ teachersloading:true
+ })
+ axios.get(url,{params:{
+ page:page,
+ per_page:per_page,
+ }
+ }).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ return
+ }
+ let teachers=[];
+ if(response.data.teachers){
+ for(let i=0;i {
+ this.setState({
+ teachers:[],
+ teacher_count:0,
+ teachersloading:false
+ })
+ });
+ }
+ //学生排名
+
+ Studentranking=(page,per_page)=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/student_shixun.json`;
+ this.setState({
+ studentsloading:true
+ })
+ axios.get(url,{params:{
+ page:page,
+ per_page:per_page,
+ }
+ }).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ students:[],
+ student_count:0,
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ students:[],
+ student_count:0,
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ students:[],
+ student_count:0,
+ })
+ return
+ }
+ let students=[];
+ if(response.data.teachers){
+ for(let i=0;i {
+ this.setState({
+ students:[],
+ student_count:0,
+ studentsloading:false
+ })
+ });
+ }
+
+ //在线实训情况
+ Onlinetraining=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/shixun_chart_data.json`;
+ axios.get(url).then((response) => {
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ shixun_chart_data:[],
+ shixun_chart_datanames:[]
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ shixun_chart_data:[],
+ shixun_chart_datanames:[]
+ })
+ return
+ }
+
+ this.setState({
+ shixun_chart_data:response.data.data,
+ shixun_chart_datanames:response.data.names
+ })
+ }
+ }).catch((error) => {
+ this.setState({
+ shixun_chart_data:[],
+ shixun_chart_datanames:[]
+ })
+ });
+ }
+ //最热测评
+ Hottest=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/student_hot_evaluations.json`;
+ axios.get(url).then((response) => {
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ studentionsnames: [],
+ studentionsvalues: []
+ })
+ }else {
+ if (response.data.status === -1) {
+ this.setState({
+ studentionsnames: [],
+ studentionsvalues: []
+ })
+ return
+ }
+ this.setState({
+ studentionsnames: response.data.names,
+ studentionsvalues: response.data.values
+ })
+ }
+ }).catch((error) => {
+ this.setState({
+ studentionsnames: [],
+ studentionsvalues: []
+ })
+ });
+ }
+
+ table1handleChange(){
+
+ }
+
+ //塞选
+ paginationonChange=(pageNumber)=>{
+ this.Classnumber(pageNumber,10);
+ }
+
+ paginationonChanges=(pageNumber)=>{
+ this.Teacherranking(pageNumber,10);
+ }
+ paginationonChangess=(pageNumber)=>{
+ this.Studentranking(pageNumber,10);
+ }
+ render() {
+ let {columns,page,limit,total_users,teacherranking,studentranking,
+ teachers_count,students_count, courses_count, shixuns_count,shixun_report_count,shixun_time,courses,course_count,school,teachers,
+ pages,limits, teacher_count,teachersloading,coursesloading,pagess,limitss,studentsloading,students,student_count,shixun_chart_data,
+ shixun_chart_datanames, studentionsnames,studentionsvalues
+ } = this.state;
+
+ return (
+
" + }, + legend: { + // orient: 'vertical', + // top: 'middle', + bottom: 50, + left: 'center', + data: datanane + }, + series : [ + { + type: 'pie', + radius : '65%', + center: ['50%', '35%'], + selectedMode: 'single', + data:data, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + effChart.setOption(option); +} +class Colleagechart extends Component { + + constructor(props) { + super(props); + this.state = { + } + } + + componentDidMount() { + startechart(this.props.data,this.props.datanane) + } + + + componentDidUpdate = (prevProps) => { + if (prevProps.data!= this.props.data) { + startechart(this.props.data,this.props.datanane) + } + } + + + render() { + let {data}=this.props; + + return ( +
+ );
+
+ // 评论信息
+ const commentInfo = () => (
+
+ {commentAvatar()}
+
+ );
+}
+
+export default CNotificationHOC() (CommentItem);
diff --git a/public/react/src/common/components/comment/CommentList.js b/public/react/src/common/components/comment/CommentList.js
new file mode 100644
index 000000000..9d8cde87b
--- /dev/null
+++ b/public/react/src/common/components/comment/CommentList.js
@@ -0,0 +1,20 @@
+/*
+ * @Description: 评论列表页
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-17 17:34:00
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-18 11:48:09
+ */
+import './index.scss';
+import React from 'react';
+import CommentItem from './CommentItem';
+function CommentList ({}) {
+ return (
+
+
+ );
+}
+
+export default Comment;
diff --git a/public/react/src/common/components/comment/index.scss b/public/react/src/common/components/comment/index.scss
new file mode 100644
index 000000000..816e6da6c
--- /dev/null
+++ b/public/react/src/common/components/comment/index.scss
@@ -0,0 +1,111 @@
+$bdColor: rgba(244,244,244,1);
+$bgColor: rgba(250,250,250,1);
+$lh14: 14px;
+$lh22: 22px;
+$fz14: 14px;
+$fz12: 12px;
+$ml: 20px;
+
+.comment_list_wrapper{
+ box-sizing: border-box;
+ border-top: 1px solid $bdColor;
+
+ .comment_item_area{
+ display: flex;
+ padding: 20px 0;
+ box-sizing: border-box;
+ border-bottom: 1px solid $bdColor;
+ .flex-image{
+ width: 48px;
+ height: 48px;
+ border-radius: 50%;
+ }
+ .item-desc{
+ flex: 1;
+ margin-left: $ml;
+ }
+ .item-header{
+ font-size: $fz14;
+ line-height: $lh14;
+ color: #333;
+ .item-time{
+ font-size: $fz12;
+ line-height: $lh14;
+ margin-left: $ml;
+ }
+ .item-close{
+ float: right;
+ cursor: pointer;
+ }
+ }
+ .item-ctx{
+ line-height: $lh22;
+ font-size: $fz12;
+ color: #333;
+ margin-top: 10px;
+ }
+ .comment_icon_area{
+ display: flex;
+ justify-content: flex-end;
+ margin-top: 10px;
+
+ .comment-icon-margin{
+ margin-left: 30px;
+ }
+ }
+
+ .comment_item_quill{
+ margin-top: 20px;
+ }
+ }
+ .comment_icon_count{
+ cursor: pointer;
+ font-size: 12px;
+ line-height: 1.5;
+
+ .comment_icon{
+ color: #333;
+ }
+ .comment_count{
+ color: #999999;
+ margin-left: 10px;
+ transition: color .3s;
+ }
+
+ &:hover{
+ .comment_icon,
+ .comment_count{
+ color: #5091FF;
+ }
+ }
+ }
+ .comment_item_append_list{
+ position: relative;
+ background-color: $bgColor;
+ border-radius: 5px;
+ padding: 0 15px 10px;
+ margin: 15px 0;
+ &::before {
+ position: absolute;
+ left: 15px;
+ bottom: 100%;
+ height: 0;
+ width: 0;
+ content: '';
+ // border: 5px solid transparent;
+ border: 10px solid transparent;
+ border-bottom-color: $bgColor;
+ }
+
+ .comment_item_loadmore{
+ padding-top: 10px;
+ cursor: pointer;
+ .loadmore-txt,
+ .loadmore-icon{
+ color: #999;
+ text-align: center;
+ font-size: $fz12;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/common/quillForEditor/ImageBlot.js b/public/react/src/common/quillForEditor/ImageBlot.js
new file mode 100644
index 000000000..091bd2c1f
--- /dev/null
+++ b/public/react/src/common/quillForEditor/ImageBlot.js
@@ -0,0 +1,54 @@
+/*
+ * @Description: 重写图片
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-16 15:50:45
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-17 16:44:48
+ */
+import Quill from "quill";
+
+const BlockEmbed = Quill.import('blots/block/embed');
+
+export default class ImageBlot extends BlockEmbed {
+
+ static create(value) {
+
+ const node = super.create();
+
+ node.setAttribute('alt', value.alt);
+ node.setAttribute('src', value.url);
+
+ if (value.width) {
+ node.setAttribute('width', value.width);
+ }
+ if (value.height) {
+ node.setAttribute('height', value.height);
+ }
+ // 宽度和高度都不存在时，
+ if (!value.width && !value.height) {
+ node.setAttribute('display', 'block');
+ node.setAttribute('width', '100%');
+ }
+ // 给图片添加点击事件
+ node.onclick = () => {
+ value.onClick && value.onClick(value.url);
+ }
+ return node;
+ }
+
+ static value (node) {
+
+ return {
+ alt: node.getAttribute('alt'),
+ url: node.getAttribute('src'),
+ onclick: node.onclick,
+ // width: node.width,
+ // height: node.height,
+ display: node.getAttribute('display')
+ };
+ }
+}
+
+ImageBlot.blotName = 'image';
+ImageBlot.tagName = 'img';
\ No newline at end of file
diff --git a/public/react/src/common/quillForEditor/deepEqual.js b/public/react/src/common/quillForEditor/deepEqual.js
new file mode 100644
index 000000000..6f2b276bf
--- /dev/null
+++ b/public/react/src/common/quillForEditor/deepEqual.js
@@ -0,0 +1,47 @@
+function deepEqual (prev, current) {
+ if (prev === current) { // 基本类型比较，值，类型都相同 或者同为 null or undefined
+ return true;
+ }
+
+ if ((!prev && current)
+ || (prev && !current)
+ || (!prev && !current)
+ ) {
+ return false;
+ }
+
+ if (Array.isArray(prev)) {
+ if (!Array.isArray(current)) return false;
+ if (prev.length !== current.length) return false;
+
+ for (let i = 0; i < prev.length; i++) {
+ if (!deepEqual(current[i], prev[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ if (typeof current === 'object') {
+ if (typeof prev !== 'object') return false;
+ const prevKeys = Object.keys(prev);
+ const curKeys = Object.keys(current);
+
+ if (prevKeys.length !== curKeys.length) return false;
+
+ prevKeys.sort();
+ curKeys.sort();
+
+ for (let i = 0; i < prevKeys.length; i++) {
+ if (prevKeys[i] !== curKeys[i]) return false;
+ const key = prevKeys[i];
+ if (!deepEqual(prev[key], current[key])) return false;
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
+export default deepEqual;
diff --git a/public/react/src/common/quillForEditor/index.js b/public/react/src/common/quillForEditor/index.js
new file mode 100644
index 000000000..6e6c01886
--- /dev/null
+++ b/public/react/src/common/quillForEditor/index.js
@@ -0,0 +1,166 @@
+/*
+ * @Description: quill 编辑器
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-18 08:49:30
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-19 16:58:50
+ */
+import 'quill/dist/quill.core.css'; // 核心样式
+import 'quill/dist/quill.snow.css'; // 有工具栏
+import 'quill/dist/quill.bubble.css'; // 无工具栏
+import 'katex/dist/katex.min.css'; // katex 表达式样式
+import React, { useState, useRef, useEffect } from 'react';
+import Quill from 'quill';
+import katex from 'katex';
+import deepEqual from './deepEqual.js'
+import { fetchUploadImage } from '../../services/ojService.js';
+import { getImageUrl } from 'educoder'
+import ImageBlot from './ImageBlot';
+
+window.Quill = Quill;
+window.katex = katex;
+Quill.register(ImageBlot);
+
+function QuillForEditor ({
+ placeholder,
+ readOnly,
+ options,
+ value,
+ imgAttrs = {}, // 指定图片的宽高
+ style = {},
+ wrapStyle = {},
+ showUploadImage,
+ onContentChange
+}) {
+ // toolbar 默认值
+ const defaultConfig = [
+ ['bold', 'italic', 'underline'],
+ [{align: []}, {list: 'ordered'}, {list: 'bullet'}], // 列表
+ [{script: 'sub'}, {script: 'super'}],
+ [{ 'color': [] }, { 'background': [] }],
+ [{header: [1,2,3,4,5,false]}],
+ ['blockquote', 'code-block'],
+ ['link', 'image', 'video'],
+ ['formula'],
+ ['clean']
+ ];
+
+ const editorRef = useRef(null);
+ // quill 实例
+ const [quill, setQuill] = useState(null);
+ const [selection, setSelection] = useState(null);
+
+ // 文本内容变化时
+ const handleOnChange = content => {
+ // console.log('编辑器内容====》》》》', content);
+ onContentChange && onContentChange(content);
+ };
+
+ const renderOptions = options || defaultConfig;
+ // quill 配置信息
+ const quillOption = {
+ modules: {
+ toolbar: renderOptions
+ },
+ readOnly,
+ placeholder,
+ theme: readOnly ? 'bubble' : 'snow'
+ };
+
+
+ useEffect(() => {
+ const _quill = new Quill(editorRef.current, quillOption);
+ setQuill(_quill);
+
+ // 处理图片上传功能
+ _quill.getModule('toolbar').addHandler('image', (e) => {
+ const input = document.createElement('input');
+ input.setAttribute('type', 'file');
+ input.setAttribute('accept', 'image/*');
+ input.click();
+
+ input.onchange = async (e) => {
+ const file = input.files[0]; // 获取文件信息
+ const formData = new FormData();
+ formData.append('file', file);
+
+ const range = _quill.getSelection(true);
+ let fileUrl = ''; // 保存上传成功后图片的url
+ // 上传文件
+ const result = await fetchUploadImage(formData);
+ // 获取上传图片的url
+ if (result.data && result.data.id) {
+ fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
+ }
+ // 根据id获取文件路径
+ const { width, height } = imgAttrs;
+ // console.log('上传图片的url:', fileUrl);
+ if (fileUrl) {
+ _quill.insertEmbed(range.index, 'image', {
+ url: fileUrl,
+ alt: '图片信息',
+ onClick: showUploadImage,
+ width,
+ height
+ });
+ }
+ }
+ });
+ }, []);
+
+ // 设置值
+ useEffect(() => {
+ if (!quill) return
+ const previous = quill.getContents()
+ const current = value
+
+ if (!deepEqual(previous, current)) {
+ setSelection(quill.getSelection())
+ if (typeof value === 'string') {
+ quill.clipboard.dangerouslyPasteHTML(value, 'api')
+ } else {
+ quill.setContents(value)
+ }
+ }
+ }, [quill, value, setQuill]);
+
+ // 清除选择区域
+ useEffect(() => {
+ if (quill && selection) {
+ quill.setSelection(selection)
+ setSelection(null)
+ }
+ }, [quill, selection, setSelection]);
+
+ // 设置placeholder值
+ useEffect(() => {
+ if (!quill || !quill.root) return;
+ quill.root.dataset.placeholder = placeholder;
+ }, [quill, placeholder]);
+
+ // 处理内容变化
+ useEffect(() => {
+ if (!quill) return;
+ if (typeof handleOnChange !== 'function') return;
+ let handler;
+ quill.on(
+ 'text-change',
+ (handler = () => {
+ handleOnChange(quill.getContents()); // getContents: 检索编辑器内容
+ })
+ );
+ return () => {
+ quill.off('text-change', handler);
+ }
+ }, [quill, handleOnChange]);
+
+ // 返回结果
+ return (
+
@@ -161,4 +192,4 @@ const mapDispatchToProps = (dispatch) => ({
export default connect(
mapStateToProps,
mapDispatchToProps
-)(MyMonacoEditor);
+)(CNotificationHOC() (MyMonacoEditor));
diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.scss b/public/react/src/modules/developer/components/myMonacoEditor/index.scss
index 7a7c4f030..61689b51e 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.scss
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.scss
@@ -1,19 +1,17 @@
.monaco_editor_area{
height: 100%;
- background-color: rgba(30,30,30,1);
+ background-color: rgba(7,15,25,1);
.code_title{
display: flex;
align-items: center;
- // justify-content: space-between;
- // background: #000;
- // background: #333333;
- background-color: rgba(48,48,48,1);
+ background-color: rgba(18,28,36,1);
color: #fff;
height: 56px;
padding: 0 30px;
.flex_strict{
flex: 1;
}
+
.flex_normal{
color: #E51C24;
cursor: pointer;
@@ -25,21 +23,21 @@
.flex_strict,
.flex_normal,
.code-icon{
- color: #888;
+ color: #666;
}
}
}
.setting_drawer{
- // .ant-drawer-body{
- // // height: calc(100vh - 120px);
- // // overflow-y: auto;
- // }
+ .ant-drawer-close{
+ color: #ffffff;
+ }
.ant-drawer-content{
top: 120px;
bottom: 56px;
height: calc(100vh - 176px);
- background: #333333;
+ // background: #333333;
+ background: rgba(7,15,25,1);
color: #fff;
.setting_h2{
color: #fff;
@@ -57,4 +55,17 @@
color: #fff;
}
}
+}
+
+.flex_has_save{
+ // animation: blink 3s line 3;
+ animation-name: blink;
+ animation-duration: .4s;
+ animation-iteration-count: 3;
+}
+
+@keyframes blink{
+ 50% {
+ color: #fff;
+ }
}
\ No newline at end of file
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index bc905fdf7..1c451c669 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -13,11 +13,11 @@ import { Button, Modal } from 'antd';
import LeftPane from './leftpane';
import RightPane from './rightpane';
import { withRouter } from 'react-router';
-import { toStore } from 'educoder';
+import { toStore, CNotificationHOC } from 'educoder';
import UserInfo from '../components/userInfo';
// import RightPane from './rightpane/index';
import actions from '../../../redux/actions';
-import {ModalConfirm} from '../../../common/components/ModalConfirm';
+// import {ModalConfirm} from '../../../common/components/ModalConfirm';
const NewOrEditTask = (props) => {
const {
@@ -69,10 +69,13 @@ const NewOrEditTask = (props) => {
// 模拟挑战
const imitationChallenge = () => {
+ // 调用 start 接口, 成功后跳转到模拟页面
+ startProgramQuestion(identifier, props);
}
// 开始挑战
const startChallenge = () => {
- // 调用 start 接口, 成功后跳转到模拟页面
+ // 调用 start 接口, 成功后跳转到开启实战
+ // TODO
startProgramQuestion(identifier, props);
}
@@ -82,27 +85,38 @@ const NewOrEditTask = (props) => {
props.clearOJFormStore();
// 清空描述信息
toStore('oj_description', '');
- setInterval(function () {
- props.history.push('/problems');
- }, 500);
+ props.history.push('/problems');
}
// 发布
const handleClickPublish = () => {
- ModalConfirm('提示', (
- {/*
);
diff --git a/public/react/src/modules/developer/studentStudy/leftpane/index.scss b/public/react/src/modules/developer/studentStudy/leftpane/index.scss
index 9e6f019f6..1582c033f 100644
--- a/public/react/src/modules/developer/studentStudy/leftpane/index.scss
+++ b/public/react/src/modules/developer/studentStudy/leftpane/index.scss
@@ -13,6 +13,8 @@
bottom: 0px;
height: 56px;
width: 100%;
+ box-sizing: border-box;
+ border-top: 1px solid rgba(244,244,244,1);
// background: pink;
padding: 0 30px;
// background-color: rgba(250,250,250,1);
@@ -79,4 +81,9 @@
margin-right: 5px;
}
}
+}
+
+.add_editor_list_area{
+ box-sizing: border-box;
+ border-bottom: 1px solid rgba(244,244,244,1);
}
\ No newline at end of file
diff --git a/public/react/src/modules/developer/studentStudy/leftpane/taskDescription/index.js b/public/react/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
index 28fe51765..981770b8c 100644
--- a/public/react/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
+++ b/public/react/src/modules/developer/studentStudy/leftpane/taskDescription/index.js
@@ -4,14 +4,15 @@
* @Github:
* @Date: 2019-11-27 09:49:30
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-09 19:21:55
+ * @LastEditTime: 2019-12-19 09:22:52
*/
import '../index.scss';
import React from 'react';
import { Tag } from 'antd';
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
-import QuillEditor from '../../../quillEditor';
+import QuillForEditor from '../../../../../common/quillForEditor';
+
import CONST from '../../../../../constants';
const {tagBackground, diffText} = CONST;
@@ -36,22 +37,15 @@ const TaskDescription = (props) => {
+ :record.id===2?
+
+ :record.id===3?
+
+ :record.id
+ }
+
+ )
+ },
+ {
+ title: '姓名',
+ dataIndex: 'name',
+ key: 'name',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth105",
+ width:'100px',
+ render: (text, record) => (
+ {
+ record.name
+ }
+
+ )
+ },
+ {
+ title: '学号',
+ dataIndex: 'studentid',
+ key: 'studentid',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth175",
+ render: (text, record) => (
+
+ {
+ record.student_id
+ }
+
+ ),
+ },
+ {
+ title: '完成实训',
+ key: 'training',
+ dataIndex: 'training',
+ align: 'center',
+ className: "edu-txt-center font-14 maxnamewidth255",
+ render: (text, record) => (
+
+ {
+ record.shixun_count
+ }
+
+ )
+ },
+ {
+ title: '在学实训',
+ dataIndex: 'learning',
+ key: 'learning',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.study_shixun_count
+ }
+
+ )
+
+ },
+ {
+ title: '金币',
+ dataIndex: 'goldcoin',
+ key: 'goldcoin',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.grade
+ }
+
+ ),
+ },
+ {
+ title: '经验值',
+ dataIndex: 'empirical',
+ key: 'empirical',
+ align: 'center',
+ className: "edu-txt-center font-14",
+ render: (text, record) => (
+
+ {
+ record.experience
+ }
+
+ )
+ },
+ ],
+ school:"",
+ teachers_count:null,
+ students_count:null,
+ courses_count:null,
+ shixuns_count:null,
+ shixun_report_count:null,
+ shixun_time:null,
+ courses:null,
+ course_count:0,
+ pages:1,
+ limits:10,
+ teachers:null,
+ teacher_count:0,
+ students:null,
+ student_count:0,
+ shixun_chart_data:null,
+ shixun_chart_datanames:null,
+ studentionsnames:null,
+ studentionsvalues:null
+ }
+
+ }
+
+
+ componentDidMount(){
+ console.log("College");
+ console.log(this.props.match.params.id);
+ this.gettop();
+ this.Numberofinternshipreports();
+ this.Actualcombattimeoftrainees();
+ this.Classnumber(1,10);
+ this.Teacherranking(1,10);
+ this.Studentranking(1,10);
+ this.Onlinetraining();
+ this.Hottest();
+ }
+ //头部
+ gettop=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/statistics.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ }else{
+ this.setState({
+ teachers_count:response.data.teachers_count,
+ students_count:response.data.students_count,
+ courses_count:response.data.courses_count,
+ shixuns_count:response.data.shixuns_count,
+ school:response.data.school,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ teachers_count:0,
+ students_count:0,
+ courses_count:0,
+ shixuns_count:0,
+ school:"",
+ })
+ });
+ }
+
+ //获取实训报告数
+ Numberofinternshipreports=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/shixun_report_count.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ shixun_report_count:0,
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ shixun_report_count:0,
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ shixun_report_count:0,
+ })
+ return
+ }
+ this.setState({
+ shixun_report_count:response.data.shixun_report_count,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ shixun_report_count:0,
+ })
+ });
+ }
+
+ //学员实战时间
+ Actualcombattimeoftrainees=()=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/shixun_time.json`;
+ axios.get(url).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ shixun_time:0,
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ shixun_time:0,
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ shixun_time:0,
+ })
+ return
+ }
+ this.setState({
+ shixun_time:response.data.shixun_time,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ this.setState({
+ shixun_time:0,
+ })
+ });
+ }
+
+ //课堂信息
+ Classnumber=(page,per_page)=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/course_statistics.json`;
+ this.setState({
+ coursesloading:true
+ })
+ axios.get(url,{params:{
+ page:page,
+ per_page:per_page,
+ }
+ }).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ courses:[],
+ course_count:0
+ })
+ return
+ }
+ this.setState({
+ courses:response.data.courses,
+ course_count:response.data.course_count,
+ page:page,
+ limit:per_page
+ })
+ }
+ this.setState({
+ coursesloading:false
+ })
+ }).catch((error) => {
+ this.setState({
+ courses:[],
+ course_count:0,
+ coursesloading:false
+ })
+ });
+ }
+
+ //教师排名
+ Teacherranking=(page,per_page)=>{
+ const id =this.props.match.params.id;
+ const url=`/colleges/${id}/teachers.json`;
+ this.setState({
+ teachersloading:true
+ })
+ axios.get(url,{params:{
+ page:page,
+ per_page:per_page,
+ }
+ }).then((response) => {
+ if(response===null||response===undefined){
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ return
+ }
+ if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ }else{
+ if (response.data.status === -1){
+ this.setState({
+ teachers:[],
+ teacher_count:0
+ })
+ return
+ }
+ let teachers=[];
+ if(response.data.teachers){
+ for(let i=0;i
+
+ )
+ }
+}
+export default SnackbarHOC() (TPMIndexHOC ( College ));
+
+
diff --git a/public/react/src/college/colleagechart/Colleagechart.js b/public/react/src/college/colleagechart/Colleagechart.js
new file mode 100644
index 000000000..fca01280a
--- /dev/null
+++ b/public/react/src/college/colleagechart/Colleagechart.js
@@ -0,0 +1,84 @@
+import React, {Component} from "react";
+import {WordsBtn} from 'educoder';
+import {Table} from "antd";
+import {Link,Switch,Route,Redirect} from 'react-router-dom';
+const echarts = require('echarts');
+
+
+
+function startechart(data,datanane){
+ var effChart = echarts.init(document.getElementById('shixun_skill_chart'));
+
+ var option = {
+
+ tooltip : {
+ trigger: 'item',
+ formatter: "{d}%
+
+
+
+ {school}
+
+
+
+ {/*//教师1*/}
+
+
+
+ 教师
+
+
+ {teachers_count?teachers_count:0}
+
+
+
+
+
+ 学生
+
+
+ {students_count?students_count:0}
+
+
+
+
+
+ 课堂
+
+
+ {courses_count?courses_count:0}
+
+
+
+ {/*//教师2*/}
+
+
+
+
+
+ 共建实训
+
+
+ {shixuns_count?shixuns_count:0}
+
+
+
+
+
+ + 基本使用情况 +
+ {/*基本使用情况1*/} +
+
+
+
+ {/*基本使用情况2*/}
+ + 教师 +
++ 学生 +
++ 课堂 +
++ 共建实训 +
++ 实习报告 +
++ 学员实战时间 +
+
+
+ {/*基本使用情况3结束*/}
+
+ {
+ teachers_count?
+
+ {teachers_count}人
+ :
+
+ {
+ students_count?
+
+ {students_count}人
+ :
+
+ {
+ courses_count?
+
+ {courses_count}个
+ :
+
+ {
+ shixuns_count?
+
+ {shixuns_count}个
+ :
+
+ {
+ shixun_report_count?
+
+ {shixun_report_count}个
+ :
+
+ {
+ shixun_time?
+
+ {shixun_time}天
+ :
+
+
+
+
+ :
+
+
+
+ + 课堂 +
+ { + courses===null? +
+
+
+ :
+ JSON.stringify(courses) === "[]" ?
+
+
+ }
+
+
+
+
+
+ {
+ course_count>=11?
+
+ {courses === undefined ? "" :
}
+
+
+
+ :""
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :
+
+
+ + 教师排名 +
+ { + teachers===null? +
+
+
+ :
+ JSON.stringify(teachers) === "[]" ?
+
+
+
+ }
+
+
+
+ {/*
+ {teachers === undefined ? "" :
}
+
+ */}
+ {/*
*/}
+ */}
+ {/*
*/}
+
+ {/*
+
+
+
+ :
+
+
+
+ }
+
+
+ + 在线实训情况 +
+ { + shixun_chart_data===null? +
+
+
+ :
+ JSON.stringify(shixun_chart_data) === "[]" ?
+
+
+
+
+
+
+ :
+
+
+ + 学生排名 +
+ { + students === null ? +
+
+
+ :
+ JSON.stringify(students) === "[]" ?
+
+
+
+ }
+ {/*
+ {students === undefined ? "" :
}
+
+ */}
+ {/*
*/}
+
+
+ */}
+ {/*
*/}
+
+ {/*
+
+
+
+
+
+
+ :
+
+
+
+ }
+
+
+
+ + 最热评测 +
+ { + studentionsnames===null? +
+
+
+ :
+ JSON.stringify(studentionsnames) === "[]" ?
+ " + }, + legend: { + // orient: 'vertical', + // top: 'middle', + bottom: 50, + left: 'center', + data: datanane + }, + series : [ + { + type: 'pie', + radius : '65%', + center: ['50%', '35%'], + selectedMode: 'single', + data:data, + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } + ] + }; + effChart.setOption(option); +} +class Colleagechart extends Component { + + constructor(props) { + super(props); + this.state = { + } + } + + componentDidMount() { + startechart(this.props.data,this.props.datanane) + } + + + componentDidUpdate = (prevProps) => { + if (prevProps.data!= this.props.data) { + startechart(this.props.data,this.props.datanane) + } + } + + + render() { + let {data}=this.props; + + return ( +
+
+
+
+ )
+ }
+}
+
+export default Colleagechart;
diff --git a/public/react/src/college/colleagechart/Colleagechartzu.js b/public/react/src/college/colleagechart/Colleagechartzu.js
new file mode 100644
index 000000000..5c0269700
--- /dev/null
+++ b/public/react/src/college/colleagechart/Colleagechartzu.js
@@ -0,0 +1,149 @@
+import React, {Component} from "react";
+import {WordsBtn} from 'educoder';
+import {Table} from "antd";
+import {Link,Switch,Route,Redirect} from 'react-router-dom';
+const echarts = require('echarts');
+
+
+
+function startechart(names, values){
+ var effChart = echarts.init(document.getElementById('shixun_skill_charts'));
+
+ var Color = ['#962e66', '#623363', '#CCCCCC', '#9A9A9A', '#FF8080', '#FF80C2', '#B980FF', '#80B9FF', '#6FE9FF', '#4DE8B4', '#F8EF63', '#FFB967'];
+
+ var option = {
+ backgroundColor: '#fff',
+ grid: {
+ left: '3%',
+ right: '8%',
+ bottom: '15%',
+ containLabel: true
+ },
+
+ tooltip: {
+ show: "true",
+ trigger: 'item',
+ formatter: '{c0}',
+ backgroundColor: 'rgba(0,0,0,0.7)', // 背景
+ padding: [8, 10], //内边距
+ extraCssText: 'box-shadow: 0 0 3px rgba(255, 255, 255, 0.4);', //添加阴影
+ axisPointer: { // 坐标轴指示器，坐标轴触发有效
+ type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+ }
+ },
+ xAxis: {
+ type: 'value',
+ axisTick: {
+ show: false
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: '#CCCCCC'
+ }
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: '#CCCCCC'
+ }
+ },
+ axisLabel: {
+ textStyle: {
+ color: '#656565',
+ fontWeight: 'normal',
+ fontSize: '12'
+ },
+ formatter: '{value}'
+ }
+ },
+ yAxis: {
+ type: 'category',
+ axisLine: {
+ lineStyle: {
+ color: '#cccccc'
+ }
+ },
+ splitLine: {
+ show: false
+ },
+ axisTick: {
+ show: false
+ },
+ splitArea: {
+ show: false
+ },
+ axisLabel: {
+ inside: false,
+ textStyle: {
+ color: '#656565',
+ fontWeight: 'normal',
+ fontSize: '12'
+ }
+ },
+ data: names
+ },
+ series: [{
+ name: '',
+ type: 'bar',
+ itemStyle: {
+ normal: {
+ show: true,
+ color: function(params) {
+ return Color[params.dataIndex]
+ },
+ barBorderRadius: 50,
+ borderWidth: 0,
+ borderColor: '#333'
+ }
+ },
+ barGap: '0%',
+ barCategoryGap: '50%',
+ data: values
+ }
+
+ ]
+ };
+ effChart.setOption(option);
+}
+class Colleagechartzu extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state = {
+ }
+ }
+
+ componentDidMount() {
+ startechart(this.props.data,this.props.datavule)
+ }
+
+
+ componentDidUpdate = (prevProps) => {
+ if (prevProps.data!= this.props.data) {
+ startechart(this.props.data,this.props.datavule)
+ }
+ }
+
+
+ render() {
+ let {data}=this.props;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
+
+export default Colleagechartzu;
diff --git a/public/react/src/college/colleagecss/colleage.css b/public/react/src/college/colleagecss/colleage.css
new file mode 100644
index 000000000..801b86603
--- /dev/null
+++ b/public/react/src/college/colleagecss/colleage.css
@@ -0,0 +1,213 @@
+.yslstatistic-header {
+ width: 100%;
+ height: 240px;
+ background-image: url('/images/educoder/statistics.jpg');
+ background-size: 100% 100%;
+}
+.yslborder{
+ border: 1px solid;
+}
+.yslstatistic-header-title{
+ flex: 1;
+ display: flex;
+ align-items: center;
+ color: #4CACFF;
+ font-size: 32px;
+}
+.yslstatistic-header-content{
+ width: 100%;
+ display: flex;
+ justify-content: space-around;
+}
+.yslstatistic-header-item{
+ margin-bottom: 22px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ color: #fff;
+}
+.yslstatistic-header-item-label{
+ color: #989898;
+}
+
+.yslstatistic-base-item-label{
+ width: 217px;
+ text-align: center;
+ font-size: 16px;
+ height: 48px;
+ line-height: 48px;
+ color: #686868;
+ background: #F5F5F5;
+ border-top: 1px solid #EBEBEB;
+}
+.yslstatistic-base-item-labels{
+ width: 217px;
+ text-align: center;
+ height: 100px;
+ line-height: 100px;
+ background: #ffffff;
+ border-top: 1px solid #EBEBEB;
+ border-bottom: 1px solid #EBEBEB;
+}
+.yslstatistic-base-item-labelsp{
+ color: #000000;
+ font-size: 24px;
+}
+.yslstatistic-base-item-labelsspan{
+ color: #000000;
+ margin-left: 5px;
+ font-size: 16px;
+}
+.jibenshiyong100{
+ width: 100%;
+}
+
+.yslstatistic-header-item-content{
+ font-size: 24px;
+}
+/* 中间居中 */
+.intermediatecenter{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+/* 简单居中 */
+.intermediatecenterysls{
+ display: flex;
+ align-items: center;
+}
+.spacearound{
+ display: flex;
+ justify-content: space-around;
+
+}
+.spacebetween{
+ display: flex;
+ justify-content: space-between;
+}
+/* 头顶部居中 */
+.topcenter{
+ display: -webkit-flex;
+ flex-direction: column;
+ align-items: center;
+
+}
+
+
+/* x轴正方向排序 */
+/* 一 二 三 四 五 六 七 八 */
+.sortinxdirection{
+ display: flex;
+ flex-direction:row;
+}
+/* x轴反方向排序 */
+/* 八 七 六 五 四 三 二 一 */
+.xaxisreverseorder{
+ display: flex;
+ flex-direction:row-reverse;
+}
+/* 垂直布局 正方向*/
+/* 一
+ 二
+ 三
+ 四
+ 五
+ 六
+ 七
+ 八 */
+.verticallayout{
+ display: flex;
+ flex-direction:column;
+}
+/* 垂直布局 反方向*/
+.reversedirection{
+ display: flex;
+ flex-direction:column-reverse;
+}
+
+.h4{
+ font-size: 1.5rem;
+ font-weight: 500 !important;
+}
+.ysllinjibenshiyong{
+ font-weight: 500;
+ line-height: 1.2;
+ padding: 2rem 1.25rem;
+ border-bottom: unset;
+ background:#fff;
+}
+.linjibenshiyong{
+ font-weight: 500;
+ line-height: 1.2;
+ padding: 2rem 1.25rem;
+ border-bottom: unset;
+ background:#fff;
+ box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
+ border-radius:2px;
+}
+.yslslinjibenshiyong{
+ font-weight: 500;
+ line-height: 1.2;
+ border-bottom: unset;
+ box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
+ border-radius:2px;
+}
+.yinyin{
+ background: #fff;
+ box-shadow:0px 6px 12px 0px rgba(0,0,0,0.1);
+ border-radius:2px;
+}
+.edu-back-eeee{
+ background:#EEEEEE !important;
+}
+.mt-4{
+ margin-top: 1.5rem !important;
+}
+
+.statistic-label{
+ padding: 2rem 1.25rem;
+ font-size: 1.5rem;
+ font-weight: 400 !important;
+}
+.mb50{
+ padding-bottom: 50px !important;
+}
+.mt40{
+ margin-top: 40px;
+}
+.mb80{
+ margin-bottom: 80px;
+}
+.task-hide{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a:hover{
+ color:#0056b3;
+}
+.color-blue{
+ color: #4CACFF;
+}
+
+.color-huang{
+ color:#ffc107 !important
+}
+.maxnamewidth105{
+ max-width: 105px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
+.maxnamewidth247{
+ max-width: 247px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
+.maxnamewidth340{
+ max-width: 340px;
+ overflow:hidden;
+ text-overflow:ellipsis;
+ white-space:nowrap;
+ cursor: default;
+}
diff --git a/public/react/src/common/components/comment/CommentForm.js b/public/react/src/common/components/comment/CommentForm.js
new file mode 100644
index 000000000..73e36cff9
--- /dev/null
+++ b/public/react/src/common/components/comment/CommentForm.js
@@ -0,0 +1,116 @@
+/*
+ * @Description: 评论表单
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-17 17:32:55
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-18 17:51:44
+ */
+import React, { useState } from 'react';
+import { Form, Button, Input } from 'antd';
+import QuillForEditor from '../../quillForEditor';
+import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
+const FormItem = Form.Item;
+
+function CommentForm (props) {
+
+ const {
+ commentCtxChagne,
+ onCancel,
+ onSubmit,
+ form
+ } = props;
+
+ const { getFieldDecorator } = form;
+ const [ctx, setCtx] = useState('');
+
+ const options = [
+ ['bold', 'italic', 'underline'],
+ [{header: [1,2,3,false]}],
+ ['blockquote', 'code-block'],
+ ['link', 'image'],
+ ['formula']
+ ];
+ // const { form: { getFieldDecorator } } = props;
+ const [showQuill, setShowQuill] = useState(false);
+ // 点击输入框
+ const handleInputClick = () => {
+ setShowQuill(true);
+ }
+ // 取消
+ const handleCancle = () => {
+ setShowQuill(false);
+ onCancel && onCancel();
+ }
+
+ // 编辑器内容变化时
+ const handleContentChange = (content) => {
+ setCtx(content);
+ try {
+ const _html = new QuillDeltaToHtmlConverter(content.ops, {}).convert();
+ // props.form.setFieldsValue({'comment': _html.replace(/<\/?[^>]*>/g, '')});
+ props.form.setFieldsValue({'comment': _html});
+ } catch (error) {
+ console.log(error);
+ }
+ }
+ // 发送
+ const handleSubmit = (e) => {
+ e.preventDefault();
+ props.form.validateFields((err, values) => {
+ if (!err) {
+ setShowQuill(false);
+ const content = ctx;
+ props.form.setFieldsValue({'comment': ''});
+ setCtx('');
+ console.log(content);
+ onSubmit && onSubmit(content);
+ }
+ });
+ }
+ return (
+
+ );
+}
+
+export default Form.create()(CommentForm);
diff --git a/public/react/src/common/components/comment/CommentIcon.js b/public/react/src/common/components/comment/CommentIcon.js
new file mode 100644
index 000000000..5440e2579
--- /dev/null
+++ b/public/react/src/common/components/comment/CommentIcon.js
@@ -0,0 +1,32 @@
+/*
+ * @Description:
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-18 10:49:46
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-18 11:39:23
+ */
+import './index.scss';
+import React from 'react';
+import { Icon } from 'antd';
+function CommentIcon ({
+ type, // 图标类型
+ count, // 评论数
+ iconClick,
+ ...props
+}) {
+
+ // 点击图标
+ const handleSpanClick = () => {
+ iconClick && iconClick();
+ }
+
+ return (
+
+
+
+
+
+
+
+ 确定要删除该条回复吗?
), + onOk () { + console.log('点击了删除'); + } + }); + // ModalConfirm('提示', (确定要删除该条回复吗?
), () => { + // console.log('点击了删除'); + // }); + } + + // 评论头像 + const commentAvatar = (url) => ( +
+ );
+
+ // 评论信息
+ const commentInfo = () => (
+
+ 用户名
+ {moment(new Date(), 'YYYYMMDD HHmmss').fromNow()}
+
+ 这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容这是评论内容 +
+ ); + + // 加载更多 + const handleOnLoadMore = () => { + if (!arrow) { + // 展开所有 + } else { + // 收起 + } + setArrow(!arrow); + }; + + // 评论追加内容 + const commentAppend = () => { + + return ( +-
+
-
+ {commentAvatar()}
+ + {commentInfo()} + {commentCtx()} ++
+
-
+ {commentAvatar()}
+ + {commentInfo()} + {commentCtx()} ++
+
-
+ {commentAvatar()}
+ + {commentInfo()} + {commentCtx()} ++
+
+
-
+
展开其余23条评论
++
++
+
+ {commentInfo()}
+ {commentCtx()}
+
+ {commentAppend()}
+
+
+
+
+ {/* 回复 */}
+
+
+
+
+ -
+
+
+
+ );
+}
+
+export default QuillForEditor;
diff --git a/public/react/src/common/reactQuill/ImageBlot.js b/public/react/src/common/reactQuill/ImageBlot.js
new file mode 100644
index 000000000..091bd2c1f
--- /dev/null
+++ b/public/react/src/common/reactQuill/ImageBlot.js
@@ -0,0 +1,54 @@
+/*
+ * @Description: 重写图片
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-16 15:50:45
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-17 16:44:48
+ */
+import Quill from "quill";
+
+const BlockEmbed = Quill.import('blots/block/embed');
+
+export default class ImageBlot extends BlockEmbed {
+
+ static create(value) {
+
+ const node = super.create();
+
+ node.setAttribute('alt', value.alt);
+ node.setAttribute('src', value.url);
+
+ if (value.width) {
+ node.setAttribute('width', value.width);
+ }
+ if (value.height) {
+ node.setAttribute('height', value.height);
+ }
+ // 宽度和高度都不存在时，
+ if (!value.width && !value.height) {
+ node.setAttribute('display', 'block');
+ node.setAttribute('width', '100%');
+ }
+ // 给图片添加点击事件
+ node.onclick = () => {
+ value.onClick && value.onClick(value.url);
+ }
+ return node;
+ }
+
+ static value (node) {
+
+ return {
+ alt: node.getAttribute('alt'),
+ url: node.getAttribute('src'),
+ onclick: node.onclick,
+ // width: node.width,
+ // height: node.height,
+ display: node.getAttribute('display')
+ };
+ }
+}
+
+ImageBlot.blotName = 'image';
+ImageBlot.tagName = 'img';
\ No newline at end of file
diff --git a/public/react/src/common/reactQuill/ReactQuill.js b/public/react/src/common/reactQuill/ReactQuill.js
new file mode 100644
index 000000000..1b4209409
--- /dev/null
+++ b/public/react/src/common/reactQuill/ReactQuill.js
@@ -0,0 +1,45 @@
+/*
+ * @Description:
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-09 09:09:42
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-18 08:46:20
+ */
+import 'quill/dist/quill.core.css'; // 核心样式
+import 'quill/dist/quill.snow.css'; // 有工具栏
+import 'quill/dist/quill.bubble.css'; // 无工具栏
+import 'katex/dist/katex.min.css'; // katex 表达式样式
+import React, { useState, useReducer, useEffect } from 'react';
+import useQuill from './useQuill';
+
+function ReactQuill ({
+ disallowColors, // 不可见时颜色
+ placeholder, // 提示信息
+ uploadImage, // 图片上传
+ onChange, // 内容变化时
+ options, // 配置信息
+ value, // 显示的内容
+ style,
+ showUploadImage // 显示上传图片
+}) {
+
+ const [element, setElement] = useState(); // quill 渲染节点
+
+ useQuill({
+ disallowColors,
+ placeholder,
+ uploadImage,
+ onChange,
+ options,
+ value,
+ showUploadImage,
+ element
+ });
+
+ return (
+
+ );
+}
+
+export default ReactQuill;
diff --git a/public/react/src/common/reactQuill/deepEqual.js b/public/react/src/common/reactQuill/deepEqual.js
new file mode 100644
index 000000000..6f2b276bf
--- /dev/null
+++ b/public/react/src/common/reactQuill/deepEqual.js
@@ -0,0 +1,47 @@
+function deepEqual (prev, current) {
+ if (prev === current) { // 基本类型比较，值，类型都相同 或者同为 null or undefined
+ return true;
+ }
+
+ if ((!prev && current)
+ || (prev && !current)
+ || (!prev && !current)
+ ) {
+ return false;
+ }
+
+ if (Array.isArray(prev)) {
+ if (!Array.isArray(current)) return false;
+ if (prev.length !== current.length) return false;
+
+ for (let i = 0; i < prev.length; i++) {
+ if (!deepEqual(current[i], prev[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ if (typeof current === 'object') {
+ if (typeof prev !== 'object') return false;
+ const prevKeys = Object.keys(prev);
+ const curKeys = Object.keys(current);
+
+ if (prevKeys.length !== curKeys.length) return false;
+
+ prevKeys.sort();
+ curKeys.sort();
+
+ for (let i = 0; i < prevKeys.length; i++) {
+ if (prevKeys[i] !== curKeys[i]) return false;
+ const key = prevKeys[i];
+ if (!deepEqual(prev[key], current[key])) return false;
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
+export default deepEqual;
diff --git a/public/react/src/common/reactQuill/flatten.js b/public/react/src/common/reactQuill/flatten.js
new file mode 100644
index 000000000..237cb543f
--- /dev/null
+++ b/public/react/src/common/reactQuill/flatten.js
@@ -0,0 +1,26 @@
+/*
+ * @Description: 将多维数组转变成一维数组
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-09 09:35:01
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-16 11:36:22
+ */
+function flatten (array) {
+ return flatten.rec(array, []);
+}
+
+flatten.rec = function flatten (array, result) {
+
+ for (let item of array) {
+ if (Array.isArray(item)) {
+ flatten(item, result);
+ } else {
+ result.push(item);
+ }
+ }
+
+ return result;
+}
+
+export default flatten;
diff --git a/public/react/src/common/reactQuill/index.js b/public/react/src/common/reactQuill/index.js
new file mode 100644
index 000000000..56a1a8d1f
--- /dev/null
+++ b/public/react/src/common/reactQuill/index.js
@@ -0,0 +1,108 @@
+/*
+ * @Description: 入口文件
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-17 10:41:48
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-17 20:34:40
+ */
+import React, { useState, useCallback, useEffect } from 'react';
+import ReactQuill from './lib';
+
+function Wrapper (props) {
+ // 默认工具栏配置项
+ const toolbarConfig = [
+ ['bold', 'italic', 'underline'],
+ [{align: []}, {list: 'ordered'}, {list: 'bullet'}], // 列表
+ [{script: 'sub'}, {script: 'super'}],
+ [{header: [1,2,3,4,5,false]}],
+ ['blockquote', 'code-block'],
+ ['link', 'image', 'video'],
+ ['formula'],
+ ['clean']
+ ];
+
+ const [placeholder] = useState(props.placeholder || 'placeholder');
+ const [disableBold] = useState(false);
+ const [value, setValue] = useState(props.value || '');
+ const [toolbar, setToolbar] = useState(toolbarConfig);
+ const [theme, setTheme] = useState(props.theme || 'snow');
+ const [readOnly] = useState(props.readOnly || false);
+
+ const {
+ onContentChagne, // 当编辑器内容变化时调用该函数
+ showUploadImage, // 显示上传图片, 返回url，主要用于点击图片放大
+ } = props;
+
+ // 配置信息
+ const options = {
+ modules: {
+ toolbar: toolbar,
+ clipboard: {
+ matchVisual: false
+ }
+ },
+ readOnly: readOnly,
+ theme: theme
+ }
+ // 配置信息
+ useEffect (() => {
+ if (props.options) {
+ setToolbar(props.options);
+ }
+ setTheme(props.theme || 'snow');
+ setValue(props.value);
+ }, [props]);
+
+ // 当内容变化时
+ const handleOnChange = useCallback(
+ contents => {
+ if (disableBold) {
+ setValue({
+ ops: contents.ops.map(x => {
+ x = {...x};
+ if (x && x.attributes && x.attributes.bold) {
+ x.attributes = { ...x.attributes };
+ delete x.attributes.bold;
+ if (!Object.keys(x.attributes).length) {
+ delete x.attributes;
+ }
+ }
+ return x;
+ })
+ });
+ } else {
+ setValue(contents);
+ }
+ onContentChagne && onContentChagne(contents);
+ }, [disableBold]
+ );
+
+ // 图片上传
+ const handleUploadImage = (files) => {
+ console.log('选择的图片信息', files);
+ }
+
+ // 显示图片
+ const handleShowUploadImage = (url) => {
+ // console.log('上传的图片url:', url);
+ showUploadImage && showUploadImage(url);
+ }
+
+ return (
+
+ handleShowUploadImage(url)}
+ />
+
+ );
+}
+
+export default Wrapper;
+// ReactDOM.render(
@@ -131,19 +136,20 @@ const ControlSetting = (props) => {
const mapStateToProps = (state) => {
const {commonReducer, ojForUserReducer} = state;
- const {loading, excuteState, submitLoading } = commonReducer;
+ const {loading, excuteState, submitLoading, showOrHideControl } = commonReducer;
const { commitRecordDetail } = ojForUserReducer;
return {
loading,
submitLoading,
excuteState,
+ showOrHideControl,
// identifier: user_program_identifier,
commitRecordDetail // 提交详情
};
};
// changeSubmitLoadingStatus
const mapDispatchToProps = (dispatch) => ({
- showOrHideControl: (flag) => dispatch(actions.showOrHideControl(flag)),
+ changeShowOrHideControl: (flag) => dispatch(actions.changeShowOrHideControl(flag)),
changeLoadingState: (flag) => dispatch(actions.changeLoadingState(flag)),
changeSubmitLoadingStatus: (flag) => dispatch(actions.changeSubmitLoadingStatus(flag)),
debuggerCode: (identifier, values) => dispatch(actions.debuggerCode(identifier, values)),
diff --git a/public/react/src/modules/developer/components/controlSetting/index.scss b/public/react/src/modules/developer/components/controlSetting/index.scss
index 97838ce5c..31beda8a5 100644
--- a/public/react/src/modules/developer/components/controlSetting/index.scss
+++ b/public/react/src/modules/developer/components/controlSetting/index.scss
@@ -2,7 +2,8 @@
position: absolute;
bottom: 0;
width: 100%;
- background:rgba(30,30,30,1);
+ // background: red;
+ // background:rgba(30,30,30,1);
// height: 56px;
.control_tab{
position: absolute;
@@ -52,8 +53,8 @@
height: 56px;
padding-right: 30px;
padding-left: 10px;
- // background: #000;
- background:rgba(48,48,48,1);
+ background: rgba(18,28,36,1);
+ // background:rgba(48,48,48,1);
}
.setting_drawer{
diff --git a/public/react/src/modules/developer/components/execResult/index.js b/public/react/src/modules/developer/components/execResult/index.js
index 32bbbee91..6f9341b9a 100644
--- a/public/react/src/modules/developer/components/execResult/index.js
+++ b/public/react/src/modules/developer/components/execResult/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-28 08:44:54
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-10 09:24:02
+ * @LastEditTime: 2019-12-19 10:44:16
*/
import './index.scss';
import React, { useState, useEffect } from 'react';
@@ -38,6 +38,15 @@ function ExecResult (props) {
);
+
+ const renderError = () => (
+
+ Loading Katex...
+
+ `
+ }
+ // 清空内容
+ element.innerHTML = '';
+ console.log(element);
+ // 创建 quill 节点
+ const quillNode = document.createElement('div');
+ element.appendChild(quillNode); // 将quill节点追回到 element 元素中
+
+ const quill = new Quill(element, options);
+ setQuill(quill);
+ // 加载上传图片功能
+ if (typeof uploadImage === 'function') {
+ quill.getModule('toolbar').addHandler('image', (e) => {
+ // 创建type类型输入框加载本地图片
+ const input = document.createElement('input');
+ input.setAttribute('type', 'file');
+ input.setAttribute('accept', 'image/*');
+ input.click();
+
+ input.onchange = async (e) => {
+ const file = input.files[0]; // 获取文件信息
+ const formData = new FormData();
+ formData.append('file', file);
+
+ // const reader = new FileReader();
+ // reader.readAsDataURL(file);
+ // console.log('文件信息===>>', reader);
+ // reader.onload = function (e) {
+ // debugger;
+ // console.log('文件信息===>>', e.target.result);
+ // const image = new Image();
+ // image.src = e.target.result;
+
+ // image.onload = function () {
+ // // file.width =
+ // console.log(image.width, image.height);
+ // }
+ // }
+
+ const range = quill.getSelection(true);
+ let fileUrl = ''; // 保存上传成功后图片的url
+ // 上传文件
+ const result = await fetchUploadImage(formData);
+ // 获取上传图片的url
+ if (result.data && result.data.id) {
+ fileUrl = getImageUrl(`api/attachments/${result.data.id}`);
+ }
+ // 根据id获取文件路径
+ const { width, height } = imgAttrs;
+ // console.log('上传图片的url:', fileUrl);
+ if (fileUrl) {
+ quill.insertEmbed(range.index, 'image', {
+ url: fileUrl,
+ alt: '',
+ onClick: showUploadImage,
+ width,
+ height
+ });
+ }
+ }
+ });
+ }
+
+ return () => {
+ element.innerHTML = '';
+ }
+ }, [
+ element,
+ options,
+ requireKatex,
+ katexLoaded,
+ ]);
+
+ return quill;
+}
+
+export default useMountQuill;
diff --git a/public/react/src/common/reactQuill/useQuill.js b/public/react/src/common/reactQuill/useQuill.js
new file mode 100644
index 000000000..b959dbc52
--- /dev/null
+++ b/public/react/src/common/reactQuill/useQuill.js
@@ -0,0 +1,60 @@
+/*
+ * @Description:
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-09 09:09:50
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-17 15:46:50
+ */
+import useQuillPlaceholder from './useQuillPlaceholder';
+import useQuillValueSync from './useQuillValueSync';
+import useQuillOnChange from './useQuillOnChange';
+import useMountQuill from './useMountQuill';
+import { useEffect } from 'react';
+
+function useQuill ({
+ disallowColors,
+ placeholder,
+ uploadImage,
+ onChange,
+ options,
+ value,
+ element,
+ showUploadImage
+}) {
+
+ // 获取 quill 实例
+ const quill = useMountQuill({
+ element,
+ options,
+ uploadImage,
+ showUploadImage
+ });
+
+ useEffect(() => {
+ if (disallowColors && quill) {
+ quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => {
+ delta.ops = delta.ops.map(op => {
+ if (op.attributes && op.attributes.color) {
+ const { color, ...attributes } = op.attributes;
+ return {
+ ...op,
+ attributes
+ }
+ }
+ return op;
+ });
+ return delta;
+ });
+ }
+ }, [
+ disallowColors,
+ quill
+ ]);
+
+ useQuillPlaceholder(quill, placeholder);
+ useQuillValueSync(quill, value);
+ useQuillOnChange(quill, onChange);
+}
+
+export default useQuill;
diff --git a/public/react/src/common/reactQuill/useQuillOnChange.js b/public/react/src/common/reactQuill/useQuillOnChange.js
new file mode 100644
index 000000000..45333a4e1
--- /dev/null
+++ b/public/react/src/common/reactQuill/useQuillOnChange.js
@@ -0,0 +1,33 @@
+/*
+ * @Description:
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-12 19:49:11
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-16 11:39:27
+ */
+import { useEffect } from 'react';
+
+function useQuillOnChange (quill, onChange) {
+
+ useEffect(() => {
+
+ if (!quill) return;
+ if (typeof onChange !== 'function') return;
+
+ let handler;
+
+ quill.on(
+ 'text-change',
+ (handler = () => {
+ onChange(quill.getContents()); // getContents: 检索编辑器内容
+ })
+ );
+
+ return () => {
+ quill.off('text-change', handler);
+ }
+ }, [quill, onChange]);
+}
+
+export default useQuillOnChange;
diff --git a/public/react/src/common/reactQuill/useQuillPlaceholder.js b/public/react/src/common/reactQuill/useQuillPlaceholder.js
new file mode 100644
index 000000000..ccc341568
--- /dev/null
+++ b/public/react/src/common/reactQuill/useQuillPlaceholder.js
@@ -0,0 +1,22 @@
+/*
+ * @Description:
+ * @Author: tangjiang
+ * @Github:
+ * @Date: 2019-12-09 09:28:34
+ * @LastEditors: tangjiang
+ * @LastEditTime: 2019-12-16 11:39:48
+ */
+import { useEffect } from 'react'
+
+function useQuillPlaceholder (
+ quill,
+ placeholder
+) {
+
+ useEffect(() => {
+ if (!quill || !quill.root) return;
+ quill.root.dataset.placeholder = placeholder;
+ }, [quill, placeholder]);
+}
+
+export default useQuillPlaceholder;
diff --git a/public/react/src/common/reactQuill/useQuillValueSync.js b/public/react/src/common/reactQuill/useQuillValueSync.js
new file mode 100644
index 000000000..696d88949
--- /dev/null
+++ b/public/react/src/common/reactQuill/useQuillValueSync.js
@@ -0,0 +1,31 @@
+import { useEffect, useState } from 'react'
+import deepEqual from './deepEqual.js'
+
+function useQuillValueSync(quill, value) {
+ const [selection, setSelection] = useState(null)
+
+ useEffect(() => {
+ if (!quill) return
+
+ const previous = quill.getContents()
+ const current = value
+
+ if (!deepEqual(previous, current)) {
+ setSelection(quill.getSelection())
+ if (typeof value === 'string') {
+ quill.clipboard.dangerouslyPasteHTML(value, 'api')
+ } else {
+ quill.setContents(value)
+ }
+ }
+ }, [quill, value, setSelection])
+
+ useEffect(() => {
+ if (quill && selection) {
+ quill.setSelection(selection)
+ setSelection(null)
+ }
+ }, [quill, selection, setSelection])
+}
+
+export default useQuillValueSync
diff --git a/public/react/src/modules/developer/DeveloperHome.js b/public/react/src/modules/developer/DeveloperHome.js
index 5f787659e..73a5c37a1 100644
--- a/public/react/src/modules/developer/DeveloperHome.js
+++ b/public/react/src/modules/developer/DeveloperHome.js
@@ -16,7 +16,7 @@ import MultipTags from './components/multiptags';
// import { Link } from 'react-router-dom';
import CONST from '../../constants';
import { withRouter } from 'react-router';
-import { toStore } from 'educoder';
+import { toStore, CNotificationHOC } from 'educoder';
// import MyIcon from '../../common/components/MyIcon';
const {tagBackground, diffText} = CONST;
@@ -249,17 +249,26 @@ class DeveloperHome extends React.PureComponent {
// 删除
handleClickDelete = (record) => {
const { deleteItem } = this.props;
- Modal.confirm({
- title: '删除',
+ this.props.confirm({
+ title: '提示',
content: `确定要删除${record.name}吗?`,
- okText: '确定',
- cancelText: '取消',
onOk () {
// 调用删除接口
console.log(record.identifier);
deleteItem(record.identifier);
}
});
+ // Modal.confirm({
+ // title: '删除',
+ // content: `确定要删除${record.name}吗?`,
+ // okText: '确定',
+ // cancelText: '取消',
+ // onOk () {
+ // // 调用删除接口
+ // console.log(record.identifier);
+ // deleteItem(record.identifier);
+ // }
+ // });
}
// table条件变化时
handleTableChange = (pagination, filters, sorter) => {
@@ -562,5 +571,5 @@ const mapDispatchToProps = (dispatch) => ({
export default withRouter(connect(
mapStateToProps,
mapDispatchToProps
-)(DeveloperHome));
+)(CNotificationHOC() (DeveloperHome)));
// export default DeveloperHome;
diff --git a/public/react/src/modules/developer/components/controlSetting/index.js b/public/react/src/modules/developer/components/controlSetting/index.js
index 587e1bee9..1d4d7834c 100644
--- a/public/react/src/modules/developer/components/controlSetting/index.js
+++ b/public/react/src/modules/developer/components/controlSetting/index.js
@@ -4,10 +4,10 @@
* @Github:
* @Date: 2019-11-27 16:02:36
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 17:32:33
+ * @LastEditTime: 2019-12-19 19:47:32
*/
import './index.scss';
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
import { Tabs, Button, Icon } from 'antd';
import { connect } from 'react-redux';
import InitTabCtx from '../initTabCtx';
@@ -23,14 +23,15 @@ const ControlSetting = (props) => {
submitLoading,
identifier,
excuteState,
+ showOrHideControl,
commitRecordDetail,
changeLoadingState,
changeSubmitLoadingStatus,
- showOrHideControl,
+ changeShowOrHideControl,
// debuggerCode,
// startDebuggerCode, // 外部存入
onDebuggerCode,
- updateCode,
+ // updateCode,
onSubmitForm
} = props;
const [defaultActiveKey, setDefaultActiveKey] = useState('1'); // 当前选中的tab
@@ -44,10 +45,14 @@ const ControlSetting = (props) => {
setDefaultActiveKey(key);
}
+ useEffect(() => {
+ setShowTextResult(props.showOrHideControl);
+ }, [props]);
+
// 显示/隐藏tab
const handleShowControl = () => {
setShowTextResult(!showTextResult);
- showOrHideControl(!showTextResult);
+ changeShowOrHideControl(!showTextResult);
}
// 调试代码
@@ -55,7 +60,7 @@ const ControlSetting = (props) => {
// console.log(formRef.current.handleTestCodeFormSubmit);
// 调出控制台界面
setShowTextResult(true);
- showOrHideControl(true);
+ changeShowOrHideControl(true);
formRef.current.handleTestCodeFormSubmit(() => {
setDefaultActiveKey('2');
});
@@ -84,7 +89,7 @@ const ControlSetting = (props) => {
+
+ 未知异常
+
+
+ )
+
const renderFinish = () => {
const {
error_line,
@@ -60,6 +69,7 @@ function ExecResult (props) {
)
}
+ // console.log('执行结果====》》》》', status);
const excuteCtx = (state) => {
if (state === 0) {
return (
@@ -118,6 +128,8 @@ function ExecResult (props) {
setRenderCtx(() => (readerLoaded));
} else if ('finish' === excuteState) {
setRenderCtx(() => (renderFinish));
+ } else if ('error' === excuteState) {
+ setRenderCtx(() => (renderError))
}
}, [excuteState]);
diff --git a/public/react/src/modules/developer/components/initTabCtx/index.js b/public/react/src/modules/developer/components/initTabCtx/index.js
index 3834a3e11..3e707daa1 100644
--- a/public/react/src/modules/developer/components/initTabCtx/index.js
+++ b/public/react/src/modules/developer/components/initTabCtx/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 19:46:14
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 17:38:42
+ * @LastEditTime: 2019-12-19 10:47:05
*/
import './index.scss';
import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
@@ -26,6 +26,7 @@ function InitTabCtx (props, ref) {
const { inputValue, onDebuggerCode } = props;
+ console.log('default value', inputValue);
useImperativeHandle(ref, () => ({
handleTestCodeFormSubmit: (cb) => {
// console.log('父组件调用我啦~~~~~~~~~');
@@ -33,6 +34,10 @@ function InitTabCtx (props, ref) {
}
}));
+ useEffect(() => {
+ console.log('初始值: ========', props);
+ }, [props]);
+
// 渲染文本提示信息
const renderText = () => (请在这里添加测试用例，点击“调试代码”时将从这里读取输入来测试你的代码...);
// 渲染表单信息
diff --git a/public/react/src/modules/developer/components/initTabCtx/index.scss b/public/react/src/modules/developer/components/initTabCtx/index.scss
index 449db1d2a..5427aa374 100644
--- a/public/react/src/modules/developer/components/initTabCtx/index.scss
+++ b/public/react/src/modules/developer/components/initTabCtx/index.scss
@@ -49,7 +49,8 @@
}
.input_textarea_style{
- background:rgba(30,30,30,1) !important;
+ // background:rgba(30,30,30,1) !important;
+ background:rgba(7,15,25,1) !important;
color: #fff;
border-color: transparent;
outline: none;
diff --git a/public/react/src/modules/developer/components/monacoSetting/index.js b/public/react/src/modules/developer/components/monacoSetting/index.js
index a101819e0..669439577 100644
--- a/public/react/src/modules/developer/components/monacoSetting/index.js
+++ b/public/react/src/modules/developer/components/monacoSetting/index.js
@@ -4,10 +4,11 @@
* @Github:
* @Date: 2019-11-25 17:50:33
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-06 16:51:48
+ * @LastEditTime: 2019-12-19 19:32:08
*/
import React, { useState } from 'react';
import { fromStore, toStore } from 'educoder';
+// import { Icon } from 'antd';
// import { Select } from 'antd';
// const { Option } = Select;
const SettingDrawer = (props) => {
diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js
index 60f54ee0a..948d5a4f5 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.js
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js
@@ -4,12 +4,12 @@
* @Github:
* @Date: 2019-11-27 15:02:52
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 16:16:56
+ * @LastEditTime: 2019-12-19 19:36:24
*/
import './index.scss';
import React, { useState, useRef, useEffect } from 'react';
-import { Drawer, Modal } from 'antd';
-import { fromStore } from 'educoder';
+import { Drawer, Modal, Icon, Badge } from 'antd';
+import { fromStore, CNotificationHOC } from 'educoder';
import { connect } from 'react-redux';
import MonacoEditor from '@monaco-editor/react';
import SettingDrawer from '../../components/monacoSetting';
@@ -19,16 +19,25 @@ import MyIcon from '../../../../common/components/MyIcon';
// import actions from '../../../../redux/actions';
const { fontSetting, opacitySetting } = CONST;
+const maps = {
+ 'c': 'main.c',
+ 'c++': 'main.cc',
+ 'java': 'main.java',
+ 'pythone': 'main.py'
+};
function MyMonacoEditor (props, ref) {
const {
+ notice,
language,
identifier,
+ hadCodeUpdate,
showOrHideControl,
// saveUserInputCode,
onCodeChange,
- onRestoreInitialCode
+ onRestoreInitialCode,
+ onUpdateNotice
} = props;
const [showDrawer, setShowDrawer] = useState(false); // 控制配置滑框
@@ -50,7 +59,7 @@ function MyMonacoEditor (props, ref) {
}, [props]);
useEffect(() => {
- setHeight(showOrHideControl ? 'calc(100% - 382px)' : 'calc(100% - 56px)');
+ setHeight(showOrHideControl ? 'calc(100% - 378px)' : 'calc(100% - 56px)');
}, [showOrHideControl]);
// 控制侧边栏设置的显示
@@ -93,28 +102,51 @@ function MyMonacoEditor (props, ref) {
// 恢复初始代码
const handleRestoreCode = () => {
- Modal.confirm({
+ props.confirm({
+ title: '提示',
content: '确定要恢复代码吗?',
- okText: '确定',
- cancelText: '取消',
onOk () {
onRestoreInitialCode && onRestoreInitialCode();
}
})
+ // Modal.confirm({
+ // content: '确定要恢复代码吗?',
+ // okText: '确定',
+ // cancelText: '取消',
+ // onOk () {
+ // onRestoreInitialCode && onRestoreInitialCode();
+ // }
+ // })
+ }
+
+ const handleUpdateNotice = () => {
+ if (props.notice) {
+ onUpdateNotice && onUpdateNotice();
+ }
}
const renderRestore = identifier ? (
{/* 未保存时 ? '学员初始代码文件' : main.x */}
- {identifier ? '' : '学员初始代码文件'}
- {identifier ? '已保存' : ''}
- {renderRestore}
- {/* */}
+ {identifier ? language ? maps[language.toLowerCase()] : '' : '学员初始代码文件'}
+ {identifier ? '已保存' : ''}
+
+
+ {renderRestore}
发布后即可应用到自己管理的课堂
是否确认发布?
发布后即可应用到自己管理的课堂
是否确认发布?
发布后即可应用到自己管理的课堂
是否确认发布?
是否确认撤销发布?
), () => { - changePublishLoadingStatus(true); - handleCancelPublish(props, identifier); + // ModalConfirm('提示', (是否确认撤销发布?
), () => { + // changePublishLoadingStatus(true); + // handleCancelPublish(props, identifier); + // }); + props.confirm({ + title: '提示', + content: ((是否确认撤销发布?
)), + onOk () { + changePublishLoadingStatus(true); + handleCancelPublish(props, identifier); + } }); - } // 取消保存/取消按钮 @@ -125,6 +139,7 @@ const NewOrEditTask = (props) => { const renderPubOrFight = () => { const pubButton = isPublish ? (
-
-
-
-
*/}
出题者: - {username} + {username}
-
- {/*
+ {this.props&&this.props.status>1?
{AccountProfiletype===true?简介
{this.props.identity < 5 && ChallengesDataList&&ChallengesDataList.shixun_status < 3 ?
-
+
{/*![]({getImageUrl("images/educoder/icon/edit.svg")})
*/}
编辑
- :""}
+ :""}
{this.props.user && this.props.user.main_site === true ?
this.props.identity < 5?实训制作指南 : "":""}
@@ -407,7 +419,7 @@ class Challenges extends Component {
{
`
#shixunchallengesid{
- max-height: 260px;
+ max-height: 300px;
overflow: hidden;
}
`
@@ -427,14 +439,22 @@ class Challenges extends Component {
- {this.state.opentitletype===true?this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+
+ {this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
阅读全文
:this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
收起全文
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index fcdbed408..e04ad17c9 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Link } from "react-router-dom";
-import { markdownToHTML, configShareForCustom} from 'educoder'
+import { markdownToHTML, configShareForCustom,getImageUrl} from 'educoder'
import { Divider, Tooltip } from 'antd';
import LoadingSpin from '../../../../common/LoadingSpin';
import 'antd/lib/pagination/style/index.css';
@@ -23,7 +23,8 @@ class Challengesjupyter extends Component {
booljupyterurls:false,
loading:false,
boxoffsetHeigh:0,
- opentitletype:true
+ opentitletype:true,
+ isopentitletype:"Less",
}
}
@@ -41,6 +42,11 @@ class Challengesjupyter extends Component {
ChallengesDataList: response.data,
sumidtype: false,
});
+ if(response.data.description=== ""||response.data.description===null||response.data.description===undefined){
+ this.setState({
+ isopentitletype:"Less",
+ })
+ }
}
}
}).catch((error) => {
@@ -55,13 +61,15 @@ class Challengesjupyter extends Component {
let box=document.getElementById("shixunchallengesid");
if(box){
boxoffsetHeigh=box.offsetHeight
- if(boxoffsetHeigh<260){
+ if(boxoffsetHeigh<300){
this.setState({
- opentitletype:false,
+ isopentitletype:"Less",
boxoffsetHeigh:boxoffsetHeigh
})
}else{
this.setState({
+ isopentitletype:"greater",
+ opentitletype:true,
boxoffsetHeigh:boxoffsetHeigh
})
}
@@ -219,17 +227,17 @@ class Challengesjupyter extends Component {
学习统计
- 已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关
+ 已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count===null?0:TPMRightSectionData&&TPMRightSectionData.complete_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关
diff --git a/public/react/src/modules/tpm/component/TPMright.css b/public/react/src/modules/tpm/component/TPMright.css
index a75160bf5..0d6b306fd 100644
--- a/public/react/src/modules/tpm/component/TPMright.css
+++ b/public/react/src/modules/tpm/component/TPMright.css
@@ -119,9 +119,14 @@
.padd252020px{
padding: 25px 20px 15px;
}
+
.rightjinengs{
height: 35px;
margin-top: 20px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
}
.borderbottomf4{
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 307823ee8..548e7224a 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -34,7 +34,8 @@ class Challenges extends Component {
operationstrue:false,
isSpin:false,
boxoffsetHeigh:0,
- opentitletype:true
+ opentitletype:true,
+ isopentitletype:"Less",
}
}
@@ -52,6 +53,13 @@ class Challenges extends Component {
ChallengesDataList: response.data,
sumidtype: false,
});
+
+ if(response.data.description=== ""||response.data.description===null||response.data.description===undefined){
+ this.setState({
+ isopentitletype:"Less",
+ })
+ }
+
}
}
}).catch((error) => {
@@ -71,17 +79,19 @@ class Challenges extends Component {
let box=document.getElementById("shixunchallengesid");
if(box){
boxoffsetHeigh=box.offsetHeight
- if(boxoffsetHeigh<260){
+ if(boxoffsetHeigh<300){
this.setState({
- opentitletype:false,
+ isopentitletype:"Less",
boxoffsetHeigh:boxoffsetHeigh
})
}else{
this.setState({
+ opentitletype:true,
+ isopentitletype:"greater",
boxoffsetHeigh:boxoffsetHeigh
})
}
-
+ console.log(boxoffsetHeigh)
}
}
@@ -322,7 +332,8 @@ class Challenges extends Component {
opentitle=()=>{
this.setState({
- opentitletype:!this.state.opentitletype
+ opentitletype:!this.state.opentitletype,
+
})
}
@@ -334,6 +345,7 @@ class Challenges extends Component {
}
let id = this.props.match.params.shixunId;
const antIcon = */}
编辑
- :""}
+ :""}
{this.props.user && this.props.user.main_site === true ?
this.props.identity < 5?实训制作指南 : "":""}
@@ -407,7 +419,7 @@ class Challenges extends Component {
{
`
#shixunchallengesid{
- max-height: 260px;
+ max-height: 300px;
overflow: hidden;
}
`
@@ -427,14 +439,22 @@ class Challenges extends Component {
-
+ {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined? +
+ {this.props.identity < 5?![]({getImageUrl("images/educoder/shixunnodata.png")})
:![]({getImageUrl("images/educoder/nodata.png")})
}
+
+ ::}
+ 暂时还没有相关数据哦！
+{ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
} - + }
简介
-
+
编辑
-
+
{this.state.opentitletype===true?:""}
+ :"":}
:"":}
+
this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
+ {this.state.isopentitletype==="Less"?"":this.state.opentitletype===true?this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
阅读全文
:this.opentitle()} className={"pointer Breadcrumbfont color-grey-9 "}>
收起全文
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index c68493163..d2376d616 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -48,33 +48,54 @@ class Challengesjupyter extends Component {
isopentitletype:"Less",
})
}
+ this.getjianjiesize()
}
}
}).catch((error) => {
//console.log(error)
});
}
+
+
+ getjianjiesize=()=>{
+ let {ChallengesDataList}=this.state;
+ let boxoffsetHeigh;
+ let box=document.getElementById("shixunchallengesid");
+
+ if(box){
+ boxoffsetHeigh=box.offsetHeight
+ if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
+
+ }else{
+ if(this.state.isopentitletype==="greater"){
+
+ }else{
+ if(boxoffsetHeigh>=300){
+ this.setState({
+ opentitletype:true,
+ isopentitletype:"greater",
+ boxoffsetHeigh:boxoffsetHeigh
+ })
+ }else{
+ this.setState({
+ isopentitletype:"Less",
+ boxoffsetHeigh:boxoffsetHeigh
+ })
+ }
+ }
+
+ }
+
+ }
+ }
componentDidUpdate = (prevProps,prevState) => {
//防止陷入无限循环
if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
- let boxoffsetHeigh;
- let box=document.getElementById("shixunchallengesid");
- if(box){
- boxoffsetHeigh=box.offsetHeight
- if(boxoffsetHeigh<300){
- this.setState({
- isopentitletype:"Less",
- boxoffsetHeigh:boxoffsetHeigh
- })
- }else{
- this.setState({
- isopentitletype:"greater",
- opentitletype:true,
- boxoffsetHeigh:boxoffsetHeigh
- })
- }
+ if(this.state.isopentitletype==="greater"){
+ }else{
+ this.getjianjiesize()
}
}
@@ -132,6 +153,8 @@ class Challengesjupyter extends Component {
console.log("触发了jupytermessage");
that.modifyjupyter();
});
+ setTimeout(this.getjianjiesize(), 1000);
+
}
updatamakedowns = () => {
@@ -220,6 +243,7 @@ class Challengesjupyter extends Component {
}
+
render() {
let{ChallengesDataList,booljupyterurls,enlarge}=this.state;
let id = this.props.match.params.shixunId;
@@ -252,17 +276,39 @@ class Challengesjupyter extends Component {
- {this.state.opentitletype===true?
+
+ {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?:""}
-
+
+
+ {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?:""}
+
+
+ {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+ :""}
+
- {this.state.isopentitletype==="Less"&&this.state.opentitletype===false?
@@ -471,7 +499,7 @@ class Challenges extends Component {
+ }
+ :""}
+ {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
+ :""}
@@ -341,11 +387,7 @@ class Challengesjupyter extends Component { : ( admin===true||business===true||mysidentity===true? -
-
-
-
-
+
@@ -402,7 +444,7 @@ class Challengesjupyter extends Component {
{
admin===true||business===true||mysidentity===true?
-
:
""
)
From 7171b5cba36def4e50bc695921ca449c90143d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:42:44 +0800
Subject: [PATCH 19/63] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index a2de37ce5..7b2313139 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -8,5 +8,5 @@ $(function(){
$(function(){
console.log("开始发送消息了");
- window.parent.postMessage('message','*');
+ window.parent.postMessage('jupytermessage','*');
})
From 8250d5fccb73a6fed9a2dffa5d13a488419501e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:48:39 +0800
Subject: [PATCH 20/63] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Challenges/Challengesjupyter.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index ee3f9a0e9..d03a0ea89 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -153,7 +153,15 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
console.log("触发了jupytermessage");
console.log(e);
- // that.modifyjupyter();
+ if(e){
+ if(e.data){
+ if(e.data==="jupytermessage"){
+ that.modifyjupyter();
+ }
+ }
+
+ }
+
});
setTimeout(this.getjianjiesize(), 1000);
From 1e078211b0ba325957c4a60042ec4f929ca8eebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:57:50 +0800
Subject: [PATCH 21/63] =?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/tpm/shixunchild/Challenges/Challengesjupyter.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 861b93c88..e9674b2ac 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -413,9 +413,9 @@ class Challengesjupyter extends Component {
marginLeft: '30px',
}} onClick={()=>this.onclki(true)}>
}
-
+ {/*导入*/}
+ {/* */}
:
From a44e06b50671c91368329715440028b3595e79d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:12:00 +0800
Subject: [PATCH 22/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Challenges/Challengesjupyter.js | 234 +++++++-----------
1 file changed, 91 insertions(+), 143 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index e9674b2ac..d3aa910b8 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -8,7 +8,7 @@ import '../shixunchildCss/Challenges.css';
import axios from 'axios';
const $ = window.$;
-
+//12.20,14:11
class Challengesjupyter extends Component {
constructor(props) {
super(props)
@@ -48,54 +48,33 @@ class Challengesjupyter extends Component {
isopentitletype:"Less",
})
}
- this.getjianjiesize()
}
}
}).catch((error) => {
//console.log(error)
});
}
-
-
- getjianjiesize=()=>{
- let {ChallengesDataList}=this.state;
- let boxoffsetHeigh;
- let box=document.getElementById("shixunchallengesid");
-
- if(box){
- boxoffsetHeigh=box.offsetHeight
- if(ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined){
-
- }else{
- if(this.state.isopentitletype==="greater"){
-
- }else{
- if(boxoffsetHeigh>=300){
- this.setState({
- opentitletype:true,
- isopentitletype:"greater",
- boxoffsetHeigh:boxoffsetHeigh
- })
- }else{
- this.setState({
- isopentitletype:"Less",
- boxoffsetHeigh:boxoffsetHeigh
- })
- }
- }
-
- }
-
- }
- }
componentDidUpdate = (prevProps,prevState) => {
//防止陷入无限循环
if(prevState.ChallengesDataList!=this.state.ChallengesDataList){
- if(this.state.isopentitletype==="greater"){
+ let boxoffsetHeigh;
+ let box=document.getElementById("shixunchallengesid");
+ if(box){
+ boxoffsetHeigh=box.offsetHeight
+ if(boxoffsetHeigh<300){
+ this.setState({
+ isopentitletype:"Less",
+ boxoffsetHeigh:boxoffsetHeigh
+ })
+ }else{
+ this.setState({
+ isopentitletype:"greater",
+ opentitletype:true,
+ boxoffsetHeigh:boxoffsetHeigh
+ })
+ }
- }else{
- this.getjianjiesize()
}
}
@@ -105,9 +84,9 @@ class Challengesjupyter extends Component {
setTimeout(this.ChallengesList(), 1000);
let id = this.props.match.params.shixunId;
let ChallengesURL = `/jupyters/get_info_with_tpm.json`;
- let datas={
- identifier:id,
- }
+ let datas={
+ identifier:id,
+ }
axios.get(ChallengesURL, {params: datas}).then((response) => {
if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
setTimeout(() => {
@@ -115,26 +94,26 @@ class Challengesjupyter extends Component {
booljupyterurls:true,
})
}, 600)
+ }else{
+ if(response.data.status===0){
+
+ setTimeout(() => {
+ this.setState({
+ jupyter_url:response.data.url,
+ jupyter_port:response.data.port,
+ booljupyterurls:true,
+ })
+ }, 800)
+
}else{
- if(response.data.status===0){
-
- setTimeout(() => {
- this.setState({
- jupyter_url:response.data.url,
- jupyter_port:response.data.port,
- booljupyterurls:true,
- })
- }, 800)
-
- }else{
- setTimeout(() => {
- this.setState({
- booljupyterurls:true,
- })
- }, 600)
+ setTimeout(() => {
+ this.setState({
+ booljupyterurls:true,
+ })
+ }, 600)
- }
}
+ }
}).catch((error) => {
@@ -145,10 +124,6 @@ class Challengesjupyter extends Component {
}, 600)
});
- setTimeout(this.getjianjiesize(), 1000);
-
-
-
window.addEventListener('message', (e) => {
console.log("触发了jupytermessage");
@@ -163,8 +138,6 @@ class Challengesjupyter extends Component {
}
});
- setTimeout(this.getjianjiesize(), 1000);
-
}
updatamakedowns = () => {
@@ -218,13 +191,13 @@ class Challengesjupyter extends Component {
modifyjupyter=()=>{
let id=this.props.match.params.shixunId;
- var jupyter_port="";
- try{
- jupyter_port= parseInt(this.state.jupyter_port);
- }catch (e) {
- jupyter_port=this.state.jupyter_port;
+ var jupyter_port="";
+ try{
+ jupyter_port= parseInt(this.state.jupyter_port);
+ }catch (e) {
+ jupyter_port=this.state.jupyter_port;
- }
+ }
const url=`/jupyters/save_with_tpm.json`;
const data={
identifier:id,
@@ -234,7 +207,6 @@ class Challengesjupyter extends Component {
.then((result) => {
if (result.data.status === 0) {
this.props.showNotification(`应用成功`);
- console.log("触发了jupytermessage调用了应用成功");
}
}).catch((error) => {
})
@@ -245,15 +217,12 @@ class Challengesjupyter extends Component {
opentitletype:!this.state.opentitletype
})
}
-
onclki=(bool)=>{
this.setState({
enlarge:bool
})
}
-
-
render() {
let{ChallengesDataList,booljupyterurls,enlarge}=this.state;
let id = this.props.match.params.shixunId;
@@ -263,8 +232,6 @@ class Challengesjupyter extends Component {
const business = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
//管理员
const admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
- //用户
- const login = this.props&&this.props.current_user&&this.props.current_user.login?this.props.current_user.login:"";
let mysidentity =false;
try {
@@ -286,39 +253,17 @@ class Challengesjupyter extends Component {
任务详情
（请将实训题目写在下方并保存）
-
-
+
{
this.state.jupyter_url===null || this.state.jupyter_url===undefined?
(
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 9cb814d80..5484b6eec 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 13:42:11
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-19 15:11:56
+ * @LastEditTime: 2019-12-20 10:25:42
*/
import types from "./actionTypes";
import { Base64 } from 'js-base64';
@@ -87,7 +87,7 @@ export const getUserProgramDetail = (identifier, type) => {
type: types.SAVE_USE_TEST_CASE_VALUE,
payload: data.test_case || {}
});
- // 代码是否更新
+ // 代码是否更新
let _modify_code = false;
if (data.hack) {
_modify_code = data.hack.modify_code;
@@ -171,15 +171,103 @@ export const updateCode = (identifier, inputValue, type) => {
}
}
+// 代码评测
+export const codeEvaluate = (dispatch, identifier, type, time_limit) => {
+ // 调试代码成功后，调用轮循接口， 注意: 代码执行的时间要小于设置的时间限制
+ const intervalTime = 500;
+ let count = 1;
+ /**
+ * @param {*} excuteTime 执行时间
+ * @param {*} finalTime 总时间
+ * @param {*} count 执行次数
+ * @param {*} timer 定时器
+ */
+ function getCodeSubmit (intervalTime, finalTime, count, timer){
+ const excuteTime = (count++) * intervalTime; // 当前执行时间
+ fetchCodeSubmit(identifier, { mode: type }).then(res => {
+ const { status } = res.data; // 评测返回结果
+ // 清除定时器条件: 评测通过或者评测时间大于指定时间
+ if (+status === 0 || (excuteTime / 1000) > (finalTime + 1)) {
+ clearInterval(timer); // 清除定时器
+ timer = null;
+ let returnData = null;
+ if (status === 1) { // 结果没有返回
+ returnData = {
+ error_line: -1,
+ error_msg: '',
+ execute_memory: '',
+ execute_time: finalTime,
+ input: '',
+ output: '',
+ status: 2,
+ expected_output: ''
+ };
+ } else { // 成功返回结果
+ returnData = res.data.data;
+ }
+ // 返回评测结果
+ dispatch({
+ type: types.COMMIT_RECORD_DETAIL,
+ payload: returnData
+ });
+ if (!type || type === 'debug') {
+ dispatch({ // 改变 loading 值
+ type: types.LOADING_STATUS,
+ payload: false
+ });
+ // 保存执行状态
+ dispatch({
+ type: types.TEST_CODE_STATUS,
+ payload: 'finish'
+ });
+ } else {
+ // 回滚提交按钮状态
+ dispatch({
+ type: types.SUBMIT_LOADING_STATUS,
+ payload: false
+ });
+ // 改变tab值至提交记录(只在提交时才跳转，测评时，切换到代码执行结果就可以了)
+ dispatch({
+ type: types.CHANGE_USER_CODE_TAB,
+ payload: 'record'
+ });
+ // 重新调用一下提交记录接口
+ dispatch(getUserCommitRecord(identifier));
+ }
+ }
+ }).catch(err => { // 评测异常时
+ // 清除定时器
+ clearInterval(timer);
+ timer = null;
+ // 回滚按钮状态
+ if (!type || type === 'debug') {
+ dispatch({ // 改变 loading 值
+ type: types.LOADING_STATUS,
+ payload: false
+ });
+ } else { // 回滚提交按钮状态
+ dispatch({
+ type: types.SUBMIT_LOADING_STATUS,
+ payload: false
+ });
+ }
+ });
+ }
+ // 开启定时器，调用监听接口
+ let timer = setInterval(() => {
+ getCodeSubmit(intervalTime, time_limit, count++, timer);
+ }, intervalTime);
+}
+
/**
* @description 调试代码
- * @param {*} identifier
+ * @param {*} identifier
* @param {*} inputValue 输入值: 自定义 | 系统返回的
* @param {*} type 测评类型 debug | submit
*/
export const debuggerCode = (identifier,value, type) => {
return (dispatch, getState) => {
- // 调用之前 先保存 code
+ // 调用之前 先保存 code
// TODO
// console.log(identifier, value);
const {hack: {time_limit = 0}} = getState().ojForUserReducer;
@@ -194,15 +282,6 @@ export const debuggerCode = (identifier,value, type) => {
// console.log('调用调试代码成功并返回结果: ', res);
const { status } = res;
if (status === 200) {
- // 调试代码成功后，调用轮循接口， 注意: 代码执行的时间要小于设置的时间限制
- const intervalTime = 500;
- let count = 1;
- /**
- * @param {*} excuteTime 执行时间
- * @param {*} finalTime 总时间
- * @param {*} count 执行次数
- * @param {*} timer 定时器
- */
if (res.data.status === 401) {
dispatch({ // 改变 loading 值
type: types.LOADING_STATUS,
@@ -210,81 +289,8 @@ export const debuggerCode = (identifier,value, type) => {
});
return;
};
- function getCodeSubmit (intervalTime, finalTime, count, timer){
- const excuteTime = (count++) * intervalTime; // 当前执行时间
- fetchCodeSubmit(identifier, { mode: type }).then(res => {
- const { status } = res.data; // 评测返回结果
- // 清除定时器条件: 评测通过或者评测时间大于指定时间
- if (+status === 0 || (excuteTime / 1000) > (finalTime + 1)) {
- clearInterval(timer); // 清除定时器
- timer = null;
- let returnData = null;
- if (status === 1) { // 结果没有返回
- returnData = {
- error_line: -1,
- error_msg: '',
- execute_memory: '',
- execute_time: finalTime,
- input: '',
- output: '',
- status: 2,
- expected_output: ''
- };
- } else { // 成功返回结果
- returnData = res.data.data;
- }
- // 返回评测结果
- dispatch({
- type: types.COMMIT_RECORD_DETAIL,
- payload: returnData
- });
- if (!type || type === 'debug') {
- dispatch({ // 改变 loading 值
- type: types.LOADING_STATUS,
- payload: false
- });
- // 保存执行状态
- dispatch({
- type: types.TEST_CODE_STATUS,
- payload: 'finish'
- });
- } else {
- // 回滚提交按钮状态
- dispatch({
- type: types.SUBMIT_LOADING_STATUS,
- payload: false
- });
- // 改变tab值至提交记录(只在提交时才跳转，测评时，切换到代码执行结果就可以了)
- dispatch({
- type: types.CHANGE_USER_CODE_TAB,
- payload: 'record'
- });
- // 重新调用一下提交记录接口
- dispatch(getUserCommitRecord(identifier));
- }
- }
- }).catch(err => { // 评测异常时
- // 清除定时器
- clearInterval(timer);
- timer = null;
- // 回滚按钮状态
- if (!type || type === 'debug') {
- dispatch({ // 改变 loading 值
- type: types.LOADING_STATUS,
- payload: false
- });
- } else { // 回滚提交按钮状态
- dispatch({
- type: types.SUBMIT_LOADING_STATUS,
- payload: false
- });
- }
- });
- }
- // 开启定时器，调用监听接口
- let timer = setInterval(() => {
- getCodeSubmit(intervalTime, time_limit, count++, timer);
- }, intervalTime);
+ // 测评
+ codeEvaluate(dispatch, identifier, type, time_limit);
}
}).catch(() => {
dispatch({
@@ -362,7 +368,8 @@ export const changeUserCodeTab = (key) => {
*/
export const submitUserCode = (identifier, inputValue, type) => {
return (dispatch, getState) => {
- const { userCode, isUpdateCode } = getState().ojForUserReducer;
+ const { userCode, isUpdateCode, hack: {time_limit = 0} } = getState().ojForUserReducer;
+
function userCodeSubmit () {
fetchUserCodeSubmit(identifier).then(res => {
// console.log('用户提交代码成功======》》》》》', res);
@@ -374,12 +381,8 @@ export const submitUserCode = (identifier, inputValue, type) => {
});
return;
};
- // 将编辑代码清空
- dispatch({
- type: types.SAVE_EDITOR_CODE,
- payload: ''
- });
- dispatch(debuggerCode(identifier, inputValue, type || 'submit'));
+ // 测评
+ codeEvaluate(dispatch, identifier, type, time_limit);
}
}).catch(() => {
dispatch({
diff --git a/public/react/src/services/ojService.js b/public/react/src/services/ojService.js
index 373805b73..e552c1211 100644
--- a/public/react/src/services/ojService.js
+++ b/public/react/src/services/ojService.js
@@ -4,11 +4,10 @@
* @Github:
* @Date: 2019-11-20 10:55:38
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-17 14:10:37
+ * @LastEditTime: 2019-12-20 10:10:53
*/
import axios from 'axios';
-import { func } from 'prop-types';
export async function fetchOJList (params) {
console.log('传递的参数: ', params);
@@ -137,4 +136,4 @@ export async function fetchUploadImage (file) {
export async function fetchUploadImageUrl (id) {
const url = `/attachments/${id}`;
return axios.get(url);
-}
+}
From 16d8db7b5acf4bc19b09df4bb57752734cddd34d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 12:58:39 +0800
Subject: [PATCH 15/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shixunchild/Challenges/Challengesjupyter.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index b571b3101..9f28f2757 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -118,12 +118,17 @@ class Challengesjupyter extends Component {
});
+ let self = this; //为了避免作用域及缓存
+ window.receiveMessageFromIndex = function ( event ) {
+ if(event!=undefined){
+ console.log("触发了jupytermessage");
+ console.log("触发了jupytermessage");
+ // self.modifyjupyter();
- window.addEventListener('jupytermessage', (e) => {
- console.log("触发了jupytermessage");
- console.log("触发了jupytermessage");
- that.modifyjupyter();
- });
+ }
+ }
+ //监听message事件
+ window.addEventListener("jupytermessage", receiveMessageFromIndex, false);
}
updatamakedowns = () => {
From b7abe189bff2d22c6017d74d577aa7567b2331e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:02:54 +0800
Subject: [PATCH 16/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Challenges/Challengesjupyter.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index c68493163..8e03f75e9 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -125,13 +125,13 @@ class Challengesjupyter extends Component {
});
-
-
- window.addEventListener('jupytermessage', (e) => {
+ let self = this; //为了避免作用域及缓存
+ window.receiveMessageFromIndex = function ( event ) {
console.log("触发了jupytermessage");
console.log("触发了jupytermessage");
- that.modifyjupyter();
- });
+ }
+ //监听message事件
+ window.addEventListener("message", receiveMessageFromIndex, false);
}
updatamakedowns = () => {
From 5048423aee06de7ae14f6c14a0a6a1aff5731cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:05:29 +0800
Subject: [PATCH 17/63] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 7b2313139..a2de37ce5 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -8,5 +8,5 @@ $(function(){
$(function(){
console.log("开始发送消息了");
- window.parent.postMessage('jupytermessage','*');
+ window.parent.postMessage('message','*');
})
From baa5ec685d301249820dd75cf54bf25a928758ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 13:41:36 +0800
Subject: [PATCH 18/63] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 0e243e6d8..ee3f9a0e9 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -152,8 +152,8 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
console.log("触发了jupytermessage");
- console.log("触发了jupytermessage");
- that.modifyjupyter();
+ console.log(e);
+ // that.modifyjupyter();
});
setTimeout(this.getjianjiesize(), 1000);
@@ -410,8 +410,6 @@ class Challengesjupyter extends Component {
导入
-
-
-
- {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?:""}
- {ChallengesDataList === undefined || ChallengesDataList&&ChallengesDataList.description=== ""||ChallengesDataList&&ChallengesDataList.description===null||ChallengesDataList&&ChallengesDataList.description===undefined?"":this.state.isopentitletype==="greater"&&this.state.opentitletype===true?
- :""}
+ }
+ :""}
+
From ce214e61e4edc2d0157619187714caf4a49c0aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:17:02 +0800
Subject: [PATCH 43/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 7692b791d..faa4ff9d8 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -18,18 +18,18 @@ function runEvery10Sec() {
}
-function keyDown(e){
- e.preventDefault();
- var currKey=0, e=e||event||window.event;
- currKey = e.keyCode||e.which||e.charCode;
- if(currKey == 83 && (e.ctrlKey||e.metaKey)){
- console.log("点击了ctrl+s");
- console.log("开始发送消息了ctrl+s");
- window.parent.postMessage('jupytermessage','*');
- return true;
- }
-}
-document.onkeydown = keyDown;
+// function keyDown(e){
+// e.preventDefault();
+// var currKey=0, e=e||event||window.event;
+// currKey = e.keyCode||e.which||e.charCode;
+// if(currKey == 83 && (e.ctrlKey||e.metaKey)){
+// console.log("点击了ctrl+s");
+// console.log("开始发送消息了ctrl+s");
+// window.parent.postMessage('jupytermessage','*');
+// return true;
+// }
+// }
+// document.onkeydown = keyDown;
From 92869441ec249b0fc6adeaa2dc9a2cf275b7219e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:21:51 +0800
Subject: [PATCH 44/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index faa4ff9d8..a0e06dc70 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -17,20 +17,22 @@ function runEvery10Sec() {
setTimeout( runEvery10Sec, 1000 * 10 );
}
+function keyDown(e){
+ try {
+ e.preventDefault();
+ var currKey=0, e=e||event||window.event;
+ currKey = e.keyCode||e.which||e.charCode;
+ if(currKey == 83 && (e.ctrlKey||e.metaKey)){
+ console.log("点击了ctrl+s");
+ console.log("开始发送消息了ctrl+s");
+ window.parent.postMessage('jupytermessage','*');
+ return true;
+ }
+ }catch (e) {
-// function keyDown(e){
-// e.preventDefault();
-// var currKey=0, e=e||event||window.event;
-// currKey = e.keyCode||e.which||e.charCode;
-// if(currKey == 83 && (e.ctrlKey||e.metaKey)){
-// console.log("点击了ctrl+s");
-// console.log("开始发送消息了ctrl+s");
-// window.parent.postMessage('jupytermessage','*');
-// return true;
-// }
-// }
-// document.onkeydown = keyDown;
-
+ }
+}
+document.onkeydown = keyDown;
From 8b064c3d42c2555aa7f3398b4d4615e4206e9fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:24:34 +0800
Subject: [PATCH 45/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index a0e06dc70..446a9e94c 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -17,22 +17,22 @@ function runEvery10Sec() {
setTimeout( runEvery10Sec, 1000 * 10 );
}
-function keyDown(e){
- try {
- e.preventDefault();
- var currKey=0, e=e||event||window.event;
- currKey = e.keyCode||e.which||e.charCode;
- if(currKey == 83 && (e.ctrlKey||e.metaKey)){
- console.log("点击了ctrl+s");
- console.log("开始发送消息了ctrl+s");
- window.parent.postMessage('jupytermessage','*');
- return true;
- }
- }catch (e) {
-
- }
-}
-document.onkeydown = keyDown;
+// function keyDown(e){
+// try {
+// e.preventDefault();
+// var currKey=0, e=e||event||window.event;
+// currKey = e.keyCode||e.which||e.charCode;
+// if(currKey == 83 && (e.ctrlKey||e.metaKey)){
+// console.log("点击了ctrl+s");
+// console.log("开始发送消息了ctrl+s");
+// window.parent.postMessage('jupytermessage','*');
+// return true;
+// }
+// }catch (e) {
+//
+// }
+// }
+// document.onkeydown = keyDown;
From 7b47d876b519861ce51c05171bd6c2d0ea7d38eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:27:45 +0800
Subject: [PATCH 46/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 446a9e94c..62d85f325 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -33,9 +33,16 @@ function runEvery10Sec() {
// }
// }
// document.onkeydown = keyDown;
-
-
-
+$(function(){
+document.addEventListener('keydown', function(e){
+ if (e.keyCode == 83 && (navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey)){
+ e.preventDefault();
+ console.log("点击了ctrl+s");
+ console.log("开始发送消息了ctrl+s");
+ window.parent.postMessage('jupytermessage','*');
+ }
+});
+})
$(function(){
window.addEventListener('message', (e) => {
console.log("触发了Parentwindow");
From ebba00c416255ddfb46ca98b2e9bfb2f36572a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:27:59 +0800
Subject: [PATCH 47/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 62d85f325..c9afaaa24 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -17,22 +17,6 @@ function runEvery10Sec() {
setTimeout( runEvery10Sec, 1000 * 10 );
}
-// function keyDown(e){
-// try {
-// e.preventDefault();
-// var currKey=0, e=e||event||window.event;
-// currKey = e.keyCode||e.which||e.charCode;
-// if(currKey == 83 && (e.ctrlKey||e.metaKey)){
-// console.log("点击了ctrl+s");
-// console.log("开始发送消息了ctrl+s");
-// window.parent.postMessage('jupytermessage','*');
-// return true;
-// }
-// }catch (e) {
-//
-// }
-// }
-// document.onkeydown = keyDown;
$(function(){
document.addEventListener('keydown', function(e){
if (e.keyCode == 83 && (navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey)){
From 31b8fdfde15959fdf2bb72496dff6b9a4116c407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:28:50 +0800
Subject: [PATCH 48/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c9afaaa24..47e2381a7 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -18,7 +18,7 @@ function runEvery10Sec() {
}
$(function(){
-document.addEventListener('keydown', function(e){
+document.addEventListener('keydown', (e) => {
if (e.keyCode == 83 && (navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey)){
e.preventDefault();
console.log("点击了ctrl+s");
From a5bcad43d48e7936b8a5c65dd2a4b0437bcb727e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 19:39:05 +0800
Subject: [PATCH 49/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 47e2381a7..3141fc3c5 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -1,20 +1,25 @@
//用于嵌入到jupyter pod中的js
//guange 2019.12.18
-
+var timebool=false;
window.onload=function(){
console.log("开始发送消息了");
+ timebool=true;
runEvery10Sec();
}
function runEvery10Sec() {
+
// 1000 * 10 = 10 秒钟
console.log("每隔10秒中一次");
require(["base/js/namespace"],function(Jupyter) {
Jupyter.notebook.save_checkpoint();
});
window.parent.postMessage('jupytermessage','*');
- setTimeout( runEvery10Sec, 1000 * 10 );
+ if(timebool===true){
+ setTimeout( runEvery10Sec, 1000 * 10 );
+ }
+
}
$(function(){
@@ -34,7 +39,14 @@ $(function(){
if(e){
if(e.data){
if(e.data==="Parentwindow"){
+ //重置停止
+ timebool=false;
+ console.log("父窗口调我了");
+ }else if(e.data==="Parentwindow"){
console.log("父窗口调我了");
+ //取消启动
+ timebool=true;
+ this.runEvery10Sec();
}
}
From 6bd1b74aa6103347461c7123e25c425001428138 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, 20 Dec 2019 19:39:52 +0800
Subject: [PATCH 50/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/jupyter/index.js | 2 +-
public/react/src/services/jupyterServer.js | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 9d3ec50ec..0e209523f 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -319,7 +319,7 @@ function JupyterTPI (props) {
visible={drawervisible}
className={"RightPaneDrawer"}
>
-
+ {/**/}
{/*
@@ -385,9 +330,8 @@ class Challengesjupyter extends Component { display: flex; flex-direction:row-reverse; } - ; - } + } ` } @@ -396,29 +340,33 @@ class Challengesjupyter extends Component { "" : ( - admin===true||business===true||mysidentity===true? -
-
-
-
-
- 任务详情
（请将实训题目写在下方并保存）
- {
- enlarge===true?
- this.onclki(false)}>
- :
- this.onclki(true)}>
- }
- {/*导入*/}
- {/* */}
+ admin===true||business===true||mysidentity===true?
+
From 9bcc7c810630902274b7afc2837950969caffbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:15:45 +0800
Subject: [PATCH 23/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Challenges/Challengesjupyter.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index d3aa910b8..804c485b5 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -341,9 +341,11 @@ class Challengesjupyter extends Component {
:
(
admin===true||business===true||mysidentity===true?
-
+
+
- :
+
+ :
""
)
@@ -450,25 +398,25 @@ class Challengesjupyter extends Component {
}
{
- admin===true||business===true||mysidentity===true?
-
+
+
+
+
+ 任务详情
（请将实训题目写在下方并保存）
+ {
+ enlarge===true?
+ this.onclki(false)}>
+ :
+ this.onclki(true)}>
+ }
+ {/*
this.modifyjupyter(this.state)}>导入*/}
+ {/*
*/}
+
-
- {
- this.state.jupyter_url===null || this.state.jupyter_url===undefined?
- (
- booljupyterurls===false?
-
+ :""
}
+
- :""
+
+ {
+ this.state.jupyter_url===null || this.state.jupyter_url===undefined?
+ (
+ booljupyterurls===false?
+
+ }
+
));
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 9eb82c7d4..0ea8ebe6b 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -153,7 +153,6 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
console.log("触发了jupytermessage");
- console.log(e);
if(e){
if(e.data){
if(e.data==="jupytermessage"){
From 6866af6e0c780692db098127c0d1f8bbd44b9b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 16:56:21 +0800
Subject: [PATCH 36/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/shixunchildCss/Challenges.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index 1e1945f89..55d4cf58f 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -188,6 +188,7 @@
.ysliconfont{
text-align: center;
line-height: 29px;
+ color: #EEEEEE;
}
.fangdaone{
From 923ee2bb018006875f538fb1392bfe9bff7c63db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 16:59:51 +0800
Subject: [PATCH 37/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/shixunchildCss/Challenges.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index 55d4cf58f..06a06f7da 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -188,7 +188,7 @@
.ysliconfont{
text-align: center;
line-height: 29px;
- color: #EEEEEE;
+ color: #8a8a8a;
}
.fangdaone{
From e306a3ee494fe74bca1876cb0f4f780adf81689a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 17:07:09 +0800
Subject: [PATCH 38/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/shixunchildCss/Challenges.css | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index 06a06f7da..f8b499e1f 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -131,7 +131,6 @@
height: 76px;
line-height: 35px;
padding: 20px;
- border-bottom: 1px solid #eeee;
}
.padding1020pxshixun{
From 288f0bcdad898204475392c6e44f7603a32e6b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 17:11:59 +0800
Subject: [PATCH 39/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter=20=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 787b59bb0..c175395eb 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -427,7 +427,6 @@ class Challengesjupyter extends Component {
}
iframe {
border-left: 1px solid #eeeeee;
- border-top: 1px solid #eeeeee;
border-right: 1px solid #eeeeee;
border-bottom: 1px solid #eeeeee;
}
From 0706d72a15cdee8452e78f06bbcb91e91c30f99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 17:17:14 +0800
Subject: [PATCH 40/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter=20tpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index c175395eb..fcff7d1d4 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -147,6 +147,7 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
console.log("触发了jupytermessage");
+ console.log(e);
if(e){
if(e.data){
if(e.data==="jupytermessage"){
From ef380f89d746ca828793ebab549a5401a373f279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 18:40:19 +0800
Subject: [PATCH 41/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter=20tpi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index aa738a644..e2fddebcd 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -16,3 +16,17 @@ function runEvery10Sec() {
window.parent.postMessage('jupytermessage','*');
setTimeout( runEvery10Sec, 1000 * 10 );
}
+
+
+function keyDown(e){
+ e.preventDefault();
+ var currKey=0, e=e||event||window.event;
+ currKey = e.keyCode||e.which||e.charCode;
+ if(currKey == 83 && (e.ctrlKey||e.metaKey)){
+ console.log("点击了ctrl+s");
+ console.log("开始发送消息了ctrl+s");
+ window.parent.postMessage('jupytermessage','*');
+ return true;
+ }
+}
+document.onkeydown = keyDown;
From 2c97a974831651de5faf73b1cfa97ddb039184e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 18:54:52 +0800
Subject: [PATCH 42/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 20 +++++++++++++++++++
.../Challenges/Challengesjupyter.js | 15 +++++++++++---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index e2fddebcd..7692b791d 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -30,3 +30,23 @@ function keyDown(e){
}
}
document.onkeydown = keyDown;
+
+
+
+
+$(function(){
+ window.addEventListener('message', (e) => {
+ console.log("触发了Parentwindow");
+ console.log(e);
+ if(e){
+ if(e.data){
+ if(e.data==="Parentwindow"){
+ console.log("父窗口调我了");
+ }
+ }
+
+ }
+
+ });
+})
+
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index fcff7d1d4..a08825936 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -243,6 +243,15 @@ class Challengesjupyter extends Component {
enlarge:bool
})
}
+ daoruzhon=()=>{
+ var _iframe = document.getElementById("frame");
+ if(_iframe == null || _iframe == undefined || _iframe == ""){
+ console.log("framenull");
+ return;
+ }
+ console.log("framego");
+ _iframe.contentWindow.postMessage("Parentwindow", "*");
+ }
render() {
let{ChallengesDataList,booljupyterurls,enlarge}=this.state;
@@ -404,9 +413,9 @@ class Challengesjupyter extends Component {
marginLeft: '30px',
}} onClick={()=>this.onclki(true)}>
}
- {/*导入*/}
- {/* */}
+
-
-
:
""
)
From ca12b1e57403e359f941af2914bf5fefd637d32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 16:31:22 +0800
Subject: [PATCH 34/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Challenges/Challengesjupyter.js | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 9eb82c7d4..fd20d58f4 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -117,25 +117,19 @@ class Challengesjupyter extends Component {
}, 600)
}else{
if(response.data.status===0){
-
setTimeout(() => {
-
- var url=response.data.url;
- var url2=url.replace("http://","https://");
this.setState({
- jupyter_url:url2,
+ jupyter_url:response.data.url,
jupyter_port:response.data.port,
booljupyterurls:true,
})
}, 800)
-
}else{
setTimeout(() => {
this.setState({
booljupyterurls:true,
})
}, 600)
-
}
}
From a4d2b5976406b1c178c66e9c1d944916dae358ba 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, 20 Dec 2019 16:54:00 +0800
Subject: [PATCH 35/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 10 +++++----
public/react/src/AppConfig.js | 2 +-
public/react/src/modules/tpm/jupyter/index.js | 21 +++++++++++++++++++
.../modules/tpm/jupyter/rightPane/index.js | 14 ++++++-------
.../Challenges/Challengesjupyter.js | 1 -
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 021d46a2e..aa738a644 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -2,15 +2,17 @@
//guange 2019.12.18
-$(function(){
+window.onload=function(){
console.log("开始发送消息了");
runEvery10Sec();
-})
+}
function runEvery10Sec() {
// 1000 * 10 = 10 秒钟
- console.log("每隔10秒中一次runEvery10Sec");
+ console.log("每隔10秒中一次");
+ require(["base/js/namespace"],function(Jupyter) {
+ Jupyter.notebook.save_checkpoint();
+ });
window.parent.postMessage('jupytermessage','*');
setTimeout( runEvery10Sec, 1000 * 10 );
-
}
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index ac39562a7..acd18e6c3 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -52,7 +52,7 @@ export function initAxiosInterceptors(props) {
//proxy="http://47.96.87.25:48080"
proxy="https://pre-newweb.educoder.net"
proxy="https://test-newweb.educoder.net"
- //proxy="https://test-jupyterweb.educoder.net"
+ proxy="https://test-jupyterweb.educoder.net"
//proxy="http://192.168.2.63:3001"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 617ef0936..9d3ec50ec 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -75,11 +75,30 @@ function JupyterTPI (props) {
const [updateTip, setUpdateTip] = useState(true);
const [myIdentifier, setMyIdentifier] = useState('');
const [renderCtx, setRenderCtx] = useState(() => (emptyCtx));
+
+ // 保存代码
+ const addEventListeners = () => {
+ window.addEventListener('message', (e) => {
+ console.log("触发了jupytermessage");
+ if(e){
+ if(e.data){
+ if(e.data==="jupytermessage"){
+ saveJupyterTpi();
+ }
+ }
+
+ }
+
+ });
+ }
+
+
useEffect(() => {
/* 先调用 jupyter的 TPI 接口，
* 获取 用户信息,
* 实训的 identifier, 状态， 名称， 是否被修改等信息
*/
+ addEventListeners()
getJupyterInfo(identifier);
}, [identifier]);
@@ -234,6 +253,8 @@ function JupyterTPI (props) {
setRenderCtx(oUl);
}
}, [props]);
+
+
return (
+
@@ -359,7 +361,7 @@ class Challengesjupyter extends Component {
marginLeft: '30px',
}} onClick={()=>this.onclki(true)}>
}
- {/*
From 16d95d842b79831b67b057387d6f32c192860dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:25:04 +0800
Subject: [PATCH 24/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 7b2313139..50541f6e7 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -4,9 +4,18 @@
$(function(){
console.log("educoder jupyter js init");
+ runEvery10Sec();
})
$(function(){
console.log("开始发送消息了");
window.parent.postMessage('jupytermessage','*');
+
})
+
+function runEvery10Sec() {
+ // 1000 * 10 = 10 秒钟
+ console.log("每隔10秒中一次runEvery10Sec");
+ setTimeout( runEvery10Sec, 1000 * 10 );
+
+}
From 4e803c511426cf1e1414dbb614039f176e1eb2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:33:47 +0800
Subject: [PATCH 25/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index 50541f6e7..021d46a2e 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -2,20 +2,15 @@
//guange 2019.12.18
-$(function(){
- console.log("educoder jupyter js init");
- runEvery10Sec();
-})
-
$(function(){
console.log("开始发送消息了");
- window.parent.postMessage('jupytermessage','*');
-
+ runEvery10Sec();
})
function runEvery10Sec() {
// 1000 * 10 = 10 秒钟
console.log("每隔10秒中一次runEvery10Sec");
+ window.parent.postMessage('jupytermessage','*');
setTimeout( runEvery10Sec, 1000 * 10 );
}
From 71551ec21d421b82b2c9001576d9ca4c9672791f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:43:25 +0800
Subject: [PATCH 26/63] =?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/tpm/shixunchild/Challenges/Challengesjupyter.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 804c485b5..5e26ac86e 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -206,7 +206,8 @@ class Challengesjupyter extends Component {
axios.get(url, {params: data})
.then((result) => {
if (result.data.status === 0) {
- this.props.showNotification(`应用成功`);
+ // this.props.showNotification(`应用成功`);
+ console.log("应用成功了");
}
}).catch((error) => {
})
From 8fcb7b9e259c2f9fbc6ec15624ceb9cf0d400470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:56:09 +0800
Subject: [PATCH 27/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/TPMBanner.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index c122289bb..bb07df5df 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -868,8 +868,8 @@ class TPMBanner extends Component {
- {
- this.props.is_jupyter===true?"":
+ {/*{*/}
+ {/* this.props.is_jupyter===true?"":*/}
@@ -934,7 +934,7 @@ class TPMBanner extends Component {
- }
+ // }
{
From 5cf64eb4c12e07235edf223ce0283a5c1fd8af5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:57:52 +0800
Subject: [PATCH 28/63] =?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/tpm/shixunchild/Challenges/Challengesjupyter.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 5e26ac86e..e137dc883 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -354,11 +354,11 @@ class Challengesjupyter extends Component {
+
+
+
+ );
+ });
+
+ const oUl = (
+
- 任务详情
（请将实训题目写在下方并保存）
this.modifyjupyter(this.state)}>导入*/}
{/*
*/}
{
enlarge===true?
- this.onclki(false)}>
:
- this.onclki(true)}>
}
From de957b68d753287027e6b5e00e85bb7a936d5b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 14:59:49 +0800
Subject: [PATCH 29/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/shixunchildCss/Challenges.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
index d18370a51..1e1945f89 100644
--- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
+++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css
@@ -187,7 +187,7 @@
}
.ysliconfont{
text-align: center;
- line-height: 30px;
+ line-height: 29px;
}
.fangdaone{
From f33bc9e22dc2b95407de906068c31e34e25c3082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 15:07:03 +0800
Subject: [PATCH 30/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/TPMBanner.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index bb07df5df..0a123e73a 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -934,7 +934,7 @@ class TPMBanner extends Component {
- // }
+ {/*// }*/}
{
From 76a67e76711d7752ec3abce64ec0388715ec36f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 16:10:33 +0800
Subject: [PATCH 31/63] =?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/tpm/shixunchild/Challenges/Challengesjupyter.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index e137dc883..bf98054d7 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -98,8 +98,11 @@ class Challengesjupyter extends Component {
if(response.data.status===0){
setTimeout(() => {
+
+ var url=response.data.url;
+ var url2=url.replace("http://","https://");
this.setState({
- jupyter_url:response.data.url,
+ jupyter_url:url2,
jupyter_port:response.data.port,
booljupyterurls:true,
})
From a0502bf4ed48385e21aacf89585877de855e860a Mon Sep 17 00:00:00 2001
From: guagne <8863824@gmail.com>
Date: Fri, 20 Dec 2019 16:12:26 +0800
Subject: [PATCH 32/63] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BB=B6=E6=97=B6?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/jupyters_controller.rb | 13 ++++++++++++-
app/services/jupyter_service.rb | 21 +++++++++++++++++++++
config/routes.rb | 2 ++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/app/controllers/jupyters_controller.rb b/app/controllers/jupyters_controller.rb
index 96ebf3452..4c03e0dd3 100644
--- a/app/controllers/jupyters_controller.rb
+++ b/app/controllers/jupyters_controller.rb
@@ -42,5 +42,16 @@ class JupytersController < ApplicationController
render json: {status: 0, url: info[:url], port: info[:port]}
end
+ def active_with_tpm
+ shixun = Shixun.find_by(identifier: params[:identifier])
+ jupyter_active_tpm(shixun)
+ render json: {status: 0}
+ end
+
+ def active_with_tpi
+ myshixun = Myshixun.find_by(identifier: params[:identifier])
+ jupyter_active_tpm(myshixun)
+ render json: {status: 0}
+ end
-end
\ No newline at end of file
+end
diff --git a/app/services/jupyter_service.rb b/app/services/jupyter_service.rb
index 0f5af6cb8..bff9b5dc6 100644
--- a/app/services/jupyter_service.rb
+++ b/app/services/jupyter_service.rb
@@ -191,5 +191,26 @@ module JupyterService
edu_setting('jupyter_service').gsub("PORT", jupyter_port)
end
+ def _jupyter_active(tpiID)
+ shixun_tomcat = edu_setting('cloud_bridge')
+ uri = "#{shixun_tomcat}/bridge/jupyter/active"
+ params = {:tpiID => tpiID}
+ res = uri_post uri, params
+ if res && res['code'].to_i != 0
+ raise("实训云平台繁忙（繁忙等级：120）")
+ end
+ end
+
+ # tpm 延时
+ def jupyter_active_tpm(shixun)
+ tpiID = "tpm#{shixun.id}"
+ _jupyter_active(tpiID)
+ end
+
+ # tpi 延时
+ def jupyter_active_tpi(myshixun)
+ tpiID = myshixun.id
+ _jupyter_active(tpiID)
+ end
end
diff --git a/config/routes.rb b/config/routes.rb
index 0d2aba843..151cc0b32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,6 +33,8 @@ Rails.application.routes.draw do
get :get_info_with_tpm
get :reset_with_tpi
get :reset_with_tpm
+ get :active_with_tpm
+ get :active_with_tpi
end
end
From a5077c3011fd657f1ade30cc8de7362275cf73dd 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, 20 Dec 2019 16:23:43 +0800
Subject: [PATCH 33/63] =?UTF-8?q?jupytertpi=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/public/js/jupyter.js | 17 +++-
public/react/src/modules/page/VNC.css | 2 +-
public/react/src/modules/tpm/jupyter/index.js | 93 +++++++++++++++++--
.../react/src/modules/tpm/jupyter/index.scss | 57 +++++++++++-
.../modules/tpm/jupyter/leftPane/index.scss | 11 ++-
.../Challenges/Challengesjupyter.js | 2 -
6 files changed, 162 insertions(+), 20 deletions(-)
diff --git a/public/react/public/js/jupyter.js b/public/react/public/js/jupyter.js
index 97a0face2..361287317 100644
--- a/public/react/public/js/jupyter.js
+++ b/public/react/public/js/jupyter.js
@@ -1,9 +1,16 @@
+/*
+ * @Author: your name
+ * @Date: 2019-12-20 11:40:56
+ * @LastEditTime : 2019-12-20 13:38:49
+ * @LastEditors : Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /notebook/Users/yangshuming/Desktop/new__educode/educoder/public/react/public/js/jupyter.js
+ */
window.onload=function(){
- // require(["base/js/namespace"],function(Jupyter) {
- // Jupyter.notebook.save_checkpoint();
- // });
- $('.navbar-nav').children().eq(7).css({'display':'none'})
- console.log($('.navbar-nav').children().eq(7))
+ require(["base/js/namespace"],function(Jupyter) {
+ Jupyter.notebook.save_checkpoint();
+ });
+
}
diff --git a/public/react/src/modules/page/VNC.css b/public/react/src/modules/page/VNC.css
index e29335242..d59d91121 100644
--- a/public/react/src/modules/page/VNC.css
+++ b/public/react/src/modules/page/VNC.css
@@ -38,5 +38,5 @@
}
.newjupyter_float_button{
- right: 257px;
+ right: 330px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 7425a4732..617ef0936 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -9,7 +9,7 @@
import './index.scss';
import React, { useEffect, useState } from 'react';
import SplitPane from 'react-split-pane';
-import { Button, Modal,Drawer } from 'antd';
+import { Button, Modal,Drawer ,Pagination,Empty,Tooltip,Icon,message} from 'antd';
import {
connect
} from 'react-redux';
@@ -18,6 +18,25 @@ import UserInfo from '../../developer/components/userInfo';
import actions from '../../../redux/actions';
import LeftPane from './leftPane';
import RightPane from './rightPane';
+import MyIcon from "../../../common/components/MyIcon";
+function jsCopy(s) {
+ var copyEle = document.getElementById(s);
+ const range = document.createRange(); // 创造range
+ window.getSelection().removeAllRanges(); //清除页面中已有的selection
+ range.selectNode(copyEle); // 选中需要复制的节点
+ window.getSelection().addRange(range); // 执行选中元素
+ const copyStatus = document.execCommand("Copy"); // 执行copy操作
+ // 对成功与否定进行提示
+ copyStatuss(copyStatus)
+}
+
+function copyStatuss(copyStatus){
+ if (copyStatus) {
+ message.success('复制成功');
+ } else {
+ message.error('复制失败');
+ }
+}
function JupyterTPI (props) {
// 获取 identifier 值
@@ -45,11 +64,17 @@ function JupyterTPI (props) {
drawervisible,
} = props;
+ const emptyCtx = (
+
+
+ );
const {identifier} = params;
const [userInfo, setUserInfo] = useState({});
const [jupyterInfo, setJupyterInfo] = useState({});
const [updateTip, setUpdateTip] = useState(true);
const [myIdentifier, setMyIdentifier] = useState('');
+ const [renderCtx, setRenderCtx] = useState(() => (emptyCtx));
useEffect(() => {
/* 先调用 jupyter的 TPI 接口，
* 获取 用户信息,
@@ -170,6 +195,45 @@ function JupyterTPI (props) {
const firstDrawerWidth = ()=>{
return 260
};
+
+ // 分页处理
+ const handleChangePage = (page) => {
+ // console.log(page, pageSize);
+ handlePageChange(page);
+ }
+ // const listCtx = ;
+ useEffect(() => {
+ if (dataSets.length > 0) {
+ console.log('数据集的个数: ', dataSets.length);
+ const oList = dataSets.map((item, i) => {
+ return (
+ -
+ { oList }
+
@@ -206,8 +270,8 @@ function JupyterTPI (props) {
{/*
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 5fdfcb02c..76c8bedd1 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -103,4 +103,59 @@
font-size: 14px;
}
}
-}
\ No newline at end of file
+}
+
+.RightPaneDrawer{
+ .RightPaneDrawertop{
+ width:330px;
+ height:29px;
+ background:rgba(17,28,36,1);
+ }
+
+ .ant-drawer-content-wrapper{
+ width:330px !important;
+ box-shadow: -2px 0 8px #070F1A !important;
+ }
+ .ant-drawer-body{
+ padding: 0px;
+ }
+ .ant-drawer-wrapper-body{
+ padding-top: 60px;
+ background: #070F1A;
+ overflow: hidden !important;
+ }
+
+ .ant-pagination{
+ color:#fff !important;
+ }
+
+}
+
+.newjupyter_data_sets_area{
+ background:#070F1A !important;
+ .jupyter_h2_title {
+ height:49px;
+ line-height: 49px;
+ background: #070F1A !important;
+ border-bottom: 1px solid #17212F !important;
+ color:#FFFFFF !important;
+ border-top: 1px solid #17212F !important;
+ }
+ .iconfont{
+ color:#28b887!important;
+ font-size: 30px !important;
+ margin-right: 20px;
+ }
+ .jupyter_pagination{
+ border-top: 1px solid #070F1A !important;
+ }
+
+ .jupyter_name{
+ color:#FFFFFF !important;
+ }
+ .file_path_input{
+ position: absolute;
+ right: -50%;
+ }
+}
+
diff --git a/public/react/src/modules/tpm/jupyter/leftPane/index.scss b/public/react/src/modules/tpm/jupyter/leftPane/index.scss
index 352e1c9ab..495e21f20 100644
--- a/public/react/src/modules/tpm/jupyter/leftPane/index.scss
+++ b/public/react/src/modules/tpm/jupyter/leftPane/index.scss
@@ -2,15 +2,15 @@
height: 100%;
background: #fff;
.jupyter_h2_title{
- height: 44px;
- line-height: 44px;
+ //height: 44px;
+ //line-height: 44px;
// background-color: #EEEEEE;
background: #fff;
padding: 0 20px;
font-size: 16px;
// box-size: border-box;
box-sizing: border-box;
- border-bottom: 1px solid rgba(238,238,238,1);
+ //border-bottom: 1px solid rgba(238,238,238,1);
.jupyter_data_icon{
// color: #7286ff;
color: #1890ff;
@@ -24,14 +24,15 @@
.jupyter_data_list,
.jupyter_empty{
- height: calc(100vh - 160px);
+ //height: calc(100vh - 160px);
+ min-height: 350px;
overflow-y: auto;
}
.jupyter_data_list{
.jupyter_item{
line-height:45px;
- border-bottom: 1px solid rgba(238,238,238, 1);
+ //border-bottom: 1px solid rgba(238,238,238, 1);
padding: 0 30px 0 60px;
overflow: hidden;
text-overflow:ellipsis;
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index f11f03b6b..995753dff 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -410,8 +410,6 @@ class Challengesjupyter extends Component {
*/}
- {/*
-
Some contents...
-Some contents...
-Some contents...
+ +
+
+ {/*
+ { renderCtx }
+
+ {/*
+ { renderCtx }
+
+ {total<20?"":
+
+
diff --git a/public/react/src/modules/tpm/jupyter/rightPane/index.js b/public/react/src/modules/tpm/jupyter/rightPane/index.js
index 020639abc..d23849369 100644
--- a/public/react/src/modules/tpm/jupyter/rightPane/index.js
+++ b/public/react/src/modules/tpm/jupyter/rightPane/index.js
@@ -65,13 +65,13 @@ function RightPane (props) {
className='jupyter_iframe_style'
>
-
-
-
+ {/**/}
+ {/* 保存*/}
+ {/*
*/}
this.daoruzhon()}>导入
+
{/*关卡任务的代码文件有更新啦
更新操作将保留已完成的评测记录和成绩
还未完成评测的任务代码，请自行保存
@@ -128,21 +149,17 @@ function JupyterTPI (props) {
cancelText: '取消',
onOk () {
syncJupyterCode(myshixun_identifier, '同步成功');
- }
+ },onCancel() {
+ stopposttpip(2)
+ },
})
}
}, [props]);
+
// 重置实训
const handleClickResetTpi = () => {
-
- var _iframe = document.getElementById("rightPaneframe");
- if(_iframe == null || _iframe == undefined || _iframe == ""){
- return;
- }
- _iframe.contentWindow.postMessage("stopParent", "*");
-
-
+ stopposttpip(1)
Modal.confirm({
title: '重置实训',
content: (
@@ -160,7 +177,7 @@ function JupyterTPI (props) {
}
},
onCancel() {
- _iframe.contentWindow.postMessage("clonsParent", "*");
+ stopposttpip(2)
},
})
}
@@ -168,6 +185,7 @@ function JupyterTPI (props) {
// 重置环境
const handleEnvironmentTpi = () => {
+ stopposttpip(1)
Modal.confirm({
title: '重置环境',
content: (
@@ -179,11 +197,14 @@ function JupyterTPI (props) {
okText: '确定',
cancelText: '取消',
onOk () {
- // console.log('调用重置代码....', myIdentifier);
- // if (myIdentifier) {
- // syncJupyterCode(myIdentifier, '重置成功');
- // }
- }
+ console.log('调用重置代码....', myIdentifier);
+ if (myIdentifier) {
+ reset_with_tpi(myIdentifier, '重置成功');
+ }
+ },
+ onCancel() {
+ stopposttpip(2)
+ },
})
}
@@ -265,14 +286,17 @@ function JupyterTPI (props) {
}
}, [props]);
+ const deadline = Date.now() + 7200 * 1000; // Moment is also OK
return (
- {jupyterInfo.name}
-
+ {jupyterInfo.name}
+
+
{/* sync | poweroff */}
@@ -384,6 +408,8 @@ const mapDispatchToProps = (dispatch) => ({
getJupyterInfo: (identifier) => dispatch(actions.getJupyterInfo(identifier)),
// 重置代码
syncJupyterCode: (identifier, msg) => dispatch(actions.syncJupyterCode(identifier, msg)),
+ // 重置代码
+ reset_with_tpi: (identifier, msg) => dispatch(actions.reset_with_tpi(identifier, msg)),
getJupyterTpiDataSet: (identifier, current) => dispatch(actions.getJupyterTpiDataSet(identifier, current)),
getJupyterTpiUrl: (identifier) => dispatch(actions.getJupyterTpiUrl(identifier)),
saveJupyterTpi: () => dispatch(actions.saveJupyterTpi()),
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 76c8bedd1..2fbb0f4fd 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -159,3 +159,12 @@
}
}
+.jupytertitle_time{
+ .ant-statistic-content{
+ font-size: 20px !important;
+ }
+ .ant-statistic-content-value{
+ color:#fff !important;
+ font-size: 17px !important;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index a08825936..5fcc53bd3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -146,7 +146,7 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
- console.log("触发了jupytermessage");
+
console.log(e);
if(e){
if(e.data){
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 23647ec4a..6b8f01fa5 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -74,6 +74,7 @@ import {
saveJupyterTpi,
changeCurrentPage,
changeshowDrawer,
+ reset_with_tpi,
} from './jupyter';
export default {
@@ -129,6 +130,7 @@ export default {
changeGetJupyterUrlState,
saveJupyterTpi,
changeCurrentPage,
- changeshowDrawer
+ changeshowDrawer,
+ reset_with_tpi
// isUpdateCodeCtx
}
\ No newline at end of file
diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js
index 73bc30a42..22804be51 100644
--- a/public/react/src/redux/actions/jupyter.js
+++ b/public/react/src/redux/actions/jupyter.js
@@ -13,6 +13,7 @@ import {
fetchJupyterTpiUrl,
fetchJupyterInfo,
fetchSyncJupyterCode,
+ fetchreset_with_tpi,
fetchSaveJupyterTpi
} from "../../services/jupyterServer";
@@ -110,6 +111,30 @@ export const syncJupyterCode = (identifier, msg) => {
})
}
}
+
+// 重置环境
+export const reset_with_tpi = (identifier, msg) => {
+ return (dispatch,getState) => {
+ const {jupyter_info }= getState().jupyterReducer;
+ if (!jupyter_info.myshixun_identifier) return;
+ const params = {
+ identifier: jupyter_info.myshixun_identifier,
+ };
+ fetchreset_with_tpi(params).then(res => {
+ // console.log('同步代码成功: ', res);
+ if (res.data.status === 401) return;
+ if (res.status === 200) {
+ const {status} = res.data
+ if (status === 0) {
+ message.success(msg);
+ setTimeout(() => {
+ window.location.reload();
+ }, 300);
+ }
+ }
+ })
+ }
+}
// 改变状态值
export const changeGetJupyterUrlState = (status) => {
return {
diff --git a/public/react/src/services/jupyterServer.js b/public/react/src/services/jupyterServer.js
index 059aace5e..8f512d8ef 100644
--- a/public/react/src/services/jupyterServer.js
+++ b/public/react/src/services/jupyterServer.js
@@ -34,8 +34,8 @@ export async function fetchSaveJupyterTpi (params) {
return axios.get(url, { params });
}
-// 重置jupyter 保存
-// export async function reset_with_tpi (params) {
-// const url = `/jupyters/reset_with_tpi.json`;
-// return axios.get(url, { params });
-// }
\ No newline at end of file
+//重置jupyter 环境
+export async function fetchreset_with_tpi (params) {
+ const url = `/jupyters/reset_with_tpi.json`;
+ return axios.get(url, { params });
+}
\ No newline at end of file
From 7b3d81ebca32bb91faeba44d2e4ba16854c8422e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:22:22 +0800
Subject: [PATCH 60/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c55830c44..c79346e6d 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -16,7 +16,7 @@ function runEvery10Sec() {
});
window.parent.postMessage('jupytermessage','*');
if(timebool===true){
- setTimeout( runEvery10Sec, 1000 * 10 );
+ // setTimeout( runEvery10Sec, 1000 * 10 );
}
}
From e3d7ef3bca150f6b9a52ed9e1bcca45f97ce881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:22:41 +0800
Subject: [PATCH 61/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c79346e6d..664fc5309 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -3,14 +3,14 @@
var timebool=false;
window.onload=function(){
- console.log("开始发送消息了");
+ console.log("开始发送消息了1");
timebool=true;
runEvery10Sec();
}
function runEvery10Sec() {
// 1000 * 10 = 10 秒钟
- console.log("每隔10秒中一次");
+ console.log("开始发送消息了2");
require(["base/js/namespace"],function(Jupyter) {
Jupyter.notebook.save_checkpoint();
});
From 594b39d027999e732a1d3333d71743f50c022c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:25:30 +0800
Subject: [PATCH 62/63] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 5ae7de9ea..6a78e6e1a 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -482,7 +482,7 @@ class Challengesjupyter extends Component {
this.Importingfiles()}>导入
+ className="challenbaocuntest" type="upload" >导入
From 3ea0a3fe979fd964ca4741b97da3f69c76f1b4ab 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, 20 Dec 2019 21:51:25 +0800
Subject: [PATCH 63/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/jupyter/index.js | 41 +++++++++++++++----
public/react/src/redux/actions/actionTypes.js | 2 +
public/react/src/redux/actions/index.js | 6 ++-
public/react/src/redux/actions/jupyter.js | 38 ++++++++++++++++-
.../react/src/redux/reducers/commonReducer.js | 8 +++-
public/react/src/services/jupyterServer.js | 6 +++
6 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index d628380c8..f2e55e925 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -18,7 +18,7 @@ import UserInfo from '../../developer/components/userInfo';
import actions from '../../../redux/actions';
import LeftPane from './leftPane';
import RightPane from './rightPane';
-const { Countdown } = Statistic;
+
import MyIcon from "../../../common/components/MyIcon";
function jsCopy(s) {
var copyEle = document.getElementById(s);
@@ -64,6 +64,8 @@ function JupyterTPI (props) {
changeshowDrawer,
drawervisible,
reset_with_tpi,
+ jupytertime,
+ active_with_tpi
} = props;
const emptyCtx = (
@@ -71,6 +73,7 @@ function JupyterTPI (props) {
+ Jupyter将中断服务，是否需要延长使用时间？
+
+ ),
+ okText: '确定',
+ cancelText: '取消',
+ onOk () {
+ active_with_tpi(myIdentifier, '重置成功');
+ }
+ })
+ }
return (
@@ -297,7 +315,7 @@ function JupyterTPI (props) {
{jupyterInfo.name}
-
@@ -391,7 +409,7 @@ const mapStateToProps = (state) => {
jupyter_pagination,
jupyter_identifier
} = state.jupyterReducer;
- const { loading ,drawervisible} = state.commonReducer;
+ const { loading ,drawervisible,jupytertime} = state.commonReducer;
return {
loading,
jupyter_info,
@@ -402,6 +420,7 @@ const mapStateToProps = (state) => {
pagination: jupyter_pagination,
jupyter_identifier,
drawervisible,
+ jupytertime
};
}
@@ -418,7 +437,11 @@ const mapDispatchToProps = (dispatch) => ({
changeLoadingState: (flag) => dispatch(actions.changeLoadingState(flag)),
changeCurrentPage: (current) => dispatch(actions.changeCurrentPage(current)),
//展开Drawer
- changeshowDrawer: (type) => dispatch(actions.changeshowDrawer(type))
+ changeshowDrawer: (type) => dispatch(actions.changeshowDrawer(type)),
+ //倒计时增加
+ addjypertime: (type) => dispatch(actions.addjypertime(type)),
+ //延时
+ active_with_tpi:(identifier, msg) => dispatch(actions.active_with_tpi(identifier, msg)),
});
export default connect(
diff --git a/public/react/src/redux/actions/actionTypes.js b/public/react/src/redux/actions/actionTypes.js
index 2ef96941f..f31da4f20 100644
--- a/public/react/src/redux/actions/actionTypes.js
+++ b/public/react/src/redux/actions/actionTypes.js
@@ -64,6 +64,8 @@ const types = {
SAVE_NOTICE_COUNT: 'SAVE_NOTICE_COUNT', // 保存代码块是否更新
AUTO_UPDATE_CODE: 'AUTO_UPDATE_CODE', // 自动更新代码
CHANGE_SHOW_DRAWER: 'CHANGE_SHOW_DRAWER',
+ CHANGE_JYPYTER_TIME: 'CHANGE_JYPYTER_TIME',//增加15分钟
+ CHANGE_EXTENDED_TIME: 'CHANGE_EXTENDED_TIME',//延时
}
export default types;
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 6b8f01fa5..7fe6db649 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -75,6 +75,8 @@ import {
changeCurrentPage,
changeshowDrawer,
reset_with_tpi,
+ addjypertime,
+ active_with_tpi
} from './jupyter';
export default {
@@ -131,6 +133,8 @@ export default {
saveJupyterTpi,
changeCurrentPage,
changeshowDrawer,
- reset_with_tpi
+ reset_with_tpi,
+ addjypertime,
+ active_with_tpi,
// isUpdateCodeCtx
}
\ No newline at end of file
diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js
index 22804be51..ce9dcaa6b 100644
--- a/public/react/src/redux/actions/jupyter.js
+++ b/public/react/src/redux/actions/jupyter.js
@@ -14,7 +14,8 @@ import {
fetchJupyterInfo,
fetchSyncJupyterCode,
fetchreset_with_tpi,
- fetchSaveJupyterTpi
+ fetchSaveJupyterTpi,
+ fetactive_with_tpi
} from "../../services/jupyterServer";
// 获取 jupyter 相关信息
@@ -135,6 +136,30 @@ export const reset_with_tpi = (identifier, msg) => {
})
}
}
+
+// 延时
+export const active_with_tpi = (identifier, msg) => {
+ return (dispatch,getState) => {
+ const {jupyter_info }= getState().jupyterReducer;
+ if (!jupyter_info.myshixun_identifier) return;
+ const params = {
+ identifier: jupyter_info.myshixun_identifier,
+ };
+ fetactive_with_tpi(params).then(res => {
+ // console.log('同步代码成功: ', res);
+ if (res.data.status === 401) return;
+ if (res.status === 200) {
+ const {status} = res.data
+ if (status === 0) {
+ message.success(msg);
+ addjypertime(Date.now() + 900 * 1000);
+ }
+ }
+ })
+ }
+}
+
+
// 改变状态值
export const changeGetJupyterUrlState = (status) => {
return {
@@ -187,4 +212,13 @@ export const changeshowDrawer = (type) => {
type: types.CHANGE_SHOW_DRAWER,
payload: type
}
-}
\ No newline at end of file
+}
+//增加倒计时
+export const addjypertime=(time)=>{
+ return {
+ type: types.CHANGE_JYPYTER_TIME,
+ payload: time
+ }
+}
+
+
diff --git a/public/react/src/redux/reducers/commonReducer.js b/public/react/src/redux/reducers/commonReducer.js
index 4d38b75ad..82910812d 100644
--- a/public/react/src/redux/reducers/commonReducer.js
+++ b/public/react/src/redux/reducers/commonReducer.js
@@ -15,7 +15,8 @@ const initialState = {
submitLoading: false, // 提交按钮状态
publishLoading: false, // 发布
isMySource: false,
- drawervisible:false
+ drawervisible:false,
+ jupytertime:Date.now() + 3600 * 1000,
}
const commonReducer = (state = initialState, action) => {
@@ -56,6 +57,11 @@ const commonReducer = (state = initialState, action) => {
...state,
drawervisible: action.payload
}
+ case types.CHANGE_JYPYTER_TIME:
+ return {
+ ...state,
+ jupytertime: action.payload
+ }
default:
return state;
}
diff --git a/public/react/src/services/jupyterServer.js b/public/react/src/services/jupyterServer.js
index 8f512d8ef..37c86a3a2 100644
--- a/public/react/src/services/jupyterServer.js
+++ b/public/react/src/services/jupyterServer.js
@@ -38,4 +38,10 @@ export async function fetchSaveJupyterTpi (params) {
export async function fetchreset_with_tpi (params) {
const url = `/jupyters/reset_with_tpi.json`;
return axios.get(url, { params });
+}
+
+//延时jupyter
+export async function fetactive_with_tpi(params) {
+ const url = `/jupyters/active_with_tpi.json`;
+ return axios.get(url, { params });
}
\ No newline at end of file
-
}
From 1c9491773ca6dc22f196571ff58aa29a039795cc 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, 20 Dec 2019 21:20:50 +0800
Subject: [PATCH 59/63] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 20 +++---
public/react/src/modules/tpm/jupyter/index.js | 70 +++++++++++++------
.../react/src/modules/tpm/jupyter/index.scss | 9 +++
.../Challenges/Challengesjupyter.js | 2 +-
public/react/src/redux/actions/index.js | 4 +-
public/react/src/redux/actions/jupyter.js | 25 +++++++
public/react/src/services/jupyterServer.js | 10 +--
7 files changed, 101 insertions(+), 39 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c55830c44..5ffd34dd4 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -5,23 +5,24 @@ var timebool=false;
window.onload=function(){
console.log("开始发送消息了");
timebool=true;
- runEvery10Sec();
+ // runEvery10Sec();
}
function runEvery10Sec() {
// 1000 * 10 = 10 秒钟
- console.log("每隔10秒中一次");
+ // console.log("每隔10秒中一次");
require(["base/js/namespace"],function(Jupyter) {
Jupyter.notebook.save_checkpoint();
});
window.parent.postMessage('jupytermessage','*');
- if(timebool===true){
- setTimeout( runEvery10Sec, 1000 * 10 );
- }
+ // if(timebool===true){
+ // setTimeout( runEvery10Sec, 1000 * 10 );
+ // }
}
-$(function(){
+window.onload=function(){
+
document.addEventListener('keydown', (e) => {
if (e.keyCode == 83 && (navigator.platform.match("Mac") ? e.metaKey : e.ctrlKey)){
e.preventDefault();
@@ -29,6 +30,7 @@ document.addEventListener('keydown', (e) => {
window.parent.postMessage('jupytermessage','*');
}
});
+
window.addEventListener('message', (e) => {
if(e){
if(e.data){
@@ -40,12 +42,10 @@ document.addEventListener('keydown', (e) => {
console.log("父窗口调用启动");
//取消启动
timebool=true;
- runEvery10Sec();
+ // runEvery10Sec();
}
}
}
});
-})
-
-
+}
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index b5c1ff217..4a18f5ac3 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -9,7 +9,7 @@
import './index.scss';
import React, { useEffect, useState } from 'react';
import SplitPane from 'react-split-pane';
-import { Button, Modal,Drawer ,Pagination,Empty,Tooltip,Icon,message} from 'antd';
+import { Button, Modal,Drawer ,Pagination,Empty,Tooltip,Icon,message,Statistic} from 'antd';
import {
connect
} from 'react-redux';
@@ -18,6 +18,7 @@ import UserInfo from '../../developer/components/userInfo';
import actions from '../../../redux/actions';
import LeftPane from './leftPane';
import RightPane from './rightPane';
+const { Countdown } = Statistic;
import MyIcon from "../../../common/components/MyIcon";
function jsCopy(s) {
var copyEle = document.getElementById(s);
@@ -62,6 +63,7 @@ function JupyterTPI (props) {
changeCurrentPage,
changeshowDrawer,
drawervisible,
+ reset_with_tpi,
} = props;
const emptyCtx = (
@@ -89,20 +91,37 @@ function JupyterTPI (props) {
}
- });
+ })
}
+ const stopposttpip=(sum)=>{
+ var _iframe = document.getElementById("rightPaneframe");
+ if(_iframe == null || _iframe == undefined || _iframe == ""){
+ return;
+ }
+ if(sum===1){
+ _iframe.contentWindow.postMessage("stopParent", "*");
+ }else{
+ _iframe.contentWindow.postMessage("clonsParent", "*");
+ }
+
+ }
+
+
+ useEffect(() => {
+ addEventListeners()
+ }, []);
useEffect(() => {
- /* 先调用 jupyter的 TPI 接口，
- * 获取 用户信息,
+ /* 先调用 jupyter的 TPI 接口，
+ * 获取 用户信息,
* 实训的 identifier, 状态， 名称， 是否被修改等信息
*/
- addEventListeners()
getJupyterInfo(identifier);
}, [identifier]);
useEffect(() => {
+
// 设置jupyter信息
setJupyterInfo(jupyter_info || {});
const {user, tpm_modified, myshixun_identifier} = jupyter_info;
@@ -116,10 +135,12 @@ function JupyterTPI (props) {
// 同步代码
if (tpm_modified && updateTip && myshixun_identifier) {
+
setUpdateTip(false);
Modal.confirm({
title: '更新通知',
content: (
+ {stopposttpip(1)}
关卡任务的代码文件有更新啦
更新操作将保留已完成的评测记录和成绩
还未完成评测的任务代码，请自行保存
@@ -128,21 +149,17 @@ function JupyterTPI (props) { cancelText: '取消', onOk () { syncJupyterCode(myshixun_identifier, '同步成功'); - } + },onCancel() { + stopposttpip(2) + }, }) } }, [props]); + // 重置实训 const handleClickResetTpi = () => { - - var _iframe = document.getElementById("rightPaneframe"); - if(_iframe == null || _iframe == undefined || _iframe == ""){ - return; - } - _iframe.contentWindow.postMessage("stopParent", "*"); - - + stopposttpip(1) Modal.confirm({ title: '重置实训', content: ( @@ -160,7 +177,7 @@ function JupyterTPI (props) { } }, onCancel() { - _iframe.contentWindow.postMessage("clonsParent", "*"); + stopposttpip(2) }, }) } @@ -168,6 +185,7 @@ function JupyterTPI (props) { // 重置环境 const handleEnvironmentTpi = () => { + stopposttpip(1) Modal.confirm({ title: '重置环境', content: ( @@ -179,11 +197,14 @@ function JupyterTPI (props) { okText: '确定', cancelText: '取消', onOk () { - // console.log('调用重置代码....', myIdentifier); - // if (myIdentifier) { - // syncJupyterCode(myIdentifier, '重置成功'); - // } - } + console.log('调用重置代码....', myIdentifier); + if (myIdentifier) { + reset_with_tpi(myIdentifier, '重置成功'); + } + }, + onCancel() { + stopposttpip(2) + }, }) } @@ -265,14 +286,17 @@ function JupyterTPI (props) { } }, [props]); + const deadline = Date.now() + 7200 * 1000; // Moment is also OK return (
- {jupyterInfo.name}
-
+ {jupyterInfo.name}
+
+
{/* sync | poweroff */}
@@ -384,6 +408,8 @@ const mapDispatchToProps = (dispatch) => ({
getJupyterInfo: (identifier) => dispatch(actions.getJupyterInfo(identifier)),
// 重置代码
syncJupyterCode: (identifier, msg) => dispatch(actions.syncJupyterCode(identifier, msg)),
+ // 重置代码
+ reset_with_tpi: (identifier, msg) => dispatch(actions.reset_with_tpi(identifier, msg)),
getJupyterTpiDataSet: (identifier, current) => dispatch(actions.getJupyterTpiDataSet(identifier, current)),
getJupyterTpiUrl: (identifier) => dispatch(actions.getJupyterTpiUrl(identifier)),
saveJupyterTpi: () => dispatch(actions.saveJupyterTpi()),
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 76c8bedd1..2fbb0f4fd 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -159,3 +159,12 @@
}
}
+.jupytertitle_time{
+ .ant-statistic-content{
+ font-size: 20px !important;
+ }
+ .ant-statistic-content-value{
+ color:#fff !important;
+ font-size: 17px !important;
+ }
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index a08825936..5fcc53bd3 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -146,7 +146,7 @@ class Challengesjupyter extends Component {
window.addEventListener('message', (e) => {
- console.log("触发了jupytermessage");
+
console.log(e);
if(e){
if(e.data){
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 23647ec4a..6b8f01fa5 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -74,6 +74,7 @@ import {
saveJupyterTpi,
changeCurrentPage,
changeshowDrawer,
+ reset_with_tpi,
} from './jupyter';
export default {
@@ -129,6 +130,7 @@ export default {
changeGetJupyterUrlState,
saveJupyterTpi,
changeCurrentPage,
- changeshowDrawer
+ changeshowDrawer,
+ reset_with_tpi
// isUpdateCodeCtx
}
\ No newline at end of file
diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js
index 73bc30a42..22804be51 100644
--- a/public/react/src/redux/actions/jupyter.js
+++ b/public/react/src/redux/actions/jupyter.js
@@ -13,6 +13,7 @@ import {
fetchJupyterTpiUrl,
fetchJupyterInfo,
fetchSyncJupyterCode,
+ fetchreset_with_tpi,
fetchSaveJupyterTpi
} from "../../services/jupyterServer";
@@ -110,6 +111,30 @@ export const syncJupyterCode = (identifier, msg) => {
})
}
}
+
+// 重置环境
+export const reset_with_tpi = (identifier, msg) => {
+ return (dispatch,getState) => {
+ const {jupyter_info }= getState().jupyterReducer;
+ if (!jupyter_info.myshixun_identifier) return;
+ const params = {
+ identifier: jupyter_info.myshixun_identifier,
+ };
+ fetchreset_with_tpi(params).then(res => {
+ // console.log('同步代码成功: ', res);
+ if (res.data.status === 401) return;
+ if (res.status === 200) {
+ const {status} = res.data
+ if (status === 0) {
+ message.success(msg);
+ setTimeout(() => {
+ window.location.reload();
+ }, 300);
+ }
+ }
+ })
+ }
+}
// 改变状态值
export const changeGetJupyterUrlState = (status) => {
return {
diff --git a/public/react/src/services/jupyterServer.js b/public/react/src/services/jupyterServer.js
index 059aace5e..8f512d8ef 100644
--- a/public/react/src/services/jupyterServer.js
+++ b/public/react/src/services/jupyterServer.js
@@ -34,8 +34,8 @@ export async function fetchSaveJupyterTpi (params) {
return axios.get(url, { params });
}
-// 重置jupyter 保存
-// export async function reset_with_tpi (params) {
-// const url = `/jupyters/reset_with_tpi.json`;
-// return axios.get(url, { params });
-// }
\ No newline at end of file
+//重置jupyter 环境
+export async function fetchreset_with_tpi (params) {
+ const url = `/jupyters/reset_with_tpi.json`;
+ return axios.get(url, { params });
+}
\ No newline at end of file
From 7b3d81ebca32bb91faeba44d2e4ba16854c8422e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:22:22 +0800
Subject: [PATCH 60/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c55830c44..c79346e6d 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -16,7 +16,7 @@ function runEvery10Sec() {
});
window.parent.postMessage('jupytermessage','*');
if(timebool===true){
- setTimeout( runEvery10Sec, 1000 * 10 );
+ // setTimeout( runEvery10Sec, 1000 * 10 );
}
}
From e3d7ef3bca150f6b9a52ed9e1bcca45f97ce881e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:22:41 +0800
Subject: [PATCH 61/63] =?UTF-8?q?=E8=B0=83=E6=95=B4jupyter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/javascripts/jupyter.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/javascripts/jupyter.js b/public/javascripts/jupyter.js
index c79346e6d..664fc5309 100644
--- a/public/javascripts/jupyter.js
+++ b/public/javascripts/jupyter.js
@@ -3,14 +3,14 @@
var timebool=false;
window.onload=function(){
- console.log("开始发送消息了");
+ console.log("开始发送消息了1");
timebool=true;
runEvery10Sec();
}
function runEvery10Sec() {
// 1000 * 10 = 10 秒钟
- console.log("每隔10秒中一次");
+ console.log("开始发送消息了2");
require(["base/js/namespace"],function(Jupyter) {
Jupyter.notebook.save_checkpoint();
});
From 594b39d027999e732a1d3333d71743f50c022c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 20 Dec 2019 21:25:30 +0800
Subject: [PATCH 62/63] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index 5ae7de9ea..6a78e6e1a 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -482,7 +482,7 @@ class Challengesjupyter extends Component {
this.Importingfiles()}>导入
+ Jupyter将中断服务，是否需要延长使用时间？ +
+ ), + okText: '确定', + cancelText: '取消', + onOk () { + active_with_tpi(myIdentifier, '重置成功'); + } + }) + } return (
@@ -297,7 +315,7 @@ function JupyterTPI (props) {
{jupyterInfo.name}
-
@@ -391,7 +409,7 @@ const mapStateToProps = (state) => { jupyter_pagination, jupyter_identifier } = state.jupyterReducer; - const { loading ,drawervisible} = state.commonReducer; + const { loading ,drawervisible,jupytertime} = state.commonReducer; return { loading, jupyter_info, @@ -402,6 +420,7 @@ const mapStateToProps = (state) => { pagination: jupyter_pagination, jupyter_identifier, drawervisible, + jupytertime }; } @@ -418,7 +437,11 @@ const mapDispatchToProps = (dispatch) => ({ changeLoadingState: (flag) => dispatch(actions.changeLoadingState(flag)), changeCurrentPage: (current) => dispatch(actions.changeCurrentPage(current)), //展开Drawer - changeshowDrawer: (type) => dispatch(actions.changeshowDrawer(type)) + changeshowDrawer: (type) => dispatch(actions.changeshowDrawer(type)), + //倒计时增加 + addjypertime: (type) => dispatch(actions.addjypertime(type)), + //延时 + active_with_tpi:(identifier, msg) => dispatch(actions.active_with_tpi(identifier, msg)), }); export default connect( diff --git a/public/react/src/redux/actions/actionTypes.js b/public/react/src/redux/actions/actionTypes.js index 2ef96941f..f31da4f20 100644 --- a/public/react/src/redux/actions/actionTypes.js +++ b/public/react/src/redux/actions/actionTypes.js @@ -64,6 +64,8 @@ const types = { SAVE_NOTICE_COUNT: 'SAVE_NOTICE_COUNT', // 保存代码块是否更新 AUTO_UPDATE_CODE: 'AUTO_UPDATE_CODE', // 自动更新代码 CHANGE_SHOW_DRAWER: 'CHANGE_SHOW_DRAWER', + CHANGE_JYPYTER_TIME: 'CHANGE_JYPYTER_TIME',//增加15分钟 + CHANGE_EXTENDED_TIME: 'CHANGE_EXTENDED_TIME',//延时 } export default types; diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js index 6b8f01fa5..7fe6db649 100644 --- a/public/react/src/redux/actions/index.js +++ b/public/react/src/redux/actions/index.js @@ -75,6 +75,8 @@ import { changeCurrentPage, changeshowDrawer, reset_with_tpi, + addjypertime, + active_with_tpi } from './jupyter'; export default { @@ -131,6 +133,8 @@ export default { saveJupyterTpi, changeCurrentPage, changeshowDrawer, - reset_with_tpi + reset_with_tpi, + addjypertime, + active_with_tpi, // isUpdateCodeCtx } \ No newline at end of file diff --git a/public/react/src/redux/actions/jupyter.js b/public/react/src/redux/actions/jupyter.js index 22804be51..ce9dcaa6b 100644 --- a/public/react/src/redux/actions/jupyter.js +++ b/public/react/src/redux/actions/jupyter.js @@ -14,7 +14,8 @@ import { fetchJupyterInfo, fetchSyncJupyterCode, fetchreset_with_tpi, - fetchSaveJupyterTpi + fetchSaveJupyterTpi, + fetactive_with_tpi } from "../../services/jupyterServer"; // 获取 jupyter 相关信息 @@ -135,6 +136,30 @@ export const reset_with_tpi = (identifier, msg) => { }) } } + +// 延时 +export const active_with_tpi = (identifier, msg) => { + return (dispatch,getState) => { + const {jupyter_info }= getState().jupyterReducer; + if (!jupyter_info.myshixun_identifier) return; + const params = { + identifier: jupyter_info.myshixun_identifier, + }; + fetactive_with_tpi(params).then(res => { + // console.log('同步代码成功: ', res); + if (res.data.status === 401) return; + if (res.status === 200) { + const {status} = res.data + if (status === 0) { + message.success(msg); + addjypertime(Date.now() + 900 * 1000); + } + } + }) + } +} + + // 改变状态值 export const changeGetJupyterUrlState = (status) => { return { @@ -187,4 +212,13 @@ export const changeshowDrawer = (type) => { type: types.CHANGE_SHOW_DRAWER, payload: type } -} \ No newline at end of file +} +//增加倒计时 +export const addjypertime=(time)=>{ + return { + type: types.CHANGE_JYPYTER_TIME, + payload: time + } +} + + diff --git a/public/react/src/redux/reducers/commonReducer.js b/public/react/src/redux/reducers/commonReducer.js index 4d38b75ad..82910812d 100644 --- a/public/react/src/redux/reducers/commonReducer.js +++ b/public/react/src/redux/reducers/commonReducer.js @@ -15,7 +15,8 @@ const initialState = { submitLoading: false, // 提交按钮状态 publishLoading: false, // 发布 isMySource: false, - drawervisible:false + drawervisible:false, + jupytertime:Date.now() + 3600 * 1000, } const commonReducer = (state = initialState, action) => { @@ -56,6 +57,11 @@ const commonReducer = (state = initialState, action) => { ...state, drawervisible: action.payload } + case types.CHANGE_JYPYTER_TIME: + return { + ...state, + jupytertime: action.payload + } default: return state; } diff --git a/public/react/src/services/jupyterServer.js b/public/react/src/services/jupyterServer.js index 8f512d8ef..37c86a3a2 100644 --- a/public/react/src/services/jupyterServer.js +++ b/public/react/src/services/jupyterServer.js @@ -38,4 +38,10 @@ export async function fetchSaveJupyterTpi (params) { export async function fetchreset_with_tpi (params) { const url = `/jupyters/reset_with_tpi.json`; return axios.get(url, { params }); +} + +//延时jupyter +export async function fetactive_with_tpi(params) { + const url = `/jupyters/active_with_tpi.json`; + return axios.get(url, { params }); } \ No newline at end of file