Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

app/controllers/shixuns_controller.rb

@@ -769,7 +769,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

public/react/src/App.js

@@ -378,7 +378,9 @@ class App extends Component {
 							{/*列表页*/}
 							{/*<Route component={TPMShixunsIndexComponent}/>*/}
 							{/*首页*/}
-							<Route component={ShixunsHome}/>
+							<Route exact path="/" component={ShixunsHome}/>
+							<Route component={Shixunnopage}/>
+							
 							{/*<Route component={ShixunsHome}/>*/}
 
 						</Switch>

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) {

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) {

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个字"

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;*/

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) => {
@@ -286,7 +286,7 @@ class CoursesNew extends Component {
 						this.setState({
 							searchlist: result.data.course_lists,
 							 // course:value,
-							fetching: false
+
 						})
 					}
             // 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 {
                                `}
                             </style>
 
-                            <Form onSubmit={this.handleSubmit}
-                                  className={"edu-back-white newcourses"}>
+                            <Form onSubmit={this.handleSubmit} className={"edu-back-white newcourses"}>
                                 {/*内容*/}
                                 <style>
                                     {`
@@ -435,15 +440,16 @@ class CoursesNew extends Component {
                                             width: 280px !important;
                                             height: 160px;
                                         }
-                                        .construction{
+                                        .construction .ant-input{
                                             width: 280px !important;
+                                            margin-left: 0px !important;
+                                        }
+                                       .construction {
+                                            width: 280px;
    																				  margin-left: 10px;
                                         }
                                     `}
                                 </style>
-                                {/*<div className="stud-class-set bor-bottom-greyE padding10200">*/}
-
-                                {/*</div>*/}
 
                                 <div className="stud-class-set bor-bottom-greyE padding10200 ">
                                     <div className={"TabsWarpcourse"}>
@@ -451,18 +457,15 @@ class CoursesNew extends Component {
                                         {getFieldDecorator('course', {
                                             rules: [{required: true, message: "不能为空"}],
                                         })(
-                                            <Select
-                                            showSearch
+
+																					<AutoComplete style={{ width: 280 }}
+																					onSearch={this.handleSearch}
+																					// onChange={this.handleChange}
 																					className={"fl construction "}
 																					placeholder="例如：数据结构"
-                                            // value={this.state.course}
-                                            onSearch={this.handleSearch}
-                                            onChange={this.handleChange}
-                                            onFocus={()=>this.Searchvalue("")}
-                                            allowClear={true}
 																					>
 																				   {options}
-                                            </Select>
+																					</AutoComplete>
                                             )}
                                         <span  className={"newcoursestitle fl"}>
                                             {/*（错误示例：数据结构2017本部；数据结构2017秋季；数据结构2017电子商务1班）*/}
@@ -632,18 +635,14 @@ class CoursesNew extends Component {
 																	{getFieldDecorator('school', {
 																		rules: [{required: true, message: "不能为空"}],
 																	})(
-																		<Select
-																			showSearch
+																		<AutoComplete style={{ width: 280 }}
+																		onSearch={this.handleSearchschool}
+																		// onChange={this.handleChangeschools}
 																		className={"fl construction mr10 "}
 																		placeholder="请输入并选择课本堂的所属单位"
-																			// value={this.state.school}
-																			onSearch={this.handleSearchschool}
-																			// notFoundContent={this.state.fetching ? <Spin size="small" /> : null}
-																			onChange={this.handleChangeschools}
-																			allowClear={true}
 																		>
 																	  {optionschool}
-																		</Select>
+																		</AutoComplete>
 																	)}
 																	<span  className={"newcoursestitle fl"}>
 																					{/*（输入内容出现匹配的下拉菜单←同账号管理的单位信息填写）*/}
@@ -651,7 +650,7 @@ class CoursesNew extends Component {
 																	<div id='isschool'></div>
 																</Form.Item>
 
-																{searchlistscholl.length===0?<div style={{height:"20px",lineHeight:"20px"}} className="ml20">
+																{searchlistscholl.length===0&&this.state.fetching===true?<div style={{height:"20px",lineHeight:"20px"}} className="ml20">
 																			<span>
 																				<span style={{color: '#CDCDCD'}}>未找到包含“{school}”的高校，</span>
 																				<span style={{color: '#4CACFF', cursor: 'pointer'}} onClick={this.showApplyForAddOrgModal}>申请新增</span>

public/react/src/modules/home/shixunsHome.js

@@ -217,7 +217,7 @@ class ShixunsHome extends Component {
                                             <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}>
 
                                                 <div className="tag-green">
-                                                    <span className="tag-name"> {item.name}</span>
+                                                    <span className="tag-name"> {item.tag_name}</span>
                                                     <img style={{display:item.tag_name===null?"none":'block'}} src={require(`./tag2.png`)}/>
                                                 </div>
 

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"
                           />
                             <label style={{top:'6px'}} className="color-grey-9 ml10" >（为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）</label>
                         </span>

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -1287,6 +1287,7 @@ class Newshixuns extends Component {
                                         placeholder="请选择开启时间"
                                         onChange={this.onChangeTimePicker}
 																				disabledTime={disabledDateTime}
+																				dropdownClassName="hideDisable"
                                     />
                                     <label style={{top: '6px'}} className="color-grey-6 ml10">
                                         （为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）

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)=>{