匿评
评分匿评
评分
{firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{
- return(
-
-
-
-
-
- {item.title}
-
- {item.filesize}
- {item.delete===true?this.onAttachmentRemove(item.id)}>:""}
-
-
- )
- })}
-
-
+ return(
+
+
+
+
+
+ {item.title}
+
+ {item.filesize}
+ {item.delete===true?this.onAttachmentRemove(item.id)}>:""}
+
+ )
+ })}
+
+
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 77abca50c..283574938 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -34,8 +34,8 @@ class Trialapplication extends Component {
showTrial: false,
}
//user_phone_binded 判断是否手机号验证
- console.log("Trialapplication");
- console.log(props);
+ // console.log("Trialapplication");
+ // console.log(props);
}
Cancel = () => {
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 51d4cee9f..82c18a09d 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -640,7 +640,7 @@ class TPMBanner extends Component {
className="fr user_default_btn task-btn-orange font-18"
id="shixun_operation" data-remote="true"
>
- {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"}
+ {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0]}
: ""
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 73dcb0b49..49d7cf016 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -359,7 +359,7 @@ class Challenges extends Component {
{item.delete_url != undefined &&
this.delOperations(item.challenge_id)}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
![]({getImageUrl("images/educoder/icon/close.svg")})
@@ -371,7 +371,7 @@ class Challenges extends Component {
{item.up_url != undefined &&
this.operations(item.challenge_id, "up")}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
![]({getImageUrl("images/educoder/icon/moveup.svg")})
@@ -381,7 +381,7 @@ class Challenges extends Component {
{item.down_url != undefined &&
this.operations(item.challenge_id, "down")}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display: this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
![]({getImageUrl("images/educoder/icon/movedown.svg")})
@@ -393,7 +393,7 @@ class Challenges extends Component {
item.st === 1 ?
![]({getImageUrl("images/educoder/icon/edit.svg")} "{\"编辑\"}")
Date: Mon, 24 Jun 2019 15:35:35 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/busyWork/PublishRightnow.js | 6 +++---
public/react/src/modules/courses/busyWork/common.js | 2 +-
public/react/src/modules/courses/busyWork/commonWork.js | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js
index b4576f58d..da2054124 100644
--- a/public/react/src/modules/courses/busyWork/PublishRightnow.js
+++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js
@@ -52,9 +52,9 @@ class PublishRightnow extends Component{
modalname: isPublish ? "立即发布" : "立即截止",
modaltype:1,
visible:true,
- Topval: isPublish ? "本操作只对“未发布”的对象生效" : "本操作只对“提交中”的对象生效",
- Botvalleft: isPublish ? "暂不发布" : "暂不截止",
- Botval: isPublish ? "则通过后续手动设置，定时发布" : "则将根据已设置的截止时间，定时截止",
+ Topval: isPublish ? "学生将立即收到作业" : "学生将不能再提交作品",
+ // Botvalleft: isPublish ? "暂不发布" : "暂不截止",
+ Botval: this.props.fromListPage ? (isPublish ? "本操作只对“未发布”的分班有效" : "本操作只对“提交中”的分班有效") : '',
starttime: isPublish ? `发布时间：${startMoment.format(dateFormat)}` : '',
starttimes:isPublish ? `${startMoment.format(dateFormat)}` : '',
endtime: isPublish ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',
diff --git a/public/react/src/modules/courses/busyWork/common.js b/public/react/src/modules/courses/busyWork/common.js
index 70e059f17..61bd7fcee 100644
--- a/public/react/src/modules/courses/busyWork/common.js
+++ b/public/react/src/modules/courses/busyWork/common.js
@@ -69,7 +69,7 @@ export function RouteHOC(options = {}) {
}
toNewPage = (courseId) => {
const secondName = this.getModuleName()
- this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.categroy_id}/new`)
+ this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
}
toListPage = (_courseId, _workId) => {
const secondName = this.getModuleName()
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index b0b80d147..18c668efe 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -75,7 +75,6 @@ class commonWork extends Component{
}
componentDidUpdate(prevProps, prevState) {
- debugger;
if (prevProps.match.path != this.props.match.path) {
this.componentDidMount()
}
@@ -198,6 +197,7 @@ class commonWork extends Component{
this.clearSelection()
let {search,order}=this.state;
this.getList(1,search,order);
+ this.props.updataleftNavfun()
}
console.log(response)
}).catch((error) => {
@@ -395,11 +395,11 @@ class commonWork extends Component{
{ !!course_public && 设为公开 }
From 7145037a53db1c5336310ab0cfd33bf426f05171 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 24 Jun 2019 15:44:15 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/busyWork/CommonWorkQuestion.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
index 2c1902e59..7932311b1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkQuestion.js
@@ -101,14 +101,13 @@ class CommonWorkQuestion extends Component{
{isGroup &&
}
From 8d637c79e802cfd7aacfc67c4967c85e1365671a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 24 Jun 2019 15:57:29 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E8=AE=AD?=
=?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/tpm/TPMsettings/TPMsettings.js | 3469 +++++++++--------
1 file changed, 1736 insertions(+), 1733 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index e2d14127e..351a461f4 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1,1733 +1,1736 @@
-import React, { Component } from 'react';
-
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker} from 'antd';
-
-// import "antd/dist/antd.css";
-
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-
-import moment from 'moment';
-
-import axios from 'axios';
-
-import './css/TPMsettings.css';
-
-import { getImageUrl, toPath, getUrl } from 'educoder';
-
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-
-// 恢复数据
-function md_rec_data(k,mdu,id, editor){
- if(window.sessionStorage.getItem(k+mdu) !== null){
- editor.setValue(window.sessionStorage.getItem(k+mdu));
- md_clear_data(k,mdu,id);
- }
-}
-
-// 保存数据
-function md_add_data(k,mdu,d){
- window.sessionStorage.setItem(k+mdu,d);
-}
-
-// 清空保存的数据
-function md_clear_data(k,mdu,id){
- window.sessionStorage.removeItem(k+mdu);
- var id1 = "#e_tip_"+id;
- var id2 = "#e_tips_"+id;
- if(k == 'content'){
- $(id2).html("");
- }else{
- $(id1).html("");
- }
-}
-
-function md_elocalStorage(editor,mdu,id){
- if (window.sessionStorage){
- var oc = window.sessionStorage.getItem('content'+mdu);
- if(oc !== null ){
- $("#e_tips_"+id).data('editor', editor);
- var h = '您上次有已保存的数据，是否恢复 ? / 不恢复';
- $("#e_tips_"+id).html(h);
- }
- setInterval(function() {
- var d = new Date();
- var h = d.getHours();
- var m = d.getMinutes();
- var s = d.getSeconds();
- h = h < 10 ? '0' + h : h;
- m = m < 10 ? '0' + m : m;
- s = s < 10 ? '0' + s : s;
- if(editor.getValue().trim() != ""){
- md_add_data("content",mdu,editor.getValue());
- var id1 = "#e_tip_"+id;
- var id2 = "#e_tips_"+id;
-
- $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 ");
- $(id2).html("");
- }
- },10000);
-
- }else{
- $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
- }
-}
-
-function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callback) {
- var editorName = window.editormd(id, {
- width: width,
- height: high,
- path: path, // "/editormd/lib/"
- markdown : initValue,
- syncScrolling: "single",
- tex: true,
- tocm: true,
- emoji: true,
- taskList: true,
- codeFold: true,
- searchReplace: true,
- htmlDecode: "style,script,iframe",
- sequenceDiagram: true,
- autoFocus: false,
- placeholder: placeholder,
- toolbarIcons: function () {
- // Or return editormd.toolbarModes[name]; // full, simple, mini
- // Using "||" set icons align right.
- return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
- },
- toolbarCustomIcons: {
- testIcon: "",
- testIcon1: ""
- },
- //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
- saveHTMLToTextarea: true,
- // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
- dialogMaskOpacity: 0.6,
- imageUpload: true,
- imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
- imageUploadURL: imageUrl,//url
- onload: function () {
- // this.previewing();
- $("#" + id + " [type=\"latex\"]").bind("click", function () {
- editorName.cm.replaceSelection("```latex");
- editorName.cm.replaceSelection("\n");
- editorName.cm.replaceSelection("\n");
- editorName.cm.replaceSelection("```");
- var __Cursor = editorName.cm.getDoc().getCursor();
- editorName.cm.setCursor(__Cursor.line - 1, 0);
- });
-
- $("#" + id + " [type=\"inline\"]").bind("click", function () {
- editorName.cm.replaceSelection("$$$$");
- var __Cursor = editorName.cm.getDoc().getCursor();
- editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
- editorName.cm.focus();
- });
- $("[type=\"inline\"]").attr("title", "行内公式");
- $("[type=\"latex\"]").attr("title", "多行公式");
-
- callback && callback()
- }
- });
- return editorName;
-}
-
-
-function updatamakedown(id){
- setTimeout(()=>{
- var shixunDescr = window.editormd.markdownToHTML(id, {
- htmlDecode: "style,script,iframe",
- taskList: true,
- tex: true,
- flowChart: true,
- sequenceDiagram: true
- });
- $("#"+id+" p:first").addClass("ReactMarkdown");
- $('#collaborators_list_info').show()
- }, 200)
-}
-
-
-export default class TPMsettings extends Component {
- constructor(props) {
- super(props)
- this.state = {
- commandLine: 0,
- Openpublic: 0,
- settingsData: undefined,
- webssh: 0,
- use_scope: 0,
- shixunsstatus: 0,
- shixunsID: undefined,
- exec_time: undefined,
- trainee: undefined,
- can_copy: undefined,
- task_pass: undefined,
- test_set_permission: undefined,
- hide_code: undefined,
- code_hidden: undefined,
- forbid_copy: undefined,
- vnc: undefined,
- name: undefined,
- scope_partment: undefined,
- scopetype: false,
- departmentslist: undefined,
- description: '',
- evaluate_script:undefined,
- standard_scripts: undefined,
- choice_main_type: "",
- choice_small_type: [""],
- choice_standard_scripts:undefined,
- editordescriptios: undefined,
- editorevaluate_scripts: undefined,
- choice_standard_scriptssum: undefined,
- visibleTemplate: false,
- Executiveordervalue: "",
- Compilecommandvalue: "",
- Executivetyoe: false,
- postapplyvisible: false,
- sendsure_applyvalue: undefined,
- postapplytitle: false,
- shixunnametype: false,
- shixunmaintype: false,
- evaluate_scripttype: false,
- exec_timetype: false,
- traineetype: false,
- standard_scriptsModal:false,
- standard_scriptsModals:false,
- SelectTheCommandtype:false,
- multi_webssh:false,
- status:0,
- opers:false,
- operss:false,
- testscripttiptype:false,
- opersss:false,
- operateshixunstype:false,
- opening_time:"",
- opensmail:false,
- scope_partmenttype:false,
- newuse_scope:undefined,
- scope_partments:0,
-
- pod_exist_time: undefined,
- pod_exist_timetype: false,
- shixunmemoMDvalue:""
- }
- }
- descriptionMD=(initValue, id)=> {
-
- this.contentChanged = false;
- const placeholder = "";
-// amp;
-// 编辑时要传memoId
- const imageUrl = `/api/attachments.json`;
-// 创建editorMd
-
- const description_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue,()=> {
- setTimeout(() => {
- description_editormd.resize()
- description_editormd.cm && description_editormd.cm.refresh()
- }, 500)
-
- if (initValue != undefined) {
- description_editormd.setValue(initValue)
- }
- description_editormd.cm.on("change", (_cm, changeObj) => {
- console.log('....contentChanged')
- this.contentChanged = true;
- })
- });
- md_elocalStorage(description_editormd, `MemoQuestion_${id}`, `${id}Question`);
- this.description_editormd = description_editormd;
- window.description_editormd = description_editormd;
- }
-
- evaluate_scriptMD=(initValue, id)=> {
- this.contentChanged = false;
- const placeholder = "";
-// amp;
-// 编辑时要传memoId
- const imageUrl = `/api/attachments.json`;
-// 创建editorMd
-
- const evaluate_script_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue,()=> {
- setTimeout(() => {
- evaluate_script_editormd.resize()
- evaluate_script_editormd.cm && evaluate_script_editormd.cm.refresh()
- }, 500)
-
- if (initValue != undefined) {
- evaluate_script_editormd.setValue(initValue)
- }
- evaluate_script_editormd.cm.on("change", (_cm, changeObj) => {
- console.log('....contentChanged')
- this.contentChanged = true;
- })
- });
- md_elocalStorage(evaluate_script_editormd, `MemoQuestion_${id}`, `${id}Question`);
- this.evaluate_script_editormd = evaluate_script_editormd;
- window.evaluate_script_editormd = evaluate_script_editormd;
-
- }
-
-
-
- componentDidMount() {
-
- let id=this.props.match.params.shixunId;
-
- let Url=`/shixuns/`+id+`/settings.json`;
-
- axios.get(Url).then((response)=> {
- // alert(response.data.shixun.choice_standard_scripts)
- if(response.status===200){
- this.setState({
- shixunsID: id,
- settingsData: response.data,
- webssh: response.data.shixun.webssh,
- use_scope: response.data.shixun.use_scope,
- shixunsstatus: response.data.shixun.status,
- exec_time: response.data.shixun.exec_time,
- trainee: response.data.shixun.trainee,
- can_copy: response.data.shixun.can_copy,
- task_pass: response.data.shixun.task_pass,
- test_set_permission: response.data.shixun.test_set_permission,
- hide_code: response.data.shixun.hide_code,
- code_hidden: response.data.shixun.code_hidden,
- forbid_copy: response.data.shixun.forbid_copy,
- vnc: response.data.shixun.vnc,
- name: response.data.shixun.name,
- scope_partment: response.data.shixun.scope_partment,
- description: response.data.shixun.description,
- evaluate_script: response.data.shixun.evaluate_script,
- choice_main_type: response.data.shixun.choice_main_type,
- choice_small_type: response.data.shixun.choice_small_type,
- choice_standard_scripts: response.data.shixun.choice_standard_scripts,
- standard_scripts:response.data.shixun.standard_scripts,
- multi_webssh:response.data.shixun.multi_webssh,
- status:response.data.shixun.status,
- opening_time:response.data.shixun.opening_time,
- newuse_scope:response.data.shixun.use_scope,
- scope_partments: response.data.shixun.scope_partment.length,
- shixunmemoMDvalue:response.data.shixun.evaluate_script
- })
-
- // if(response.data.status===403){
- // message: "您没有权限进行该操作"
- // this.setState({
- // :true
- // message403:response.data.message
- // })
- // }
-
-
- if(response.data.shixun.multi_webssh===true){
- this.setState({
- SelectTheCommandtype:true
- })
- }else{
- this.setState({
- SelectTheCommandtype:false
- })
- }
- if (response.data.shixun.scope_partment.length > 0) {
- this.setState({
- scopetype: true
- })
- }
- // console.log(response.data.shixun.description)
- // console.log(response.data.shixun.evaluate_script)
- // console.log(response.data.shixun.description)
- // this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2
-
-
- // this.evaluate_scriptMD(response.data.shixun.evaluate_script, "shixunmemoMD");
-
- this.descriptionMD(response.data.shixun.description, "shixundescription");
- // if (response.data.shixun.status === 2) {
- //
- // } else if (response.data.shixun.status === 1) {
- // this.props.showSnackbar("这个实训已发布不能修改！");
- // } else if (response.data.shixun.status === 3) {
- // this.props.showSnackbar("这个实训已关闭不能修改！");
- // }
- }
-
- });
-
-
- let departmentsUrl = `/shixuns/departments.json`;
- axios.get(departmentsUrl).then((response) => {
- if (response.status === 200) {
- this.setState({
- departmentslist: response.data.shools_name
- });
- }
- }).catch((error) => {
- console.log(error)
- });
-
-
-
- }
-
- SelectshixunCommand=(e)=>{
- // console.log( e.target.value)
- this.setState({
- webssh: e.target.value,
- });
- if(e.target.value===2){
- this.setState({
- SelectTheCommandtype: true,
- multi_webssh:false
- });
- }else{
- this.setState({
- SelectTheCommandtype: false,
- multi_webssh:false
- });
- }
- }
-
- SelectOpenpublic=(e)=>{
- this.setState({
- Openpublic: e.target.value
- });
- }
-
- can_copy=(e)=>{
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- can_copy: sum,
- });
-
- }
-
- task_pass=(e)=>{
-
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- task_pass: sum,
- });
- }
-
- test_set_permission=(e)=>{
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- test_set_permission: sum,
- });
-
- }
-
- hide_code=(e)=>{
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- hide_code: sum,
- });
-
- }
-
- code_hidden=(e)=>{
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- code_hidden: sum,
- });
-
- }
- forbid_copy = (e) => {
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- forbid_copy: sum,
- });
- }
-
- shixun_vnc=(e)=>{
- let sum = ""
- if (e.target.checked === false) {
- sum = 0
- } else if (e.target.checked === true) {
- sum = 1
- }
- this.setState({
- vnc: sum,
- });
-
- }
- shixunsname = (e) => {
- // let {shixunsstatus}=this.state;
- // if(shixunsstatus>0){
- // return
- // }
- this.setState({
- name: e.target.value,
- shixunnametype:false
- })
- }
-
- bigClass = (value) => {
- let url = `/shixuns/get_mirror_script.json?mirror_id=`+value;
- axios.get(url).then((response) => {
- if (response.status === 200) {
- // console.log(response.data)
- this.setState({
- choice_main_type: value,
- standard_scripts:response.data,
- choice_standard_scripts:null
- })
- }
- }).catch((error) => {
- console.log(error)
- });
-
-
-
- }
-
- littleClass = (value) => {
- this.setState({
- choice_small_type: value
- })
- }
- onPodExistTimeChange = (e) => {
- this.setState({
- pod_exist_time: e.target.value,
- pod_exist_timetype: false,
- })
- }
- Timevalue = (e) => {
- this.setState({
- exec_time: e.target.value
- })
- }
- SelectOpenpublic = (e) => {
- this.setState({
- scopetype: false,
- use_scope: e.target.value,
- });
- if (e.target.value === 1) {
- this.setState({
- scopetype: true
- });
- }
-
- }
- deleteScopeInput = (key) => {
- let {scope_partment} = this.state;
- let datalist = scope_partment;
- datalist.splice(key, 1);
- this.setState({
- scope_partment: datalist
- });
- }
-
- shixunScopeInput = (e) => {
- let {scope_partment} = this.state;
- let datalist = scope_partment;
- if (datalist===undefined) {
- datalist=[]
- }
-
- datalist.push(e)
- // else {
- // datalist[id] = e
- // }
- this.setState({
- scope_partment: datalist
- });
- }
- // adduse_scopeinput = () => {
- // let {scope_partment} = this.state;
- // let array = scope_partment;
- // let newarray = ""
- // array.push(newarray)
- // this.setState({
- // scope_partment: array,
- // });
- // }
- submit_edit_shixun = () => {
- let {
- name, description, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum,
- evaluate_script, exec_time, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
- opening_time, pod_exist_time,shixunmemoMDvalue
- } = this.state;
- let operateauthority=this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2||this.props.identity===1&&this.props.status==1;
-
- const description_editormd = this.description_editormd.getValue();
-
- let evaluate_script_editormd;
-
- if(operateauthority===true){
- // evaluate_script_editormd = this.evaluate_script_editormd.getValue();
- evaluate_script_editormd = shixunmemoMDvalue
- }else{
- evaluate_script_editormd = evaluate_script;
- }
-
-
- if (name === "") {
- this.setState({
- shixunnametype: true
- })
- $('html').animate({
- scrollTop: 10
- }, 1000);
- return
- }
- if (choice_main_type === "") {
- this.setState({
- shixunmaintype: true
- })
- $('html').animate({
- scrollTop: 800
- }, 1000);
- return
- }
- if (evaluate_script_editormd === "") {
- this.setState({
- evaluate_scripttype: true
- })
- $('html').animate({
- scrollTop: 1200
- }, 1000);
- return
- }
- if(use_scope===1){
-
- if(scope_partment===undefined||scope_partment.length===0){
- this.setState({
- scope_partmenttype: true
- })
- $('html').animate({
- scrollTop: 2500
- }, 1000);
- this.props.showSnackbar("公开程度，指定单位为空");
- return
- }
- }
- if (exec_time === "") {
- this.setState({
- exec_timetype: true
- })
- $('html').animate({
- scrollTop: 1500
- }, 1000);
- return
- }
-
- // if (!pod_exist_time) {
- // this.setState({
- // pod_exist_timetype: true
- // })
- // $("html, body").animate({ scrollTop: $('#pod_exist_time').offset().top - 100 }, 1000)
- // return
- // }
-
- if (trainee === "") {
- this.setState({
- traineetype: true
- })
- return
- }
-
- let id = this.props.match.params.shixunId;
-
- let newmulti_webssh=multi_webssh;
- if(newmulti_webssh===true){
- newmulti_webssh=1
- }else{
- newmulti_webssh=0
- }
-
- if(newmulti_webssh===null){
- newmulti_webssh=0
- }
-
- let Url = `/shixuns/` + id + `.json`;
- let data = {
- name: name,
- description: description_editormd,
- main_type: choice_main_type,
- small_type: choice_small_type,
- webssh: webssh,
- user_scope: use_scope,
- scope_partment: scope_partment,
- can_copy: can_copy,
- vnc: vnc,
- test_set_permission: test_set_permission,
- code_hidden: code_hidden,
- trainee: trainee,
- task_pass: task_pass,
- standard_scripts: choice_standard_scripts,
- hide_code: hide_code,
- forbid_copy: forbid_copy,
- exec_time: exec_time,
- evaluate_script: evaluate_script_editormd,
- multi_webssh:newmulti_webssh,
- opening_time:opening_time,
- mirror_script_id:choice_standard_scriptssum,
- delType:1
- }
-
- axios.put(Url, data).then((response) => {
- // console.log(response)
- if(response.status){
- if (response.data.status === -1) {
- this.props.showSnackbar(response.data.message);
- return
- } else {
- window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
- }
- }
-
- }).catch((error) => {
- console.log(error)
- })
-
-
- }
- shixunsfetch = (value, callback) => {
- if (timeout) {
- clearTimeout(timeout);
- timeout = null;
- }
- currentValue = value;
-
- function fake() {
- let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
- axios.get(departmentsUrl).then((response) => {
- callback(response.data.shools_name);
- }).catch((error) => {
- console.log(error)
- });
- }
-
- timeout = setTimeout(fake, 300);
- }
- shixunHandleSearch = (value) => {
- this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
- }
-
-
-
-
- shixunsclose = () => {
- let id = this.props.match.params.shixunId;
- let cul = `/shixuns/` + id + `/close.json`;
- axios.post(cul).then((response) => {
- if(response.data.status===1){
- this.props.showSnackbar("操作成功");
- this.setState({
- operateshixunstype: false,
- });
-
- window.location.href = "/shixuns/" + id + "/challenges";
- }
- }).catch((error) => {
- console.log(error)
- })
- }
-
- shixunsdel= () => {
- let id = this.props.match.params.shixunId;
- let cul = `/shixuns/` + id +`.json`;
-
- axios.delete(cul).then((response) => {
- if(response.data.status===1){
- this.props.showSnackbar("操作成功");
- this.setState({
- operateshixunstype: false,
- });
-
- window.location.href = "/shixuns";
- }
- }).catch((error) => {
- console.log(error)
- })
- }
-
- Executiveorder = (e) => {
- this.setState({
- Executiveordervalue: e.target.value
- })
- }
-
- Compilecommand = (e) => {
- this.setState({
- Compilecommandvalue: e.target.value
- })
- }
-
- handleCancelTemplate = (e) => {
- this.setState({
- Executiveordervalue: "",
- Compilecommandvalue: "",
- visibleTemplate: false
- })
- }
-
- hideModalTemplate = (e) => {
- let id = this.props.match.params.shixunId;
- let {Executiveordervalue, Compilecommandvalue} = this.state;
-
- if (Executiveordervalue === "") {
- this.setState({
- Executivetyoe: true,
- });
- return
- }
- // Executiveordervalue=String(Executiveordervalue);
- // Compilecommandvalue=String(Compilecommandvalue);
- let trl = `/shixuns/${id}/get_custom_script.json?compile=${Executiveordervalue}&excutive=${Compilecommandvalue}`
- axios.get(trl).then((response) => {
- // this.evaluate_scriptMD(response.data.shixun_script, "shixunmemoMD");
- this.setState({
- shixunmemoMDvalue:response.data.shixun_script
- })
- }).catch((error) => {
- console.log(error)
- });
- this.setState({
- visibleTemplate: false
- })
- }
-
- showModal = () => {
- this.setState({
- visibleTemplate: true,
- });
- }
- Selecttrainee = (value) => {
- this.setState({
- trainee: value,
- });
- }
-
- post_apply = () => {
- this.setState({
- postapplyvisible: true
- })
- }
-
- sendsure_applyvalues = (e) => {
- this.setState({
- sendsure_applyvalue: e.target.value
- })
- }
-
- sendsure_apply = () => {
- let {sendsure_applyvalue} = this.state;
- let url = "/shixuns/apply_shixun_mirror.json";
- axios.post(url, {
- note: sendsure_applyvalue
- }).then((response) => {
- if (response.status === 200) {
- if (response.data.status == 1) {
- this.setState({
- postapplyvisible: false,
- postapplytitle: true
- })
- }
-
- }
- }).catch((error) => {
- console.log(error)
- });
-
- }
-
- sendhideModaly = () => {
- this.setState({
- postapplyvisible: false
- })
- }
-
- yeshidemodel = () => {
- this.setState({
- postapplytitle: false
- })
- }
-
- SelectScput = (value, e) => {
- this.setState({
- choice_standard_scriptssum: value,
- choice_standard_scripts: {id:e.props.value,value:""},
- standard_scriptsModal:true
- })
- }
-
- hidestandard_scriptsModal=()=>{
- this.setState({
- standard_scriptsModal:false,
- standard_scriptsModals:false
- })
- }
-
- get_mirror_script=()=>{
- let {choice_standard_scriptssum}=this.state;
- let id = this.props.match.params.shixunId;
- let pul = "/shixuns/" + id + "/get_script_contents.json?script_id=" + choice_standard_scriptssum;
- axios.get(pul).then((response) => {
- if(response.status===200){
- // this.evaluate_scriptMD(response.data.content, "shixunmemoMD");
- this.setState({
- standard_scriptsModal:false,
- standard_scriptsModals:true,
- shixunmemoMDvalue:response.data.content
- })
- }
-
- }).catch((error) => {
- console.log(error)
- })
- }
-
-
- SelectTheCommandonChange=(e)=>{
- this.setState({
- multi_webssh:e.target.checked
- })
- }
-
- bigopen=()=>{
- this.setState({
- opers:true
- })
- }
-
- bigopens=()=>{
- this.setState({
- opers:false,
- operss:false,
- opersss:false,
- opensmail:false
- })
- }
- bigopensmal=()=>{
- this.setState({
- opensmail:true
- })
- }
- sbigopen=()=>{
- this.setState({
- operss:true
- })
- }
-
- sbigopens=()=>{
- this.setState({
- operss:false
- })
- }
- sbigopenss=()=>{
- this.setState({
- opersss:true
- })
- }
-
- sbigopensss=()=>{
- this.setState({
- opersss:false
- })
- }
- testscripttip=(val)=>{
- if(val===0){
- this.setState({
- testscripttiptype:true
- })
- }else if(val===1){
- this.setState({
- testscripttiptype:false
- })
- }
- }
-
- operateshixuns=(value)=>{
- this.setState({
- operateshixunstype:true,
- delType:value
- })
- }
-
- hideoperateshixuns=()=>{
- this.setState({
- operateshixunstype:false
- })
- }
- onChangeTimePicker =(value, dateString)=> {
- this.setState({
- opening_time:dateString
- })
- }
-
- getshixunmemoMDvalue=(e)=>{
- this.setState({
- shixunmemoMDvalue:e.target.value
- })
- }
- render() {
- let {
- postapplyvisible,
- sendsure_applyvalue,
- postapplytitle,
- shixunnametype,
- shixunmaintype,
- evaluate_scripttype,
- exec_timetype,
- traineetype,
- standard_scripts,
- description,
- evaluate_script,
- name,
- settingsData,
- webssh,
- use_scope,
- shixunsstatus,
- shixunsID,
- exec_time,
- pod_exist_time,
- pod_exist_timetype,
- can_copy,
- choice_standard_scripts,
- Executiveordervalue,
- Executivetyoe,
- Compilecommandvalue,
- task_pass,
- test_set_permission,
- hide_code,
- forbid_copy,
- code_hidden,
- vnc,
- scopetype,
- scope_partment,
- departmentslist,
- trainee,
- choice_main_type,
- choice_small_type,
- standard_scriptsModal,
- standard_scriptsModals,
- SelectTheCommandtype,
- status,
- opers,
- operss,
- opersss,
- testscripttiptype,
- operateshixunstype,
- opening_time,
- opensmail,
- scope_partmenttype,
- newuse_scope,
- scope_partments,
- shixunmemoMDvalue,delType
- } = this.state;
-
- let options;
-
- if (departmentslist != undefined) {
- options = this.state.departmentslist.map((d, k) => {
- return (
-
- )
- })
- }
-
- const dateFormat = 'YYYY-MM-DD HH:mm:ss';
- let operateauthority=this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2||this.props.identity===1&&this.props.status==1;
-
- return (
-
*/}
@@ -371,7 +371,7 @@ class Challenges extends Component {
{item.up_url != undefined &&
@@ -381,7 +381,7 @@ class Challenges extends Component {
{item.down_url != undefined &&
@@ -393,7 +393,7 @@ class Challenges extends Component {
item.st === 1 ?
Date: Mon, 24 Jun 2019 15:35:35 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/busyWork/PublishRightnow.js | 6 +++---
public/react/src/modules/courses/busyWork/common.js | 2 +-
public/react/src/modules/courses/busyWork/commonWork.js | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js
index b4576f58d..da2054124 100644
--- a/public/react/src/modules/courses/busyWork/PublishRightnow.js
+++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js
@@ -52,9 +52,9 @@ class PublishRightnow extends Component{
modalname: isPublish ? "立即发布" : "立即截止",
modaltype:1,
visible:true,
- Topval: isPublish ? "本操作只对“未发布”的对象生效" : "本操作只对“提交中”的对象生效",
- Botvalleft: isPublish ? "暂不发布" : "暂不截止",
- Botval: isPublish ? "则通过后续手动设置，定时发布" : "则将根据已设置的截止时间，定时截止",
+ Topval: isPublish ? "学生将立即收到作业" : "学生将不能再提交作品",
+ // Botvalleft: isPublish ? "暂不发布" : "暂不截止",
+ Botval: this.props.fromListPage ? (isPublish ? "本操作只对“未发布”的分班有效" : "本操作只对“提交中”的分班有效") : '',
starttime: isPublish ? `发布时间：${startMoment.format(dateFormat)}` : '',
starttimes:isPublish ? `${startMoment.format(dateFormat)}` : '',
endtime: isPublish ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',
diff --git a/public/react/src/modules/courses/busyWork/common.js b/public/react/src/modules/courses/busyWork/common.js
index 70e059f17..61bd7fcee 100644
--- a/public/react/src/modules/courses/busyWork/common.js
+++ b/public/react/src/modules/courses/busyWork/common.js
@@ -69,7 +69,7 @@ export function RouteHOC(options = {}) {
}
toNewPage = (courseId) => {
const secondName = this.getModuleName()
- this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.categroy_id}/new`)
+ this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
}
toListPage = (_courseId, _workId) => {
const secondName = this.getModuleName()
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index b0b80d147..18c668efe 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -75,7 +75,6 @@ class commonWork extends Component{
}
componentDidUpdate(prevProps, prevState) {
- debugger;
if (prevProps.match.path != this.props.match.path) {
this.componentDidMount()
}
@@ -198,6 +197,7 @@ class commonWork extends Component{
this.clearSelection()
let {search,order}=this.state;
this.getList(1,search,order);
+ this.props.updataleftNavfun()
}
console.log(response)
}).catch((error) => {
@@ -395,11 +395,11 @@ class commonWork extends Component{
-
分组要求：
- 分组人数： {group_info.min_num} - {group_info.max_num} 人
- {group_info.base_on_project ? '基于项目实施' : '不基于项目实施'}：
+ 分组要求： {group_info.min_num} ~ {group_info.max_num}
+ {group_info.base_on_project ? '基于项目实施' : '不基于项目'}：
-
（提交作品时需要关联同组成员，组内成员作品共享）
- （{group_info.base_on_project ? '基于项目，则项目管理员角色的成员可以提交作品' : '非基于项目，则任意小组成员可以提交作品'}）
- （各小组必须在educoder平台创建项目）
+ （学生提交作品时需要关联同组成员，组内成员作品共享）
+ （{group_info.base_on_project ? '学生必须在本平台创建项目，项目管理员可以提交作品' : '无需再平台创建项目，任意小组成员均可以提交作品'}）
+ {/* （各小组必须在educoder平台创建项目）
*/}
-
- );
- }
-}
-
-
+import React, { Component } from 'react';
+
+import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker} from 'antd';
+
+// import "antd/dist/antd.css";
+
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+
+import moment from 'moment';
+
+import axios from 'axios';
+
+import './css/TPMsettings.css';
+
+import { getImageUrl, toPath, getUrl } from 'educoder';
+
+let origin = getUrl();
+
+let path = getUrl("/editormd/lib/")
+
+const $ = window.$;
+
+let timeout;
+
+let currentValue;
+
+const Option = Select.Option;
+
+const RadioGroup = Radio.Group;
+
+// 恢复数据
+function md_rec_data(k,mdu,id, editor){
+ if(window.sessionStorage.getItem(k+mdu) !== null){
+ editor.setValue(window.sessionStorage.getItem(k+mdu));
+ md_clear_data(k,mdu,id);
+ }
+}
+
+// 保存数据
+function md_add_data(k,mdu,d){
+ window.sessionStorage.setItem(k+mdu,d);
+}
+
+// 清空保存的数据
+function md_clear_data(k,mdu,id){
+ window.sessionStorage.removeItem(k+mdu);
+ var id1 = "#e_tip_"+id;
+ var id2 = "#e_tips_"+id;
+ if(k == 'content'){
+ $(id2).html("");
+ }else{
+ $(id1).html("");
+ }
+}
+
+function md_elocalStorage(editor,mdu,id){
+ if (window.sessionStorage){
+ var oc = window.sessionStorage.getItem('content'+mdu);
+ if(oc !== null ){
+ $("#e_tips_"+id).data('editor', editor);
+ var h = '您上次有已保存的数据，是否恢复 ? / 不恢复';
+ $("#e_tips_"+id).html(h);
+ }
+ setInterval(function() {
+ var d = new Date();
+ var h = d.getHours();
+ var m = d.getMinutes();
+ var s = d.getSeconds();
+ h = h < 10 ? '0' + h : h;
+ m = m < 10 ? '0' + m : m;
+ s = s < 10 ? '0' + s : s;
+ if(editor.getValue().trim() != ""){
+ md_add_data("content",mdu,editor.getValue());
+ var id1 = "#e_tip_"+id;
+ var id2 = "#e_tips_"+id;
+
+ $(id1).html(" 数据已于 " + h + ':' + m + ':' + s +" 保存 ");
+ $(id2).html("");
+ }
+ },10000);
+
+ }else{
+ $("#e_tip_"+id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+ }
+}
+
+function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callback) {
+ var editorName = window.editormd(id, {
+ width: width,
+ height: high,
+ path: path, // "/editormd/lib/"
+ markdown : initValue,
+ syncScrolling: "single",
+ tex: true,
+ tocm: true,
+ emoji: true,
+ taskList: true,
+ codeFold: true,
+ searchReplace: true,
+ htmlDecode: "style,script,iframe",
+ sequenceDiagram: true,
+ autoFocus: false,
+ placeholder: placeholder,
+ toolbarIcons: function () {
+ // Or return editormd.toolbarModes[name]; // full, simple, mini
+ // Using "||" set icons align right.
+ return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+ },
+ toolbarCustomIcons: {
+ testIcon: "",
+ testIcon1: ""
+ },
+ //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+ saveHTMLToTextarea: true,
+ // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+ dialogMaskOpacity: 0.6,
+ imageUpload: true,
+ imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+ imageUploadURL: imageUrl,//url
+ onload: function () {
+ // this.previewing();
+ $("#" + id + " [type=\"latex\"]").bind("click", function () {
+ editorName.cm.replaceSelection("```latex");
+ editorName.cm.replaceSelection("\n");
+ editorName.cm.replaceSelection("\n");
+ editorName.cm.replaceSelection("```");
+ var __Cursor = editorName.cm.getDoc().getCursor();
+ editorName.cm.setCursor(__Cursor.line - 1, 0);
+ });
+
+ $("#" + id + " [type=\"inline\"]").bind("click", function () {
+ editorName.cm.replaceSelection("$$$$");
+ var __Cursor = editorName.cm.getDoc().getCursor();
+ editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+ editorName.cm.focus();
+ });
+ $("[type=\"inline\"]").attr("title", "行内公式");
+ $("[type=\"latex\"]").attr("title", "多行公式");
+
+ callback && callback()
+ }
+ });
+ return editorName;
+}
+
+
+function updatamakedown(id){
+ setTimeout(()=>{
+ var shixunDescr = window.editormd.markdownToHTML(id, {
+ htmlDecode: "style,script,iframe",
+ taskList: true,
+ tex: true,
+ flowChart: true,
+ sequenceDiagram: true
+ });
+ $("#"+id+" p:first").addClass("ReactMarkdown");
+ $('#collaborators_list_info').show()
+ }, 200)
+}
+
+
+export default class TPMsettings extends Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ commandLine: 0,
+ Openpublic: 0,
+ settingsData: undefined,
+ webssh: 0,
+ use_scope: 0,
+ shixunsstatus: 0,
+ shixunsID: undefined,
+ exec_time: undefined,
+ trainee: undefined,
+ can_copy: undefined,
+ task_pass: undefined,
+ test_set_permission: undefined,
+ hide_code: undefined,
+ code_hidden: undefined,
+ forbid_copy: undefined,
+ vnc: undefined,
+ name: undefined,
+ scope_partment: undefined,
+ scopetype: false,
+ departmentslist: undefined,
+ description: '',
+ evaluate_script:undefined,
+ standard_scripts: undefined,
+ choice_main_type: "",
+ choice_small_type: [""],
+ choice_standard_scripts:undefined,
+ editordescriptios: undefined,
+ editorevaluate_scripts: undefined,
+ choice_standard_scriptssum: undefined,
+ visibleTemplate: false,
+ Executiveordervalue: "",
+ Compilecommandvalue: "",
+ Executivetyoe: false,
+ postapplyvisible: false,
+ sendsure_applyvalue: undefined,
+ postapplytitle: false,
+ shixunnametype: false,
+ shixunmaintype: false,
+ evaluate_scripttype: false,
+ exec_timetype: false,
+ traineetype: false,
+ standard_scriptsModal:false,
+ standard_scriptsModals:false,
+ SelectTheCommandtype:false,
+ multi_webssh:false,
+ status:0,
+ opers:false,
+ operss:false,
+ testscripttiptype:false,
+ opersss:false,
+ operateshixunstype:false,
+ opening_time:"",
+ opensmail:false,
+ scope_partmenttype:false,
+ newuse_scope:undefined,
+ scope_partments:0,
+
+ pod_exist_time: undefined,
+ pod_exist_timetype: false,
+ shixunmemoMDvalue:""
+ }
+ }
+ descriptionMD=(initValue, id)=> {
+
+ this.contentChanged = false;
+ const placeholder = "";
+// amp;
+// 编辑时要传memoId
+ const imageUrl = `/api/attachments.json`;
+// 创建editorMd
+
+ const description_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue,()=> {
+ setTimeout(() => {
+ description_editormd.resize()
+ description_editormd.cm && description_editormd.cm.refresh()
+ }, 500)
+
+ if (initValue != undefined) {
+ description_editormd.setValue(initValue)
+ }
+ description_editormd.cm.on("change", (_cm, changeObj) => {
+ console.log('....contentChanged')
+ this.contentChanged = true;
+ })
+ });
+ md_elocalStorage(description_editormd, `MemoQuestion_${id}`, `${id}Question`);
+ this.description_editormd = description_editormd;
+ window.description_editormd = description_editormd;
+ }
+
+ evaluate_scriptMD=(initValue, id)=> {
+ this.contentChanged = false;
+ const placeholder = "";
+// amp;
+// 编辑时要传memoId
+ const imageUrl = `/api/attachments.json`;
+// 创建editorMd
+
+ const evaluate_script_editormd =create_editorMD(id, '100%', 400, placeholder, imageUrl, initValue,()=> {
+ setTimeout(() => {
+ evaluate_script_editormd.resize()
+ evaluate_script_editormd.cm && evaluate_script_editormd.cm.refresh()
+ }, 500)
+
+ if (initValue != undefined) {
+ evaluate_script_editormd.setValue(initValue)
+ }
+ evaluate_script_editormd.cm.on("change", (_cm, changeObj) => {
+ console.log('....contentChanged')
+ this.contentChanged = true;
+ })
+ });
+ md_elocalStorage(evaluate_script_editormd, `MemoQuestion_${id}`, `${id}Question`);
+ this.evaluate_script_editormd = evaluate_script_editormd;
+ window.evaluate_script_editormd = evaluate_script_editormd;
+
+ }
+
+
+
+ componentDidMount() {
+
+ let id=this.props.match.params.shixunId;
+
+ let Url=`/shixuns/`+id+`/settings.json`;
+
+ axios.get(Url).then((response)=> {
+ // alert(response.data.shixun.choice_standard_scripts)
+ if(response.status===200){
+ this.setState({
+ shixunsID: id,
+ settingsData: response.data,
+ webssh: response.data.shixun.webssh,
+ use_scope: response.data.shixun.use_scope,
+ shixunsstatus: response.data.shixun.status,
+ exec_time: response.data.shixun.exec_time,
+ trainee: response.data.shixun.trainee,
+ can_copy: response.data.shixun.can_copy,
+ task_pass: response.data.shixun.task_pass,
+ test_set_permission: response.data.shixun.test_set_permission,
+ hide_code: response.data.shixun.hide_code,
+ code_hidden: response.data.shixun.code_hidden,
+ forbid_copy: response.data.shixun.forbid_copy,
+ vnc: response.data.shixun.vnc,
+ name: response.data.shixun.name,
+ scope_partment: response.data.shixun.scope_partment,
+ description: response.data.shixun.description,
+ evaluate_script: response.data.shixun.evaluate_script,
+ choice_main_type: response.data.shixun.choice_main_type,
+ choice_small_type: response.data.shixun.choice_small_type,
+ choice_standard_scripts: response.data.shixun.choice_standard_scripts,
+ standard_scripts:response.data.shixun.standard_scripts,
+ multi_webssh:response.data.shixun.multi_webssh,
+ status:response.data.shixun.status,
+ opening_time:response.data.shixun.opening_time,
+ newuse_scope:response.data.shixun.use_scope,
+ scope_partments: response.data.shixun.scope_partment.length,
+ shixunmemoMDvalue:response.data.shixun.evaluate_script
+ })
+
+ // if(response.data.status===403){
+ // message: "您没有权限进行该操作"
+ // this.setState({
+ // :true
+ // message403:response.data.message
+ // })
+ // }
+
+
+ if(response.data.shixun.multi_webssh===true){
+ this.setState({
+ SelectTheCommandtype:true
+ })
+ }else{
+ this.setState({
+ SelectTheCommandtype:false
+ })
+ }
+ if (response.data.shixun.scope_partment.length > 0) {
+ this.setState({
+ scopetype: true
+ })
+ }
+ // console.log(response.data.shixun.description)
+ // console.log(response.data.shixun.evaluate_script)
+ // console.log(response.data.shixun.description)
+ // this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2
+
+
+ // this.evaluate_scriptMD(response.data.shixun.evaluate_script, "shixunmemoMD");
+
+ this.descriptionMD(response.data.shixun.description, "shixundescription");
+
+ // this.bigClass()
+ // if (response.data.shixun.status === 2) {
+ //
+ // } else if (response.data.shixun.status === 1) {
+ // this.props.showSnackbar("这个实训已发布不能修改！");
+ // } else if (response.data.shixun.status === 3) {
+ // this.props.showSnackbar("这个实训已关闭不能修改！");
+ // }
+ }
+
+ });
+
+
+ let departmentsUrl = `/shixuns/departments.json`;
+ axios.get(departmentsUrl).then((response) => {
+ if (response.status === 200) {
+ this.setState({
+ departmentslist: response.data.shools_name
+ });
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+
+
+
+ }
+
+ SelectshixunCommand=(e)=>{
+ // console.log( e.target.value)
+ this.setState({
+ webssh: e.target.value,
+ });
+ if(e.target.value===2){
+ this.setState({
+ SelectTheCommandtype: true,
+ multi_webssh:false
+ });
+ }else{
+ this.setState({
+ SelectTheCommandtype: false,
+ multi_webssh:false
+ });
+ }
+ }
+
+ SelectOpenpublic=(e)=>{
+ this.setState({
+ Openpublic: e.target.value
+ });
+ }
+
+ can_copy=(e)=>{
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ can_copy: sum,
+ });
+
+ }
+
+ task_pass=(e)=>{
+
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ task_pass: sum,
+ });
+ }
+
+ test_set_permission=(e)=>{
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ test_set_permission: sum,
+ });
+
+ }
+
+ hide_code=(e)=>{
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ hide_code: sum,
+ });
+
+ }
+
+ code_hidden=(e)=>{
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ code_hidden: sum,
+ });
+
+ }
+ forbid_copy = (e) => {
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ forbid_copy: sum,
+ });
+ }
+
+ shixun_vnc=(e)=>{
+ let sum = ""
+ if (e.target.checked === false) {
+ sum = 0
+ } else if (e.target.checked === true) {
+ sum = 1
+ }
+ this.setState({
+ vnc: sum,
+ });
+
+ }
+ shixunsname = (e) => {
+ // let {shixunsstatus}=this.state;
+ // if(shixunsstatus>0){
+ // return
+ // }
+ this.setState({
+ name: e.target.value,
+ shixunnametype:false
+ })
+ }
+
+ bigClass = (value) => {
+
+ let url = `/shixuns/get_mirror_script.json?mirror_id=`+value;
+ axios.get(url).then((response) => {
+ if (response.status === 200) {
+ // console.log(response.data)
+ this.setState({
+ choice_main_type: value,
+ standard_scripts:response.data,
+ choice_standard_scripts:null
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+
+
+
+ }
+
+ littleClass = (value) => {
+ this.setState({
+ choice_small_type: value
+ })
+ }
+ onPodExistTimeChange = (e) => {
+ this.setState({
+ pod_exist_time: e.target.value,
+ pod_exist_timetype: false,
+ })
+ }
+ Timevalue = (e) => {
+ this.setState({
+ exec_time: e.target.value
+ })
+ }
+ SelectOpenpublic = (e) => {
+ this.setState({
+ scopetype: false,
+ use_scope: e.target.value,
+ });
+ if (e.target.value === 1) {
+ this.setState({
+ scopetype: true
+ });
+ }
+
+ }
+ deleteScopeInput = (key) => {
+ let {scope_partment} = this.state;
+ let datalist = scope_partment;
+ datalist.splice(key, 1);
+ this.setState({
+ scope_partment: datalist
+ });
+ }
+
+ shixunScopeInput = (e) => {
+ let {scope_partment} = this.state;
+ let datalist = scope_partment;
+ if (datalist===undefined) {
+ datalist=[]
+ }
+
+ datalist.push(e)
+ // else {
+ // datalist[id] = e
+ // }
+ this.setState({
+ scope_partment: datalist
+ });
+ }
+ // adduse_scopeinput = () => {
+ // let {scope_partment} = this.state;
+ // let array = scope_partment;
+ // let newarray = ""
+ // array.push(newarray)
+ // this.setState({
+ // scope_partment: array,
+ // });
+ // }
+ submit_edit_shixun = () => {
+ let {
+ name, description, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum,
+ evaluate_script, exec_time, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
+ opening_time, pod_exist_time,shixunmemoMDvalue
+ } = this.state;
+ let operateauthority=this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2||this.props.identity===1&&this.props.status==1;
+
+ const description_editormd = this.description_editormd.getValue();
+
+ let evaluate_script_editormd;
+
+ if(operateauthority===true){
+ // evaluate_script_editormd = this.evaluate_script_editormd.getValue();
+ evaluate_script_editormd = shixunmemoMDvalue
+ }else{
+ evaluate_script_editormd = evaluate_script;
+ }
+
+
+ if (name === "") {
+ this.setState({
+ shixunnametype: true
+ })
+ $('html').animate({
+ scrollTop: 10
+ }, 1000);
+ return
+ }
+ if (choice_main_type === "") {
+ this.setState({
+ shixunmaintype: true
+ })
+ $('html').animate({
+ scrollTop: 800
+ }, 1000);
+ return
+ }
+ if (evaluate_script_editormd === "") {
+ this.setState({
+ evaluate_scripttype: true
+ })
+ $('html').animate({
+ scrollTop: 1200
+ }, 1000);
+ return
+ }
+ if(use_scope===1){
+
+ if(scope_partment===undefined||scope_partment.length===0){
+ this.setState({
+ scope_partmenttype: true
+ })
+ $('html').animate({
+ scrollTop: 2500
+ }, 1000);
+ this.props.showSnackbar("公开程度，指定单位为空");
+ return
+ }
+ }
+ if (exec_time === "") {
+ this.setState({
+ exec_timetype: true
+ })
+ $('html').animate({
+ scrollTop: 1500
+ }, 1000);
+ return
+ }
+
+ // if (!pod_exist_time) {
+ // this.setState({
+ // pod_exist_timetype: true
+ // })
+ // $("html, body").animate({ scrollTop: $('#pod_exist_time').offset().top - 100 }, 1000)
+ // return
+ // }
+
+ if (trainee === "") {
+ this.setState({
+ traineetype: true
+ })
+ return
+ }
+
+ let id = this.props.match.params.shixunId;
+
+ let newmulti_webssh=multi_webssh;
+ if(newmulti_webssh===true){
+ newmulti_webssh=1
+ }else{
+ newmulti_webssh=0
+ }
+
+ if(newmulti_webssh===null){
+ newmulti_webssh=0
+ }
+
+ let Url = `/shixuns/` + id + `.json`;
+ let data = {
+ name: name,
+ description: description_editormd,
+ main_type: choice_main_type,
+ small_type: choice_small_type,
+ webssh: webssh,
+ user_scope: use_scope,
+ scope_partment: scope_partment,
+ can_copy: can_copy,
+ vnc: vnc,
+ test_set_permission: test_set_permission,
+ code_hidden: code_hidden,
+ trainee: trainee,
+ task_pass: task_pass,
+ standard_scripts: choice_standard_scripts,
+ hide_code: hide_code,
+ forbid_copy: forbid_copy,
+ exec_time: exec_time,
+ evaluate_script: evaluate_script_editormd,
+ multi_webssh:newmulti_webssh,
+ opening_time:opening_time,
+ mirror_script_id:choice_standard_scriptssum,
+ delType:1
+ }
+
+ axios.put(Url, data).then((response) => {
+ // console.log(response)
+ if(response.status){
+ if (response.data.status === -1) {
+ this.props.showSnackbar(response.data.message);
+ return
+ } else {
+ window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
+ }
+ }
+
+ }).catch((error) => {
+ console.log(error)
+ })
+
+
+ }
+ shixunsfetch = (value, callback) => {
+ if (timeout) {
+ clearTimeout(timeout);
+ timeout = null;
+ }
+ currentValue = value;
+
+ function fake() {
+ let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
+ axios.get(departmentsUrl).then((response) => {
+ callback(response.data.shools_name);
+ }).catch((error) => {
+ console.log(error)
+ });
+ }
+
+ timeout = setTimeout(fake, 300);
+ }
+ shixunHandleSearch = (value) => {
+ this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
+ }
+
+
+
+
+ shixunsclose = () => {
+ let id = this.props.match.params.shixunId;
+ let cul = `/shixuns/` + id + `/close.json`;
+ axios.post(cul).then((response) => {
+ if(response.data.status===1){
+ this.props.showSnackbar("操作成功");
+ this.setState({
+ operateshixunstype: false,
+ });
+
+ window.location.href = "/shixuns/" + id + "/challenges";
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+ shixunsdel= () => {
+ let id = this.props.match.params.shixunId;
+ let cul = `/shixuns/` + id +`.json`;
+
+ axios.delete(cul).then((response) => {
+ if(response.data.status===1){
+ this.props.showSnackbar("操作成功");
+ this.setState({
+ operateshixunstype: false,
+ });
+
+ window.location.href = "/shixuns";
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+ Executiveorder = (e) => {
+ this.setState({
+ Executiveordervalue: e.target.value
+ })
+ }
+
+ Compilecommand = (e) => {
+ this.setState({
+ Compilecommandvalue: e.target.value
+ })
+ }
+
+ handleCancelTemplate = (e) => {
+ this.setState({
+ Executiveordervalue: "",
+ Compilecommandvalue: "",
+ visibleTemplate: false
+ })
+ }
+
+ hideModalTemplate = (e) => {
+ let id = this.props.match.params.shixunId;
+ let {Executiveordervalue, Compilecommandvalue} = this.state;
+
+ if (Executiveordervalue === "") {
+ this.setState({
+ Executivetyoe: true,
+ });
+ return
+ }
+ // Executiveordervalue=String(Executiveordervalue);
+ // Compilecommandvalue=String(Compilecommandvalue);
+ let trl = `/shixuns/${id}/get_custom_script.json?compile=${Executiveordervalue}&excutive=${Compilecommandvalue}`
+ axios.get(trl).then((response) => {
+ // this.evaluate_scriptMD(response.data.shixun_script, "shixunmemoMD");
+ this.setState({
+ shixunmemoMDvalue:response.data.shixun_script
+ })
+ }).catch((error) => {
+ console.log(error)
+ });
+ this.setState({
+ visibleTemplate: false
+ })
+ }
+
+ showModal = () => {
+ this.setState({
+ visibleTemplate: true,
+ });
+ }
+ Selecttrainee = (value) => {
+ this.setState({
+ trainee: value,
+ });
+ }
+
+ post_apply = () => {
+ this.setState({
+ postapplyvisible: true
+ })
+ }
+
+ sendsure_applyvalues = (e) => {
+ this.setState({
+ sendsure_applyvalue: e.target.value
+ })
+ }
+
+ sendsure_apply = () => {
+ let {sendsure_applyvalue} = this.state;
+ let url = "/shixuns/apply_shixun_mirror.json";
+ axios.post(url, {
+ note: sendsure_applyvalue
+ }).then((response) => {
+ if (response.status === 200) {
+ if (response.data.status == 1) {
+ this.setState({
+ postapplyvisible: false,
+ postapplytitle: true
+ })
+ }
+
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+
+ }
+
+ sendhideModaly = () => {
+ this.setState({
+ postapplyvisible: false
+ })
+ }
+
+ yeshidemodel = () => {
+ this.setState({
+ postapplytitle: false
+ })
+ }
+
+ SelectScput = (value, e) => {
+ this.setState({
+ choice_standard_scriptssum: value,
+ choice_standard_scripts: {id:e.props.value,value:""},
+ standard_scriptsModal:true
+ })
+ }
+
+ hidestandard_scriptsModal=()=>{
+ this.setState({
+ standard_scriptsModal:false,
+ standard_scriptsModals:false
+ })
+ }
+
+ get_mirror_script=()=>{
+ let {choice_standard_scriptssum}=this.state;
+ let id = this.props.match.params.shixunId;
+ let pul = "/shixuns/" + id + "/get_script_contents.json?script_id=" + choice_standard_scriptssum;
+ axios.get(pul).then((response) => {
+ if(response.status===200){
+ // this.evaluate_scriptMD(response.data.content, "shixunmemoMD");
+ this.setState({
+ standard_scriptsModal:false,
+ standard_scriptsModals:true,
+ shixunmemoMDvalue:response.data.content
+ })
+ }
+
+ }).catch((error) => {
+ console.log(error)
+ })
+ }
+
+
+ SelectTheCommandonChange=(e)=>{
+ this.setState({
+ multi_webssh:e.target.checked
+ })
+ }
+
+ bigopen=()=>{
+ this.setState({
+ opers:true
+ })
+ }
+
+ bigopens=()=>{
+ this.setState({
+ opers:false,
+ operss:false,
+ opersss:false,
+ opensmail:false
+ })
+ }
+ bigopensmal=()=>{
+ this.setState({
+ opensmail:true
+ })
+ }
+ sbigopen=()=>{
+ this.setState({
+ operss:true
+ })
+ }
+
+ sbigopens=()=>{
+ this.setState({
+ operss:false
+ })
+ }
+ sbigopenss=()=>{
+ this.setState({
+ opersss:true
+ })
+ }
+
+ sbigopensss=()=>{
+ this.setState({
+ opersss:false
+ })
+ }
+ testscripttip=(val)=>{
+ if(val===0){
+ this.setState({
+ testscripttiptype:true
+ })
+ }else if(val===1){
+ this.setState({
+ testscripttiptype:false
+ })
+ }
+ }
+
+ operateshixuns=(value)=>{
+ this.setState({
+ operateshixunstype:true,
+ delType:value
+ })
+ }
+
+ hideoperateshixuns=()=>{
+ this.setState({
+ operateshixunstype:false
+ })
+ }
+ onChangeTimePicker =(value, dateString)=> {
+ this.setState({
+ opening_time:dateString
+ })
+ }
+
+ getshixunmemoMDvalue=(e)=>{
+ this.setState({
+ shixunmemoMDvalue:e.target.value
+ })
+ }
+ render() {
+ let {
+ postapplyvisible,
+ sendsure_applyvalue,
+ postapplytitle,
+ shixunnametype,
+ shixunmaintype,
+ evaluate_scripttype,
+ exec_timetype,
+ traineetype,
+ standard_scripts,
+ description,
+ evaluate_script,
+ name,
+ settingsData,
+ webssh,
+ use_scope,
+ shixunsstatus,
+ shixunsID,
+ exec_time,
+ pod_exist_time,
+ pod_exist_timetype,
+ can_copy,
+ choice_standard_scripts,
+ Executiveordervalue,
+ Executivetyoe,
+ Compilecommandvalue,
+ task_pass,
+ test_set_permission,
+ hide_code,
+ forbid_copy,
+ code_hidden,
+ vnc,
+ scopetype,
+ scope_partment,
+ departmentslist,
+ trainee,
+ choice_main_type,
+ choice_small_type,
+ standard_scriptsModal,
+ standard_scriptsModals,
+ SelectTheCommandtype,
+ status,
+ opers,
+ operss,
+ opersss,
+ testscripttiptype,
+ operateshixunstype,
+ opening_time,
+ opensmail,
+ scope_partmenttype,
+ newuse_scope,
+ scope_partments,
+ shixunmemoMDvalue,delType
+ } = this.state;
+
+ let options;
+
+ if (departmentslist != undefined) {
+ options = this.state.departmentslist.map((d, k) => {
+ return (
+
+ )
+ })
+ }
+
+ const dateFormat = 'YYYY-MM-DD HH:mm:ss';
+ let operateauthority=this.props.identity===1?true:this.props.identity<4&&this.props.status==0;
+
+ return (
+
-
-
-
- 配置
- {
- this.props.identity===1&&this.props.status==2?
- this.operateshixuns(2)}>
- 永久关闭
- :""
- }
- {
- this.props.identity < 4 && this.props.status==0?
- this.operateshixuns(1)}>
- 删除实训
- :""
- }
- {
- this.props.identity == 1 && this.props.status == 2 ?
- this.operateshixuns(1)}>
- 删除实训
- :""
- }
-
-
-
-
-
-
-
- {delType===1?
-
- 是否确认删除 ？
:关闭后,
用户不能再开始挑战了是否确认关闭 ？
-
-
- 实训名称
- -
- *
-
-
-
-
-
-
-
- {settingsData === undefined ? "" :
- }
-
-
- 必填项
-
-
-
-
-
- 简介
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 评测脚本
-
-
-
-
-
-
-
-
-
-
- {
- this.props.identity<4||this.props.power==true?
- 使用自定义脚本 : ""
- }
-
-
-
-
-
-
-
-
-
- 原有脚本将被新的脚本覆盖，无法撤销
-是否确认执行覆盖操作
-评测脚本生成成功！
-
-
-
-
-
-
-
-
-
-
- 执行命令不能为空
-
-
- *
-
-
-
-
-
-
-
-
-
-
-
- {/**/}
- {/*{evaluate_script===undefined?"":evaluate_script}*/}
-
- {/*
*/}
-
-
-
- this.testscripttip(0)}>![]({getImageUrl("images/educoder/problem.png"))
-
-
-
-
-
-
-
-
-
- 使用自定义模板，平台无法自动更新脚本，
- 请在关卡创建完后手动更新脚本中的必填参
- 数和以下2个数组元素：
- challengeProgramNames
- sourceClassNames
- 示例：有2个关卡的实训
- 各关卡的待编译文件为：
- src/step1/HelloWorld.java
- src/step2/Other.java
- 各关卡的编译后生成的执行文件为：
- step1.HelloWorld
- step2.Other
- 则数组元素更新如下：
- challengeProgramNames=("src/step1/
- HelloWorld.java" "src/step2/Other.java")
- sourceClassNames=("step1.HelloWorld
- " "step2.Other")
- 其它参数可按实际需求定制
-
-
-
-
- 必填项
-
-
-
-
- *
-
-
-
- {/* 程序最大执行时间
- - 秒 - -
- 必填项
-
-
- *
-
-
*/}
-
-
- Pod存活时间
- - 秒 - -
- 必填项
-
-
-
- 无命令行窗口 （选中则不给学员的实践任务提供命令窗口）
- 命令行练习窗口 （选中则给学员提供用于练习操作的命令行窗口）
- 命令行评测窗口 （选中则给学员提供用于关卡评测的命令行窗口）
-
- 多个命令行窗口（选中则允许学员同时开启多个命令行窗口）
-
-
-
-
- 命令行
-
-
- 对所有公开 (选中则所有已被试用授权的用户可以学习)
- 对指定单位公开 (选中则下方指定单位的已被试用授权的用户可以学习)
-
-
-
-
- 公开程度
-
-
-
-
-
-
-
-
-
- {/*+*/}
- {/*添加*/}
-
-
-
- (搜索并选中添加单位名称)
-
-
-
-
- 请选择需要公开的单位
-
-
- {
- scope_partment===undefined?"":scope_partment.map((item,key)=>{
-
- return(
- {item}
- this.deleteScopeInput(key)}
- // style={{display:this.props.status===2&&this.props.identity>1||this.props.status===1&&this.props.identity>1===true?"none":"block"}}
- >
- {this.props.identity===1?"x":this.props.status===2&&scope_partment===scope_partments||this.props.status===1&&scope_partment===scope_partments?"":"×"}
-
-
- )
- })
- }
-
- {/*{*/}
- {/*scope_partment===undefined?"":scope_partment.map((item,key)=>{*/}
- {/*return(*/}
- {/**/}
- {/*this.deleteScopeInput(key)} style={{ color: 'rgba(0,0,0,.25)' }} />}*/}
- {/*value={item}*/}
- {/*/>*/}
- {/*
*/}
-
- {/*)*/}
- {/*})*/}
- {/*}*/}
-
-
-
- 发布信息
- -
- *
- 面向学员：
-
-
-
-
-
- 实训难易度定位，不限定用户群体
-
- 必填项
-
-
-
- 复制:
-
-
-
-
- 跳关:
-
-
-
- 测试集解锁:
-
-
-
-
- 隐藏代码窗口:
-
-
-
-
- 代码目录隐藏:
-
-
-
-
- 禁用复制粘贴:
-
-
-
-
- 开启时间:
-
-
- {/**/}
- {/*VNC图形化:*/}
- {/**/}
- {/*
*/}
-
- - { - // this.props.identity<4&&this.props.status==0? - this.props.identity<4? -
:"" - } - {/*{*/} - {/*this.props.identity===1&&this.props.status==2?*/} - {/* :""*/} - {/*}*/} - - - - - {/*{*/} - {/*this.props.identity===1||this.props.power==true?*/} - {/* :""*/} - - {/*}*/} - {/**/} - - -
+
+ );
+ }
+}
+
+
From 3993378c4d60512230e481a589d9892cb19febd2 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 24 Jun 2019 16:33:17 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/busyWork/CommonWorkAppraise.js | 7 ++
.../courses/busyWork/CommonWorkList.js | 2 +-
.../courses/busyWork/CommonWorkSetting.js | 78 ++++++++++++++-----
.../GraduationTasksappraiseMainEditor.js | 3 +-
.../courses/poll/PollDetailTabForthRules.js | 4 +-
5 files changed, 68 insertions(+), 26 deletions(-)
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index 616c86f33..77317792e 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -180,6 +180,12 @@ class CommonWorkAppraise extends Component{
+
+
+
+ 配置
+ {
+ this.props.identity===1&&this.props.status==2?
+ this.operateshixuns(2)}>
+ 永久关闭
+ :""
+ }
+ {
+ this.props.identity < 4 && this.props.status==0?
+ this.operateshixuns(1)}>
+ 删除实训
+ :""
+ }
+ {
+ this.props.identity == 1 && this.props.status == 2 ?
+ this.operateshixuns(1)}>
+ 删除实训
+ :""
+ }
+
+
+
+
+
+
+
+ {delType===1?
+
+ 是否确认删除 ？
:关闭后,
用户不能再开始挑战了是否确认关闭 ？
+
+
+ 实训名称
+ +
+ *
+
+
+
+
+
+
+
+ {settingsData === undefined ? "" :
+ }
+
+
+ 必填项
+
+
+
+
+
+ 简介
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 评测脚本
+
+
+
+
+
+
+
+
+
+
+ {
+ this.props.identity<4||this.props.power==true?
+ 使用自定义脚本 : ""
+ }
+
+
+
+
+
+
+
+
+
+ 原有脚本将被新的脚本覆盖，无法撤销
+是否确认执行覆盖操作
+评测脚本生成成功！
+
+
+
+
+
+
+
+
+
+
+ 执行命令不能为空
+
+
+ *
+
+
+
+
+
+
+
+
+
+
+
+ {/**/}
+ {/*{evaluate_script===undefined?"":evaluate_script}*/}
+
+ {/*
*/}
+
+
+
+ this.testscripttip(0)}>
+
+
+
+
+
+
+
+
+
+ 使用自定义模板，平台无法自动更新脚本，
+ 请在关卡创建完后手动更新脚本中的必填参
+ 数和以下2个数组元素：
+ challengeProgramNames
+ sourceClassNames
+ 示例：有2个关卡的实训
+ 各关卡的待编译文件为：
+ src/step1/HelloWorld.java
+ src/step2/Other.java
+ 各关卡的编译后生成的执行文件为：
+ step1.HelloWorld
+ step2.Other
+ 则数组元素更新如下：
+ challengeProgramNames=("src/step1/
+ HelloWorld.java" "src/step2/Other.java")
+ sourceClassNames=("step1.HelloWorld
+ " "step2.Other")
+ 其它参数可按实际需求定制
+
+
+
+
+ 必填项
+
+
+
+
+ *
+
+
+
+ {/* 程序最大执行时间
+ + 秒 + +
+ 必填项
+
+
+ *
+
+
*/}
+
+
+ Pod存活时间
+ + 秒 + +
+ 必填项
+
+
+
+ 无命令行窗口 （选中则不给学员的实践任务提供命令窗口）
+ 命令行练习窗口 （选中则给学员提供用于练习操作的命令行窗口）
+ 命令行评测窗口 （选中则给学员提供用于关卡评测的命令行窗口）
+
+ 多个命令行窗口（选中则允许学员同时开启多个命令行窗口）
+
+
+
+
+ 命令行
+
+
+ 对所有公开 (选中则所有已被试用授权的用户可以学习)
+ 对指定单位公开 (选中则下方指定单位的已被试用授权的用户可以学习)
+
+
+
+
+ 公开程度
+
+
+
+
+
+
+
+
+
+ {/*+*/}
+ {/*添加*/}
+
+
+
+ (搜索并选中添加单位名称)
+
+
+
+
+ 请选择需要公开的单位
+
+
+ {
+ scope_partment===undefined?"":scope_partment.map((item,key)=>{
+
+ return(
+ {item}
+ this.deleteScopeInput(key)}
+ // style={{display:this.props.status===2&&this.props.identity>1||this.props.status===1&&this.props.identity>1===true?"none":"block"}}
+ >
+ {this.props.identity===1?"x":this.props.status===2&&scope_partment===scope_partments||this.props.status===1&&scope_partment===scope_partments?"":"×"}
+
+
+ )
+ })
+ }
+
+ {/*{*/}
+ {/*scope_partment===undefined?"":scope_partment.map((item,key)=>{*/}
+ {/*return(*/}
+ {/**/}
+ {/*this.deleteScopeInput(key)} style={{ color: 'rgba(0,0,0,.25)' }} />}*/}
+ {/*value={item}*/}
+ {/*/>*/}
+ {/*
*/}
+
+ {/*)*/}
+ {/*})*/}
+ {/*}*/}
+
+
+
+ 发布信息
+ +
+ *
+ 面向学员：
+
+
+
+
+
+ 实训难易度定位，不限定用户群体
+
+ 必填项
+
+
+
+ 复制:
+
+
+
+
+ 跳关:
+
+
+
+ 测试集解锁:
+
+
+
+
+ 隐藏代码窗口:
+
+
+
+
+ 代码目录隐藏:
+
+
+
+
+ 禁用复制粘贴:
+
+
+
+
+ 开启时间:
+
+
+ {/**/}
+ {/*VNC图形化:*/}
+ {/**/}
+ {/*
*/}
+
+ + { + // this.props.identity<4&&this.props.status==0? + this.props.identity<4? +
:"" + } + {/*{*/} + {/*this.props.identity===1&&this.props.status==2?*/} + {/* :""*/} + {/*}*/} + + + + + {/*{*/} + {/*this.props.identity===1||this.props.power==true?*/} + {/* :""*/} + + {/*}*/} + {/**/} + + +
+
+
-
)
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 1574d692d..181a34b1b 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -259,15 +259,20 @@ class CommonWorkSetting extends Component{
unified_setting: checked
})
}
+ // 启用匿评
anonymous_comment_change = (e) => {
const checked = e.target.checked;
- const { end_time } = this.state;
+ const currentEndTime = this._getCurrentEndTime()
let evaluation_start, evaluation_end, evaluation_num = 0, absence_penalty = 0;
if (checked) {
- if (end_time) {
- evaluation_start = moment(end_time).add(7, 'days').format(dateFormat)
- evaluation_end = moment(end_time).add(21, 'days').format(dateFormat)
+ if (currentEndTime) {
+ evaluation_start = moment(currentEndTime).add(7, 'days').format(dateFormat)
+ evaluation_end = moment(currentEndTime).add(21, 'days').format(dateFormat)
+ }
+ if (!this.state.evaluation_num) {
evaluation_num = 3
+ }
+ if (!this.state.absence_penalty) {
absence_penalty = 2
}
} else {
@@ -310,6 +315,7 @@ class CommonWorkSetting extends Component{
absence_penalty:value
})
}
+ // 启用匿评申诉
anonymous_appeal_change = (e) => {
const { evaluation_end } = this.state;
const anonymous_appeal = e.target.checked
@@ -389,9 +395,10 @@ class CommonWorkSetting extends Component{
this.setState({
late_penalty: 5
})
- if (this.state.end_time && !this.state.late_time) {
+ const currentEndTime = this._getCurrentEndTime();
+ if (currentEndTime && !this.state.late_time) {
this.setState({
- late_time: moment(handleDateString(this.state.end_time)).add(1, 'months').format(dateFormat)
+ late_time: moment(handleDateString(currentEndTime)).add(1, 'months').format(dateFormat)
})
}
}
@@ -469,6 +476,20 @@ class CommonWorkSetting extends Component{
// }
}
+ _getCurrentEndTime = () => {
+ const { unified_setting, end_time, rules } = this.state;
+ if (unified_setting) {
+ return end_time
+ } else {
+ let max_un_unified_setting_end_time = null;
+ rules.map(item => {
+ if (!max_un_unified_setting_end_time || moment(item.end_time) > moment(max_un_unified_setting_end_time)) {
+ max_un_unified_setting_end_time = item.end_time;
+ }
+ })
+ return max_un_unified_setting_end_time
+ }
+ }
saveWorkSetting=()=>{
let workId=this.props.match.params.workId;
@@ -1077,6 +1098,7 @@ class CommonWorkSetting extends Component{
course_group={adaptered_group_settings}
rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
flagPageEdit={true}
+ moduleName="作业"
>
}
@@ -1254,7 +1276,7 @@ class CommonWorkSetting extends Component{
margin-left: 18px;
}
`}
-
{(description || (attachments && attachments.length != 0)) &&
}
+
{/* task_type={datalist&&datalist.task_type} */}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 1e8c634f6..a9090a02e 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -228,7 +228,7 @@ function buildColumns(that, student_works) {
内容
@@ -286,6 +292,7 @@ class CommonWorkAppraise extends Component{
{`${record.student_comment_count}名学生进行了匿评`}
+ {record.student_comment_count && {`${record.student_comment_count}名学生进行了匿评`}
}
有效平均分：{record.student_score}分
允许学生对自己作品的匿评评分进行申诉，由教师和助教处理申诉
@@ -1297,7 +1319,7 @@ class CommonWorkSetting extends Component{
-
+ （学生提交匿评申诉的时间截点）
{
{appeal_time_tip}
}
@@ -1311,7 +1333,7 @@ class CommonWorkSetting extends Component{
/>
-
+ （学生违规匿评TA人作品时，其成绩将被扣减的分值）
{this.state.appeal_penalty_tip && {this.state.appeal_penalty_tip}
}
@@ -1346,21 +1368,17 @@ class CommonWorkSetting extends Component{
计算说明：
- 优先顺序排前的非零评分 * 100% -
- ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
- 例：有教师评分则教师评分100%，否则教辅评分100%，依次类推
- {/* 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 -
- ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
-
-
+ 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 - (
+ 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
注意
- 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外的评
- 分选项上。例如：教师评分40% + 助教评分35% + 学生匿评25%，学生A没
- 有得到教师评分，则最终成绩将按照助教评分55% + 学生匿评45%进行计算 */}
+ 非零百分比的评分选项，若评分记录为空，则其百分比将自动平摊到其它非零
+ 评分选项上。
+ 例：教师评分40% + 助教评分35% + 学生匿评25%，学生A没有教师评分记
+ 录，则其最终成绩按照助教评分55% + 学生匿评45%进行计算
{final_mode_false_tip}
}
+ 计算说明：
+
+ 优先顺序排前的非零评分 * 100% -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+ 例：有教师评分则教师评分100%，否则教辅评分100%，依次类推
+ {/* 教师评分 * 其百分比 + 助教评分 * 其百分比 + 学生匿评平均分 * 其百分比 -
+ ( 迟交扣分 + 缺评扣分 * 缺评数 + 违规匿评扣分 * 违规匿评数 )
+
+
+ 注意
+ 非零百分比的评分选项，在没有评分记录的情况下，其百分比平摊到另外的评
+ 分选项上。例如：教师评分40% + 助教评分35% + 学生匿评25%，学生A没
+ 有得到教师评分，则最终成绩将按照助教评分55% + 学生匿评45%进行计算 */}
+
+
教师评分 → 教辅评分 → 学生匿评评分
- （有教师评分则教师评分100%，否则教辅评分100%，依次类推 ）
+ {/* （有教师评分则教师评分100%，否则教辅评分100%，依次类推 ） */}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
index e722ac00b..15300c628 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js
@@ -197,7 +197,6 @@ class GraduationTasksappraiseMainEditor extends Component{
.mainEditor {
padding: 0 10px;
padding-bottom: 8px;
- height: 288px;
}
.mainEditorTitle {
margin-bottom: 6px;
@@ -218,7 +217,7 @@ class GraduationTasksappraiseMainEditor extends Component{
-
+
memberNumMax){
+ }else if(userids.length + 1>memberNumMax){
this.setState({
minvalue: memberNumMax,
setvalue:"大于",
From e8b00031aae80e0ea307474e8b8a0d88ef2aeb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 24 Jun 2019 17:13:23 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=20=E5=AE=9E=E8=AE=AD=E6=9D=83=E9=99=90?=
=?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 | 20 +++++++++----------
.../tpm/shixunchild/Challenges/Challenges.js | 18 ++++++++---------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 82c18a09d..25a6ab9c7 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -354,7 +354,7 @@ class TPMBanner extends Component {
//开始实战按钮
startshixunCombat=(id)=>{
let {shixunsDetails} = this.props
- if( shixunsDetails.status>1){
+ if( shixunsDetails.shixun_status>1){
this.setState({
startbtn:true,
hidestartshixunsreplacevalue:""
@@ -463,11 +463,11 @@ class TPMBanner extends Component {
//
// }
if(shixunsDetails!=undefined){
- if (shixunsDetails.status === 0 ) {
+ if (shixunsDetails.shixun_status === 0 ) {
challengeBtnText = '继续实战'
- } else if (shixunsDetails.status === 1) {
+ } else if (shixunsDetails.shixun_status === 1) {
challengeBtnText = '查看实战'
- } else if (shixunsDetails.status === 3) {
+ } else if (shixunsDetails.shixun_status === 3) {
challengeBtnText = '继续实战'
}else{
challengeBtnText = "开始实战"
@@ -640,7 +640,7 @@ class TPMBanner extends Component {
className="fr user_default_btn task-btn-orange font-18"
id="shixun_operation" data-remote="true"
>
- {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0]}
+ {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.shixun_status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"}
: ""
@@ -707,7 +707,7 @@ class TPMBanner extends Component {
{/*>{shixunsDetails.task_operation===undefined?"":shixunsDetails.task_operation[0]}:""*/}
{/*}*/}
- {shixunsDetails.status === 0 && this.props.identity < 4 ?
+ {shixunsDetails.shixun_status === 0 && this.props.identity < 4 ?
申请发布 : ""
}
@@ -772,7 +772,7 @@ class TPMBanner extends Component {
- {shixunsDetails.status === 1 && this.props.identity < 4 ?
+ {shixunsDetails.shixun_status === 1 && this.props.identity < 4 ?
撤销发布 : ""
}
@@ -781,7 +781,7 @@ class TPMBanner extends Component {
发送至
@@ -847,7 +847,7 @@ class TPMBanner extends Component {
- {shixunsDetails.status === 3 &&
+ {shixunsDetails.shixun_status === 3 &&
已关闭
}
@@ -918,7 +918,7 @@ class TPMBanner extends Component {
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 49d7cf016..09bab590d 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -239,7 +239,7 @@ class Challenges extends Component {
- (学生收到{this.props.type==="Exercise"?"试卷":"问卷"}的时间) - (学生可以答题的时间截点) + (学生收到{this.props.moduleName || (this.props.type==="Exercise"?"试卷":"问卷")}的时间) + ({this.props.moduleName == '作业' ? '学生“按时”提交作品的时间截点' : '学生可以答题的时间截点'})
{ From 786cdff86cbec190f1837708500ba3918faa6545 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 24 Jun 2019 16:46:06 +0800 Subject: [PATCH 14/17] memberNumMax --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index c75e62a10..0193d8659 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -173,7 +173,7 @@ class CommonWorkPost extends Component{ } if(isGroup){ if(userids!=undefined){ - if(userids.length正在等待管理员的审核。在审核通过前，可以随时撤销发布
简介
-
- {ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?"":
+ {ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":
全部任务
- {this.props.identity < 4 && this.props.status === 0 ?
+ {this.props.identity < 4 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?
: ""
}
- {this.props.identity < 4 && this.props.status === 0 ?
+ {this.props.identity < 4 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ?
this.delOperations(item.challenge_id)}
- style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
@@ -249,7 +249,7 @@ class Challenges extends Component {
@@ -371,7 +371,7 @@ class Challenges extends Component {
{item.up_url != undefined &&
@@ -381,7 +381,7 @@ class Challenges extends Component {
{item.down_url != undefined &&
@@ -393,7 +393,7 @@ class Challenges extends Component {
item.st === 1 ?
Date: Mon, 24 Jun 2019 17:41:36 +0800
Subject: [PATCH 16/17] ConnectProject
---
.../courses/busyWork/CommonWorkItem.js | 19 +++++++++++++-
.../courses/busyWork/ConnectProject.js | 26 ++++++++++++++++---
.../modules/courses/busyWork/commonWork.js | 23 +++++++++++++++-
3 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
index 7f5bea2da..2ac4761e1 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js
@@ -97,6 +97,13 @@ class CommonWorkItem extends Component{
setupdate = () => {
}
+ toCreateProject = () => {
+ if (window.location.port == 3007) {
+ window.location.href = '/testbdweb.educoder.net/projects/new'
+ } else {
+ window.location.href = '/projects/new'
+ }
+ }
render(){
let { mainList,workType }=this.props;
const { aModalVisible, fileList, revise_reason } = this.state
@@ -195,12 +202,22 @@ class CommonWorkItem extends Component{
+
+
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 02fab16a9..c9637f1f8 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -51,7 +51,7 @@ function buildColumns(that) {
dataIndex: 'role',
key: 'role',
}]
- that.course_groups && that.course_groups.length && columns.push({
+ that.state.course_groups && that.state.course_groups.length && columns.push({
title:
{
(projects && !!projects.length || this.state.keyword) &&
*/}
-
@@ -131,7 +149,7 @@ class ConnectProject extends Component{
onSearch={this.onSearchValue}
>
+
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index 18c668efe..28199c4c0 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -279,6 +279,26 @@ class commonWork extends Component{
console.log(error)
})
}
+ connectSuccess = () => {
+ let {page,search,order}=this.state;
+ this.getList(page,search,order);
+ }
+
+ cancelConnectionProject = (work) => {
+ let workId=this.props.match.params.workId;
+ let courseId=this.props.match.params.coursesId;
+
+ const url = `/homework_commons/${work.homework_id}/student_works/cancel_relate_project.json`
+ axios.get(url).then((response)=> {
+ if (response.data.status == 0) {
+ let {page,search,order}=this.state;
+ this.getList(page,search,order);
+ this.props.showNotification('取消关联成功')
+ }
+ }).catch((error)=>{
+ console.log(error)
+ })
+ }
render(){
@@ -341,7 +361,7 @@ class commonWork extends Component{
-