From 74ed2ec427c145a85510fba64d2b395f253847fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 25 Jun 2019 00:31:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/package.json | 4 +- .../src/modules/login/Trialapplication.js | 6 +- .../modules/tpm/TPMsettings/TPMsettings.js | 34 ++- .../tpm/TPMsettings/css/TPMsettings.css | 199 +++++++++--------- 4 files changed, 136 insertions(+), 107 deletions(-) diff --git a/public/react/package.json b/public/react/package.json index 19b8286d9..5aebf0d41 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -3,10 +3,9 @@ "version": "0.1.0", "private": true, "dependencies": { - "@novnc/novnc": "^1.1.0", - "@flatten/array": "^1.1.7", "@icedesign/base": "^0.2.5", + "@novnc/novnc": "^1.1.0", "antd": "^3.6.5", "array-flatten": "^2.1.2", "autoprefixer": "7.1.6", @@ -41,6 +40,7 @@ "fs-extra": "3.0.1", "html-webpack-plugin": "2.29.0", "immutability-helper": "^2.6.6", + "install": "^0.12.2", "jest": "20.0.4", "js-file-download": "^0.4.7", "lodash": "^4.17.5", diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js index 283574938..4f8c5d114 100644 --- a/public/react/src/modules/login/Trialapplication.js +++ b/public/react/src/modules/login/Trialapplication.js @@ -77,9 +77,9 @@ class Trialapplication extends Component { //TODO 这里如果样式变了会出现css不加载的情况 }); - console.log(this.props.isRenders); - console.log("89"); - console.log(this.state.props.user_phone_binded ); + // console.log(this.props.isRenders); + // console.log("89"); + // console.log(this.state.props.user_phone_binded ); try { if (this.state.props.user_phone_binded !== undefined) { console.log(this.state.props.user_phone_binded); diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index 351a461f4..b838f7066 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -1,5 +1,8 @@ import React, { Component } from 'react'; +import MonacoEditor from 'react-monaco-editor'; + +//MonacoDiffEditor 对比模式 import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker} from 'antd'; // import "antd/dist/antd.css"; @@ -222,7 +225,8 @@ export default class TPMsettings extends Component { pod_exist_time: undefined, pod_exist_timetype: false, - shixunmemoMDvalue:"" + shixunmemoMDvalue:"", + language:"" } } descriptionMD=(initValue, id)=> { @@ -894,6 +898,7 @@ export default class TPMsettings extends Component { SelectScput = (value, e) => { this.setState({ choice_standard_scriptssum: value, + language:e.props.name, choice_standard_scripts: {id:e.props.value,value:""}, standard_scriptsModal:true }) @@ -1003,11 +1008,15 @@ export default class TPMsettings extends Component { }) } - getshixunmemoMDvalue=(e)=>{ + getshixunmemoMDvalue=(value, e)=>{ + this.setState({ - shixunmemoMDvalue:e.target.value + shixunmemoMDvalue:value }) } + + + render() { let { postapplyvisible, @@ -1370,15 +1379,26 @@ export default class TPMsettings extends Component {
*
-
- +
+ {/**/} +
diff --git a/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css b/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css index 3e7e3b190..0df6110be 100644 --- a/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css +++ b/public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css @@ -1,96 +1,105 @@ -.radioStyle{ - display: block; - height: 30px; - } -#settingsMarkdown{ - background:transparent; -} -#challenge_begin{ - height: 30px; - line-height: 30px; -} -#shixundescription .CodeMirror{ - width: 570px !important; - margin-top: 31px !important; - height: 364px !important; -} -#shixundescription .editormd-preview{ - width: 567px !important; - top: 40px !important; - height: 364px !important; -} - -#shixunmemoMD .CodeMirror{ - width: 548px !important; - margin-top: 31px !important; - height: 578px !important; -} - -#shixunmemoMD .editormd-preview{ - width: 544px !important; - top: 40px !important; - height: 578px !important; -} - -.radioStyle { - display: block; - height: 30px; -} - -a.white-btn.use_scope-btn:hover { - color: #FFF !important; -} - -.shixunScopeInput { - width: 218px; - height: 33px; - display: block; - margin-bottom: 15px; -} - -.ant-modal-title { - text-align: center; -} - -a.newuse_scope-btn:hover { - border: 1px solid #F06200; - color: #fff !important; - background: #FF7500; -} - -a.newuse_scope-btn { - border: 1px solid #FF7500; - color: #FF7500 !important; -} - -.tpmprompt { - padding-left: 20px; - margin-top: -4px; -} -.ml36{ - margin-left: 26px; -} - -#shixunmemoMD{ - width:98% !important; - height: 620px !important; -} -.pdr20{ - padding-right:20px; -} - -.nonemodel{ - width: 30%; - height: 624px; - /*background: rgba(0, 0, 0, 0.65);*/ - background: #f5f5f5; - position: absolute; - z-index: 100; - opacity: 0.5; - left: 21.5%; -} - -.shixunmemoMDdiv{ - width: 99%; - height: 615px; +.radioStyle{ + display: block; + height: 30px; + } +#settingsMarkdown{ + background:transparent; +} +#challenge_begin{ + height: 30px; + line-height: 30px; +} +#shixundescription .CodeMirror{ + width: 570px !important; + margin-top: 31px !important; + height: 364px !important; +} +#shixundescription .editormd-preview{ + width: 567px !important; + top: 40px !important; + height: 364px !important; +} + +#shixunmemoMD .CodeMirror{ + width: 548px !important; + margin-top: 31px !important; + height: 578px !important; +} + +#shixunmemoMD .editormd-preview{ + width: 544px !important; + top: 40px !important; + height: 578px !important; +} + +.radioStyle { + display: block; + height: 30px; +} + +a.white-btn.use_scope-btn:hover { + color: #FFF !important; +} + +.shixunScopeInput { + width: 218px; + height: 33px; + display: block; + margin-bottom: 15px; +} + +.ant-modal-title { + text-align: center; +} + +a.newuse_scope-btn:hover { + border: 1px solid #F06200; + color: #fff !important; + background: #FF7500; +} + +a.newuse_scope-btn { + border: 1px solid #FF7500; + color: #FF7500 !important; +} + +.tpmprompt { + padding-left: 20px; + margin-top: -4px; +} +.ml36{ + margin-left: 26px; +} + +#shixunmemoMD{ + width:98% !important; + height: 620px !important; +} +#shixunmemoMDs{ + width: 98% !important; + height: 420px !important; +} +#shixunmemoMDs .CodeMirror { + /* width: 548px !important; */ + margin-top: 31px !important; + height: 402px !important; +} +.pdr20{ + padding-right:20px; +} + +.nonemodel{ + width: 59%; + height: 468px; + /*background: rgba(0, 0, 0, 0.65);*/ + background: #f5f5f5; + position: absolute; + z-index: 100; + opacity: 0.5; + left: 21.5%; +} + +.shixunmemoMDdiv{ + width: 99%; + height: 615px; } \ No newline at end of file From 7e8291d31f476fe528206f413767f8a8930dc454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 25 Jun 2019 00:48:56 +0800 Subject: [PATCH 2/7] b --- public/react/src/modules/tpm/TPMsettings/TPMsettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index b838f7066..85275e620 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -1379,7 +1379,7 @@ export default class TPMsettings extends Component {
*
From 8cdaf91dd5dbd86e55e3174bd029c0bf13e54a77 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 25 Jun 2019 09:18:18 +0800 Subject: [PATCH 3/7] set --- .../react/src/modules/courses/busyWork/CommonWorkSetting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 181a34b1b..4a30990ef 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -545,8 +545,8 @@ class CommonWorkSetting extends Component{ let temp_publish_time let temp_end_time if (unified_setting) { - let temp_publish_time = publish_time - let temp_end_time = end_time + temp_publish_time = publish_time + temp_end_time = end_time if (!temp_publish_time) { const publish_time_moment = getNextHalfHourOfMoment(moment()); temp_publish_time = publish_time_moment.format(dateFormat); From f287dd53ed321d5afbab7913a1d61565a0bd8b1f Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 25 Jun 2019 09:21:36 +0800 Subject: [PATCH 4/7] issues --- public/react/src/AppConfig.js | 1 + public/react/src/common/UrlTool.js | 11 +++ public/react/src/common/educoder.js | 2 +- .../exercise/Testpapersettinghomepage.js | 6 +- .../tasks/GraduationTasksappraise.js | 91 ++++++++----------- .../graduation/tasks/GraduationTasksedit.js | 2 +- .../tasks/GraduationTaskssetting.js | 17 ++-- .../tasks/GraduationTaskssettinglist.js | 6 +- .../tasks/GraduationTaskssettingquestions.js | 20 ++-- .../courses/members/modal/AddStudentModal.js | 21 +++-- .../modules/courses/members/teacherList.js | 4 + .../modules/courses/poll/PollDetailIndex.js | 2 + .../courses/poll/PollDetailTabSecond.js | 13 +-- .../courses/poll/PollDetailTabThird.js | 12 ++- .../poll/pollPublicBtn/ImmediatelyEnd.js | 4 +- .../poll/pollPublicBtn/ImmediatelyPublish.js | 4 +- .../src/modules/tpm/shixuns/ShixunCard.js | 6 +- .../src/modules/user/usersInfo/InfosShixun.js | 6 +- 18 files changed, 116 insertions(+), 112 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index bd3bb68fa..9ebc54de8 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -30,6 +30,7 @@ export function initAxiosInterceptors(props) { // proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.educoder.net" proxy = "https://testeduplus2.educoder.net" + proxy = "http://47.96.87.25:48080" // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index 2c307d13e..c0402b325 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -10,6 +10,17 @@ export function getImageUrl(path) { return `/${path}`; } +export function setImagesUrl(path){ + const local = 'http://47.96.87.25:48080' + let firstStr=path.substr(0,1); + console.log(firstStr); + if(firstStr=="/"){ + return isDev?`${local}${path}`:`${path}`; + }else{ + return isDev?`${local}/${path}`:`/${path}`; + } +} + export function getUrl(path, goTest) { // https://www.educoder.net // https://testbdweb.trustie.net diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index 285c9eac2..c77d42908 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -2,7 +2,7 @@ import { from } from '_array-flatten@2.1.2@array-flatten'; // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; -export { getImageUrl as getImageUrl, getUrl as getUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool'; +export { getImageUrl as getImageUrl, getUrl as getUrl,setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from './UrlTool'; export { default as queryString } from './UrlTool2'; export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC'; diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index f085687ff..818c882e7 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -278,7 +278,8 @@ class Testpapersettinghomepage extends Component{ className={"btn fr color-blue font-16 mt20 mr20"} checkBoxValues={[parseInt(this.props.match.params.Id)]} Exercisetype={"exercise"} - action={this.Commonheadofthetestpaper} + action={this.Commonheadofthetestpaper} + single={true} >:"":""} {isAdmin === true?Commonheadofthetestpaper!==undefined&&Commonheadofthetestpaper.user_permission.exercise_unpublish_count>0? :"":""} {isAdmin === true? 编辑试卷:""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js index 47f38746c..d2ca3855c 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js @@ -163,13 +163,13 @@ class GraduationTasksappraise extends Component{

- {datalist&&datalist.course_name} + {datalist&&datalist.course_name} > - {datalist&&datalist.graduation_name} + {datalist&&datalist.graduation_name} > - 任务详情 + 任务详情 > - {datalist&&datalist.author_name} + {datalist&&datalist.author_name}

@@ -195,16 +195,16 @@ class GraduationTasksappraise extends Component{
-
+
-
+
内容
-
+
{/*
*/} @@ -238,7 +238,7 @@ class GraduationTasksappraise extends Component{ {/**/} {/*{moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.update_time).format('YYYY-MM-DD HH:mm:ss')}*/} {/**/} - 提交 + 提交 {datalist&&datalist.author_name} {moment(datalist&&datalist.commit_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(datalist&&datalist.commit_time).format('YYYY-MM-DD HH:mm:ss')} @@ -248,20 +248,15 @@ class GraduationTasksappraise extends Component{
- {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":
- + {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"": +
补交附件
-
补交原因：{firelistdata&&firelistdata.revise_reason}
- - - - {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{ - + {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{ return( ) - })} - - - -
- - 更新 - {firelistdata&&firelistdata.atta_update_user} - - {moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')} - - -
- - + })} +
+ 更新 + {firelistdata&&firelistdata.atta_update_user} + + {moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')==="Invalid date"?"":moment(firelistdata&&firelistdata.atta_update_time).format('YYYY-MM-DD HH:mm:ss')} + +
} - - {datalist&&datalist.project_info===undefined?"":
- + {datalist&&datalist.project_info===undefined?"": +
关联项目
-
{datalist&&datalist.project_info.name}
-
} {/*{*/} - { datalist === undefined?"":datalist&&datalist.task_type===undefined?"" :datalist.task_type===1? "": -
- -
- 其他组员 -
-
- {datalist&&datalist.work_members&&datalist.work_members.map((item,key)=>{ - - return( -
- {item.user_name} -
- ) - })} -
+ { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"": +
+
+ 其他组员
- } - - +
+ {datalist.work_members.map((item,key)=>{ + return( +
+ {item.user_name} +
+ ) + })} +
+
+ }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 39116c5de..7404f69d6 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -216,7 +216,7 @@ class GraduationTasksedit extends Component{ if ( response.data.status === 0) { this.setState({ - Modalstype:true, + Modalstype:false, Modalstopval:response.data.message, ModalSave:this.cancelAttachment, Loadtype:true, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index d1ce04697..24da98576 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -1010,10 +1010,10 @@ class GraduationTaskssettingapp extends Component{

- {coursename} - > - 毕设任务 - > + {coursename} + > + 毕设任务 + > {/*{taskname===""?"":*/} {/**/} @@ -1022,18 +1022,17 @@ class GraduationTaskssettingapp extends Component{ {/**/} {/*}*/} - 任务详情 + 任务详情

-
-

+

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 5907674b5..6574bd627 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1363,11 +1363,11 @@ class GraduationTaskssettinglist extends Component{

- {taskslistdata.course_name} + {taskslistdata.course_name} > - {taskslistdata.graduation_name} + {taskslistdata.graduation_name} > - 任务详情 + 任务详情

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 99c0d21c1..cdaf90ea4 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -243,29 +243,21 @@ class GraduationTasksquestions extends Component{

- - {questionslist.course_name} + {questionslist.course_name} > - {questionslist.graduation_name} + {questionslist.graduation_name} > - {/**/} - {/*{questionslist.task_name}*/} - {/*>*/} - {/**/} - - 任务详情 - + 任务详情

-
-

+

+

{questionslist.task_name}

- 返回 + 返回
diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js index c9fb36134..0b747171d 100644 --- a/public/react/src/modules/courses/members/modal/AddStudentModal.js +++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js @@ -19,7 +19,8 @@ class AddStudentModal extends Component{ hasMore: true, loading: false, courseGroup: '', - page: 1 + page: 1, + isSpin:false } } fetchMemberList = (arg_page) => { @@ -92,6 +93,9 @@ class AddStudentModal extends Component{ } onSendOk = () => { + this.setState({ + isSpin:true + }) if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) { this.props.showNotification('请从列表中先选择用户。') return; @@ -111,6 +115,9 @@ class AddStudentModal extends Component{ this.setVisible(false) this.props.showNotification('添加成功') this.props.addStudentSuccess && this.props.addStudentSuccess(params) + this.setState({ + isSpin:false + }) } }) .catch(function (error) { @@ -142,7 +149,7 @@ class AddStudentModal extends Component{ } render(){ const { users, checkBoxValues, loading, hasMore, name, school_name - , courseGroup, course_groups, } = this.state + , courseGroup, course_groups,isSpin } = this.state const { moduleName } = this.props return(
- 姓名: + 姓名: {this.setState({name: e.target.value})}} - style={{ width: '200px'}} + style={{ width: '242px'}} > 单位: {/* {this.setState({school_name: e.target.value})}} @@ -202,8 +209,8 @@ class AddStudentModal extends Component{
{/* */} {course_groups && course_groups.length &&
- 分班: - { course_groups.map((item) => { return })} @@ -217,6 +224,7 @@ class AddStudentModal extends Component{

+ { users && users.length ?
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
@@ -259,6 +267,7 @@ class AddStudentModal extends Component{
: } + ) } diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index ac9d22119..0ee44c210 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -45,6 +45,10 @@ function buildColumns(that) { render: (content, item, index) => { return {(that.state.page - 1) * 20 + index + 1} } + },{ + title: '用户ID', + dataIndex: 'login', + key: 'login' }, { title: '姓名', dataIndex: 'name', diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js index d3eebf62f..33f779591 100644 --- a/public/react/src/modules/courses/poll/PollDetailIndex.js +++ b/public/react/src/modules/courses/poll/PollDetailIndex.js @@ -118,6 +118,7 @@ class PollDetailIndex extends Component{ className={"font-16"} checkBoxValues={[this.props.match.params.pollId]} action={this.getPollInfo} + single={true} > :"" @@ -133,6 +134,7 @@ class PollDetailIndex extends Component{ className={"font-16"} checkBoxValues={[this.props.match.params.pollId]} action={this.getPollInfo} + single={true} > :"" diff --git a/public/react/src/modules/courses/poll/PollDetailTabSecond.js b/public/react/src/modules/courses/poll/PollDetailTabSecond.js index ad630eb0e..2523fcb5d 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabSecond.js +++ b/public/react/src/modules/courses/poll/PollDetailTabSecond.js @@ -63,16 +63,17 @@ class PollDetailTabSecond extends Component{ return(
- - 第{parseInt(page-1)*parseInt(limit)+(key+1)}题: - ({map[item.question.question_type]}) + + {parseInt(page-1)*parseInt(limit)+(key+1)}、{map[item.question.question_type]} + { item.question.is_necessary==1 ? 必答:"" } + { item.question.question_type == 2 ? - { item.question.question_type == 2 ? + { item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" : "可选"+item.question.min_choices+"-"+item.question.max_choices+"项" - :"" } - + :"" + }

{item.question.question_title}

diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js index f06497fc9..4cecf3744 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabThird.js +++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js @@ -68,15 +68,17 @@ class PollDetailTabThird extends Component{ pollDetail && pollDetail.questions.map((item,key)=>{ return(
-

- {map[item.question.question_type]}*Q{item.question.question_number} +

+ {item.question.question_number}、{map[item.question.question_type]} + { item.question.is_necessary==1 ? 必答:"" } + { item.question.question_type == 2 ? - { item.question.question_type == 2 ? + { item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" : "可选"+item.question.min_choices+"-"+item.question.max_choices+"项" - :"" } - + :"" + }

  • {item.question.question_title}
    • { diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js index e74fe8204..3b7cfa2a4 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyEnd.js @@ -72,7 +72,7 @@ class ImmediatelyEnd extends Component{ visible:true, Topval:"学生将不能再提交试卷", // Botvalleft:"暂不截止", - Botval:`本操作只对"提交中"的分班有效`, + Botval:this.props.single ?`本操作只对"提交中"的分班有效`:"", // starttime:"发布时间："+getNowFormatDate(1), // endtime:"截止时间："+getNowFormatDate(2), Cancelname:"暂不截止", @@ -114,7 +114,7 @@ class ImmediatelyEnd extends Component{ visible:true, Topval:"学生将不能再提交问卷", // Botvalleft:"暂不截止", - Botval:`本操作只对"提交中"的分班有效`, + Botval:this.props.single ?`本操作只对"提交中"的分班有效`:"", // starttime:"发布时间："+getNowFormatDate(1), // endtime:"截止时间："+getNowFormatDate(2), Cancelname:"暂不截止", diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js index 8c472b417..c7585a390 100644 --- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js +++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js @@ -80,7 +80,7 @@ class Immediatelypublish extends Component{ visible:true, Topval:"学生将立即收到试卷", // Botvalleft:"暂不发布", - Botval:`本操作只对"未发布"的分班有效`, + Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), @@ -119,7 +119,7 @@ class Immediatelypublish extends Component{ visible:true, Topval:"学生将立即收到问卷", // Botvalleft:"暂不发布", - Botval:`本操作只对"未发布"的分班有效`, + Botval:this.props.single ? "":`本操作只对"未发布"的分班有效`, starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), endtime:"截止时间："+this.props.getNowFormatDates(2), diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js index ba59418d2..7237f9e35 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunCard.js +++ b/public/react/src/modules/tpm/shixuns/ShixunCard.js @@ -9,7 +9,7 @@ import classNames from 'classnames'; // import { Rating,Loading} from '@icedesign/base'; -import {getImageUrl, toPath} from 'educoder'; +import {getImageUrl,setImagesUrl, toPath} from 'educoder'; // import { Pagination,Row,Col } from 'antd'; @@ -94,7 +94,7 @@ class ShixunCard extends Component { item.tag_name === null ? "":
    {item.tag_name} - +
    }
    @@ -105,7 +105,7 @@ class ShixunCard extends Component { {/**/} - +
    diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js index 2a1210faf..2ccb8744c 100644 --- a/public/react/src/modules/user/usersInfo/InfosShixun.js +++ b/public/react/src/modules/user/usersInfo/InfosShixun.js @@ -6,7 +6,7 @@ import Loadable from 'react-loadable'; import Loading from '../../../Loading'; import NoneData from '../../courses/coursesPublic/NoneData' import axios from 'axios'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,setImagesUrl} from 'educoder'; import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; import { CNotificationHOC } from '../../courses/common/CNotificationHOC' import "./usersInfo.css" @@ -168,10 +168,10 @@ class InfosShixun extends Component{ return(
    this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}> { - item.tag &&
    {item.tag}
    + item.tag &&
    {item.tag}
    } - Shixun6 +

    From 2a320fa7dbd6838819311315c6c1fd296462439d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 25 Jun 2019 10:18:26 +0800 Subject: [PATCH 5/7] user --- .../react/src/modules/courses/members/studentsList.js | 10 ++++++++++ .../react/src/modules/courses/members/teacherList.js | 1 + 2 files changed, 11 insertions(+) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index 3cb9bff77..cd97c6cfa 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -40,6 +40,15 @@ const buildColumns = (that) => { render: (id, student, index) => { return (that.state.page - 1) * 20 + index + 1 } + }, { + title: '用户id', + dataIndex: 'login', + key: 'login', + align:'center', + className:"color-grey-6", + // render: (name, record) => { + // return {name} + // } }, { title: '姓名', dataIndex: 'name', @@ -316,6 +325,7 @@ class studentsList extends Component{ }).then((result)=>{ if (result.data.status == 0) { this.props.showNotification('移动成功') + this.setState({checkBoxValues: []}) this.fetchAll() this.props.updataleftNavfun() diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index c9637f1f8..500665119 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -122,6 +122,7 @@ function buildColumns(that) { columns.push({ title: '操作', key: 'action', + align:'center', render: (text, record) => { if (record.application_id) { return ( From 30b735dc83b06caca717ac7ac9d68fd523f48ecc Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 25 Jun 2019 10:36:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/graduation/tasks/GraduationTasksappraise.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js index 18b51365e..f7f843feb 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js @@ -213,7 +213,7 @@ class GraduationTasksappraise extends Component{ {/*15M*/} {/*

    */} - {datalist&&datalist.attachments.map((item,key)=>{ + {datalist&& datalist.attachments && datalist.attachments.map((item,key)=>{ return(
    From 9f7f7483a811b4d25f168259d81fa9ae1f60753a Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 25 Jun 2019 10:44:43 +0800 Subject: [PATCH 7/7] score --- .../src/modules/courses/graduation/tasks/Graduationtaskitem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js index 98d80d042..28864521c 100644 --- a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js +++ b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js @@ -36,7 +36,7 @@ class Graduationtaskitem extends Component{ {item.time} {/* 分数 */} - {item.score}分 + {item.score && {item.score}分} { !item.is_invalid && item.delete &&