From a18a3a63d6c62713450c5ef49d82d9de74ecd9f5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 19 Jul 2019 09:16:38 +0800 Subject: [PATCH 1/5] cannotLink --- public/react/src/modules/courses/busyWork/CommonWorkItem.js | 5 ++--- public/react/src/modules/courses/poll/PollListItem.js | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 6521d2add..bde311290 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -139,10 +139,9 @@ class CommonWorkItem extends Component{ }
this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>

- {/* 放开点击进入，进入后弹框，canNotLink ? () => {} : */} this.onItemClick(item)} + className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'default' : 'poninter'}} + onClick={ canNotLink ? () => {} : () => this.onItemClick(item)} >{item.name} {/* 只有非课堂成员且作业是私有的情况下才会为true */} diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js index e456e2ed9..50c471e76 100644 --- a/public/react/src/modules/courses/poll/PollListItem.js +++ b/public/react/src/modules/courses/poll/PollListItem.js @@ -22,8 +22,10 @@ class PollListItem extends Component{ const IsAdmin =this.props.isAdmin(); const isStudent = this.props.isStudent(); const isNotMember = this.props.isNotMember(); + const isAdminOrStudent = this.props.isAdminOrStudent(); let t= item.end_time ? moment(item.end_time) - moment() : 0; + let canNotLink = !isAdminOrStudent && item.lock_status == 0 return(

@@ -35,7 +37,9 @@ class PollListItem extends Component{ }

- {item.polls_name} + { canNotLink ? {item.polls_name} : + {item.polls_name} + } { item.lock_status === 0 ? From a223cd80946cd5ef898085163c66fa4b51b4015e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 19 Jul 2019 09:18:04 +0800 Subject: [PATCH 2/5] 0 --- public/react/src/modules/courses/members/teacherList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index 5b2615d8b..92b0e0d4b 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -667,7 +667,7 @@ class studentsList extends Component{ `}

- { course_groups && course_groups.length && Date: Fri, 19 Jul 2019 10:12:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/page/main/CodeEvaluateView.css | 16 +++++++++++++++- .../src/modules/page/main/CodeEvaluateView.js | 7 ++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/page/main/CodeEvaluateView.css b/public/react/src/modules/page/main/CodeEvaluateView.css index 99b08a496..bd0427d7b 100644 --- a/public/react/src/modules/page/main/CodeEvaluateView.css +++ b/public/react/src/modules/page/main/CodeEvaluateView.css @@ -112,4 +112,18 @@ } #evaluating_contents .-text-danger{ padding-bottom: 6px; - } \ No newline at end of file + } + + +.-task-ces-top .description { + color: #616B77; + padding: 0 8px; + font-size: 12px; +} +.-task-ces-top .split { + border-right: 1px solid #616B77; + width: 1px; + display: inline-block; + height: 10px; + margin: 5px 0; +} \ No newline at end of file diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js index a738d03fb..48bb0b245 100644 --- a/public/react/src/modules/page/main/CodeEvaluateView.js +++ b/public/react/src/modules/page/main/CodeEvaluateView.js @@ -172,7 +172,7 @@ class CodeEvaluateView extends Component { } else if (item.result == false) { headIconClass = 'fa-exclamation-circle -text-danger' } - + testSetsComponentArray.push(
@@ -180,8 +180,13 @@ class CodeEvaluateView extends Component { 测试集 {index + 1} + { headIconClass && } { _headLockIconClass && } + + { item.ts_memo && 消耗内存{item.ts_memo}MB } + { item.ts_memo && item.ts_time && } + { item.ts_time && 代码执行时长：{item.ts_time}秒 }

From 02f1650cd341e89a2a168ffc7dda380d1efc1899 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 19 Jul 2019 11:03:12 +0800 Subject: [PATCH 4/5] id --- .../react/src/modules/courses/Resource/index.js | 2 +- public/react/src/modules/courses/boards/index.js | 2 +- .../modules/courses/busyWork/CommonWorkItem.js | 2 +- .../src/modules/courses/exercise/Exercise.js | 2 +- .../modules/courses/graduation/tasks/index.js | 2 +- .../modules/courses/graduation/topics/index.js | 2 +- .../src/modules/courses/members/studentsList.js | 16 ++-------------- 7 files changed, 8 insertions(+), 20 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index 6501716b7..c755efabd 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -905,7 +905,7 @@ class Fileslists extends Component{ isAdmin={this.props.isAdmin()} isStudent={this.props.isStudent()} isNotMember={this.props.isNotMember()} - checkBox={this.props.isAdmin()?:""} + checkBox={this.props.isAdmin()?:""} Settingtypes={(id)=>this.Settingtypes(id)} coursesId={this.props.match.params.coursesId} updatafiledfun={()=>this.updatafiled()} diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js index 5bf5cadc7..94c8c4c00 100644 --- a/public/react/src/modules/courses/boards/index.js +++ b/public/react/src/modules/courses/boards/index.js @@ -428,7 +428,7 @@ class Boards extends Component{ : ''} + checkBox={ isAdmin ? : ''} onItemClick={this.onItemClick} onSticky={this.onSticky} > diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index bde311290..2610a7782 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -135,7 +135,7 @@ class CommonWorkItem extends Component{
{ mainList && isAdmin && - + }
this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>

diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js index 5058b5719..4331bdc6f 100644 --- a/public/react/src/modules/courses/exercise/Exercise.js +++ b/public/react/src/modules/courses/exercise/Exercise.js @@ -560,7 +560,7 @@ class Exercise extends Component{ {...this.state} item={item} key={key} - checkBox={ this.onItemClick(item)} >} > diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index 0a4bd47b4..7bf9b690b 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -730,7 +730,7 @@ debugger isAdmin={this.props.isAdmin()} isStudent={this.props.isStudent()} isNotMember={this.props.isNotMember()} - checkBox={this.props.isAdmin()?:""} + checkBox={this.props.isAdmin()?:""} // onItemClick={this.onItemClick} // onSticky={this.onSticky} funlist={()=>this.fetchAll(search,page,order)} diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js index 8ed3118b9..6dab02f07 100644 --- a/public/react/src/modules/courses/graduation/topics/index.js +++ b/public/react/src/modules/courses/graduation/topics/index.js @@ -411,7 +411,7 @@ onBoardsNew=()=>{ {...this.props} discussMessage={item} data={data} - checkBox={ this.onItemClick(item)} className="mr15">} + checkBox={ this.onItemClick(item)} className="mr15">} onItemClick={this.onItemClick} index={index} chooseTopic={this.chooseTopic} diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index c073abf4f..acffd8ef4 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -17,19 +17,6 @@ import DownloadMessageysl from "../../modals/DownloadMessageysl"; import CreateGroupByImportModal from './modal/CreateGroupByImportModal' const Search =Input.Search; -const dataSource = [{ - check:, - id: 1, - name: 胡莎莎, - StuNo: 32, - classes: 西湖区湖底公园1号 -}, { - check:, - id: 2, - name: 胡莎莎, - StuNo: 32, - classes: 西湖区湖底公园2号 -}]; const buildColumns = (that) => { const { course_groups } = that.state @@ -100,7 +87,7 @@ const buildColumns = (that) => { dataIndex: 'check', key: 'check', render: (text, item) => { - return + return }, width:"5%" }) @@ -280,6 +267,7 @@ class studentsList extends Component{ } componentDidUpdate(prevProps) { if (prevProps.match.params.course_group_id != this.props.match.params.course_group_id) { + this.setState({checkBoxValues: []}) this.fetchAll(1) } // 加载了2次 From 38539ad4980179481331f05c25830a574f4010ef 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, 19 Jul 2019 14:16:24 +0800 Subject: [PATCH 5/5] =?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/config/webpack.config.dev.js | 2 +- .../courses/shixunHomework/TraineetraininginformationModal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js index 093f1d4d8..12d5e437f 100644 --- a/public/react/config/webpack.config.dev.js +++ b/public/react/config/webpack.config.dev.js @@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl); module.exports = { // You may want 'eval' instead if you prefer to see the compiled output in DevTools. // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s - devtool: "source-map", // 开启调试 + devtool: "eval", // 开启调试 // These are the "entry points" to our application. // This means they will be the "root" imports that are included in JS bundle. // The first two entry points enable "hot" CSS and auto-refreshes for JS. diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index 8cc79af8f..58a12eff1 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -27,7 +27,7 @@ import '../css/members.css' import "../common/formCommon.css" import '../css/Courses.css' import './style.css' -import ShixunModal from "../coursesPublic/ShixunModal"; + class TraineetraininginformationModal extends Component { constructor(props) {