From 875600ac3c6e45cad9203a9cc55fdf0f3fad4986 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 26 Jul 2019 09:20:07 +0800 Subject: [PATCH 1/7] admin --- public/react/src/AppConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 9c407c82c..363ff495d 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -28,7 +28,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : window.location.search.indexOf('debug=s') != -1 ? 'student' : - window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || '' + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' } window._debugType = debugType; export function initAxiosInterceptors(props) { From fea8646212558f088f573e2788640ee8e953312b Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 26 Jul 2019 09:31:02 +0800 Subject: [PATCH 2/7] 404 --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index d178a3565..9506aea5e 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -378,7 +378,7 @@ class App extends Component { {/*列表页*/} {/**/} {/*首页*/} - + {/**/} From 93f61c92cd7121bc71c4d2046ddf9d14ad59f9cd Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 26 Jul 2019 09:39:50 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/account/AccountBasicEdit.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js index 38c8fd98c..82f7d60d8 100644 --- a/public/react/src/modules/user/account/AccountBasicEdit.js +++ b/public/react/src/modules/user/account/AccountBasicEdit.js @@ -200,16 +200,17 @@ class AccountBasic extends Component { // 过滤学校 filterList=(e)=>{ + const inputVal = e.trim() let arr=[]; - if(e){ + if(inputVal){ arr= this.state.schoolList.filter(function(item){ - return item.name.indexOf(e)>-1; + return item.name.indexOf(inputVal)>-1; }); this.props.form.setFieldsValue({ - org:e + org: inputVal }) this.setState({ - school:e, + school: inputVal, filterSchoolList:arr }) } else { @@ -266,7 +267,7 @@ class AccountBasic extends Component { // 选择学校(获取对应学校的学院、部门) changeList=(e)=>{ - this.getDepartments(e,true); + this.getDepartments(e.trim(),true); } getDepartments=(e,flag)=>{ From c673e98d7c21cc3b67ca2ea0bdc56d958847eebb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 26 Jul 2019 09:40:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=95=99=E5=B8=88?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=B7=B3=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/context/TPIContextProvider.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js index 52aebcf7c..93e16a1f6 100644 --- a/public/react/src/context/TPIContextProvider.js +++ b/public/react/src/context/TPIContextProvider.js @@ -485,6 +485,8 @@ pop_box_new(htmlvalue, 480, 182); resData.myshixun_manager = true } else if (resData.user.identity === EDU_CERTIFICATION_TEACHER) { resData.power = 1 + // 已认证老师允许跳关 + resData.myshixun_manager = true // resData.is_teacher = true } else if (resData.user.identity === EDU_TEACHER) { From dd98f0664d577503eaa2b6479993beccae3803b0 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 26 Jul 2019 09:59:35 +0800 Subject: [PATCH 5/7] 404 --- public/react/src/App.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/App.js b/public/react/src/App.js index 9506aea5e..191b0f0c8 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -378,7 +378,9 @@ class App extends Component { {/*列表页*/} {/**/} {/*首页*/} + + {/**/} From f99e43353cb6ee797b3cb7e9d83f63bb6f113642 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 26 Jul 2019 10:34:48 +0800 Subject: [PATCH 6/7] =?UTF-8?q?git=E9=87=8D=E7=BD=AE=E4=B8=8D=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 4 ++-- app/controllers/shixuns_controller.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 1187ebafa..a51dccb6f 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -454,7 +454,7 @@ class GamesController < ApplicationController tip_exception("初始代码为空，代码重置失败") if @content.nil? # 将tpm的代码内容同步更新到tpi - update_file_content(@content, @myshixun.repo_path, path, current_user.mail, current_user.full_name, "reset_original_code") + update_file_content(@content, @myshixun.repo_path, path, current_user.git_mail, current_user.real_name, "reset_original_code") rescue Exception => e uid_logger_error("#{e.message}") tip_exception("初始化代码失败") @@ -471,7 +471,7 @@ class GamesController < ApplicationController # else # content # end - update_file_content(content, @myshixun.repo_path, path, current_user.mail, current_user.full_name, "game passed reset") + update_file_content(content, @myshixun.repo_path, path, current_user.git_mail, current_user.real_name, "game passed reset") else tip_exception("代码重置失败，代码为空") end diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 587ef2cb9..ddf67f330 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -768,7 +768,7 @@ class ShixunsController < ApplicationController def update_file content = params[:content] - author_name = current_user.full_name + author_name = current_user.real_name author_email = current_user.git_mail @content = update_file_content content, @repo_path, @path, author_email, author_name, "Edit by browser" end From 81705ebfabda5e71aae6236aeebb321d4ff1fcaf 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, 26 Jul 2019 10:44:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesDetail/CoursesLeftNav.js | 2 +- .../react/src/modules/courses/css/Courses.css | 9 +- .../src/modules/courses/new/CoursesNew.js | 95 +++++++++---------- public/react/src/modules/home/shixunsHome.js | 2 +- .../modules/tpm/TPMsettings/TPMsettings.js | 1 + .../src/modules/tpm/newshixuns/Newshixuns.js | 1 + 6 files changed, 59 insertions(+), 51 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index ad7172be5..849621259 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -502,7 +502,7 @@ class Coursesleftnav extends Component{ NavmodalValues:"名称不能为空" }) return - }else if(NavmodalValue.length>20){ + }else if(NavmodalValue.length>60){ this.setState({ NavmodalValuetype:true, NavmodalValues:"名称不能超过60个字" diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index c69b147fa..e214bd81d 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -990,8 +990,15 @@ samp { .newcourses .ant-input{ width:280px; margin-left: 11px; - height: 40px; + height: 40px !important; } + +.newcourses .ant-input{ + width:280px; + margin-left: 11px; + height: 40px !important; +} + .newcourses .ant-select-selection--single{ width: 280px; /*margin-left: 11px;*/ diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 73c1dded9..b620ba0c3 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -1,5 +1,5 @@ import React, {Component} from "React"; -import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon} from "antd"; +import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete} from "antd"; import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal'; import axios from 'axios'; import "../css/Courses.css"; @@ -47,8 +47,8 @@ class CoursesNew extends Component { let coursesId = this.props.match.params.coursesId; let user_school=this.props.current_user&&this.props.current_user.user_school; - this.getschool("") - this.Searchvalue("") + // this.getschool("") + // this.Searchvalue("") if (coursesId != undefined) { let url = "/courses/" + coursesId + "/settings.json" axios.get(url).then((result) => { @@ -285,8 +285,8 @@ class CoursesNew extends Component { this.setState({ searchlist: result.data.course_lists, - // course:value, - fetching: false + // course:value, + }) } // this.props.form.setFieldsValue({ @@ -298,10 +298,11 @@ class CoursesNew extends Component { } handleSearch=(value)=>{ + if(value!=""){ this.props.form.setFieldsValue({ classroom:value, - // course:value + course:value }); this.Searchvalue(value) } @@ -311,7 +312,7 @@ class CoursesNew extends Component { handleChange=(value)=>{ this.props.form.setFieldsValue({ - // course:value, + course:value, classroom:value }) }; @@ -319,21 +320,26 @@ class CoursesNew extends Component { handleSearchschool=(value)=>{ if(value!="") { - this.props.form.setFieldsValue({ - // school: value, - fetching: true, - }); - + // this.props.form.setFieldsValue({ + // // school: value, + // fetching: true, + // }); + this.setState({ + fetching: true + }) this.getschool(value) } }; handleChangeschools=(value)=>{ - this.props.form.setFieldsValue({ - // school: value, - fetching: true, - }); + // this.props.form.setFieldsValue({ + // // school: value, + // fetching: true, + // }); + // this.setState({ + // fetching: true + // }) } handleChangeschool=(value)=>{ @@ -359,7 +365,7 @@ class CoursesNew extends Component { if (result.data.status===0) { this.setState({ searchlistscholl: result.data.school_names, - // school: value + fetching: false }) } @@ -420,8 +426,7 @@ class CoursesNew extends Component { `} -
+ {/*内容*/} - {/*
*/} - - {/*
*/}
@@ -451,18 +457,15 @@ class CoursesNew extends Component { {getFieldDecorator('course', { rules: [{required: true, message: "不能为空"}], })( - + + + {options} + )} {/*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*/} @@ -632,18 +635,14 @@ class CoursesNew extends Component { {getFieldDecorator('school', { rules: [{required: true, message: "不能为空"}], })( - + {optionschool} + )} {/*（输入内容出现匹配的下拉菜单←同账号管理的单位信息填写）*/} @@ -651,7 +650,7 @@ class CoursesNew extends Component {
- {searchlistscholl.length===0?
+ {searchlistscholl.length===0&&this.state.fetching===true?
未找到包含“{school}”的高校， 申请新增 diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 9c166f43f..003724ede 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -217,7 +217,7 @@ class ShixunsHome extends Component {
- {item.name} + {item.tag_name}
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index f6af871dd..b89990420 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -1869,6 +1869,7 @@ export default class TPMsettings extends Component { placeholder="请选择开启时间" value={opening_time===null||opening_time===""?"":moment(opening_time, dateFormat)} onChange={this.onChangeTimePicker} + dropdownClassName="hideDisable" /> diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index c15269c5a..346be3351 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -1287,6 +1287,7 @@ class Newshixuns extends Component { placeholder="请选择开启时间" onChange={this.onChangeTimePicker} disabledTime={disabledDateTime} + dropdownClassName="hideDisable" />