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

app/controllers/games_controller.rb

@@ -498,44 +498,41 @@ class GamesController < ApplicationController
     rescue Exception => e
       # 思路： 异常首先应该考虑去恢复
       # retry为1表示已经轮训完成后还没有解决问题，这个时候需要检测异常
-      if params[:retry].to_i == 1
+      begin
-        begin
+        # 如果模板没有问题，则通过中间层检测实训仓库是否异常
-          # 如果模板没有问题，则通过中间层检测实训仓库是否异常
+        # 监测版本库HEAD是否存在，不存在则取最新的HEAD
-          # 监测版本库HEAD是否存在，不存在则取最新的HEAD
+        gitUrl = repo_url @myshixun.repo_path
-          gitUrl = repo_url @myshixun.repo_path
+        gitUrl = Base64.urlsafe_encode64(gitUrl)
-          gitUrl = Base64.urlsafe_encode64(gitUrl)
+        shixun_tomcat = edu_setting('cloud_bridge')
-          shixun_tomcat = edu_setting('cloud_bridge')
+        rep_params = {:tpiID => "#{@myshixun.id}", :tpiGitURL  => "#{gitUrl}"}
-          rep_params = {:tpiID => "#{@myshixun.id}", :tpiGitURL  => "#{gitUrl}"}
+        # 监测版本库HEAD是否存在，不存在则取最新的HEAD
-          # 监测版本库HEAD是否存在，不存在则取最新的HEAD
+        uri = "#{shixun_tomcat}/bridge/game/check"
-          uri = "#{shixun_tomcat}/bridge/game/check"
+        res = uri_post uri, rep_params
-          res = uri_post uri, rep_params
+        uid_logger("repo_content to bridge: res is #{res}")
-          uid_logger("repo_content to bridge: res is #{res}")
+        # res值：0 表示正常；-1表示有错误；-2表示代码版本库没了
-          # res值：0 表示正常；-1表示有错误；-2表示代码版本库没了
+        #
-          #
+        if status == 0 && res
-          if status == 0 && res
+          # 版本库报错，修复不了
-            # 版本库报错，修复不了
+          if res['code'] == -1 || res['code'] == -2
-            if res['code'] == -1 || res['code'] == -2
+            begin
-              begin
+              # GitService.delete_repository(repo_path: @myshixun.repo_path) if res['code'] == -1
-                # GitService.delete_repository(repo_path: @myshixun.repo_path) if res['code'] == -1
+              project_fork(@myshixun, @shixun.repo_path, current_user.login)
-                project_fork(@myshixun, @shixun.repo_path, current_user.login)
+            rescue Exception => e
-              rescue Exception => e
+              uid_logger_error("#{e.message}")
-                uid_logger_error("#{e.message}")
+              tip_exception("#{e.message}")
-                tip_exception("#{e.message}")
-              end
             end
           end
-        rescue Exception => e
+        end
-          uid_logger_error(e.message)
+      rescue Exception => e
+        uid_logger_error(e.message)
 
-          if @myshixun.shixun.try(:status) < 2
+        if @myshixun.shixun.try(:status) < 2
-            tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
+          tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
-          else
+        else
-            # 报错继续retry
+          # 报错继续retry
-            tip_exception(-3, "#{e.message}")
+          tip_exception(-3, "#{e.message}")
-          end
         end
       end
-      # 有异常，版本库获取不到代码，前端轮训15S后，调用retry == 1
       tip_exception(0, e.message)
     end
   end

app/controllers/homework_commons_controller.rb

@@ -171,6 +171,14 @@ class HomeworkCommonsController < ApplicationController
           @student_works = @student_works.where(user_id: group_user_ids)
         end
 
+        if @homework.homework_type == "group" && !params[:member_work].blank?
+          if params[:member_work].to_i == 1
+            @student_works = @student_works.where("user_id = commit_user_id")
+          elsif params[:member_work].to_i == 0
+            @student_works = @student_works.where("user_id != commit_user_id")
+          end
+        end
+
         # 输入姓名和学号搜索
         # TODO user_extension 如果修改 请调整
         unless params[:search].blank?

app/controllers/student_works_controller.rb

@@ -61,16 +61,21 @@ class StudentWorksController < ApplicationController
   end
 
   def delete_work
-    begin
+    ActiveRecord::Base.transaction do
-      work = @homework.student_works.find_by!(user_id: params[:user_id])
+      begin
-      work.update_attributes(description: nil, project_id: 0,
+        work = @homework.student_works.find_by!(user_id: params[:user_id])
-                                 late_penalty: 0, work_status: 0,
+        tip_exception("只有组长才能删除组员") if work.commit_user_id != current_user.id
-                                 commit_time: nil, update_time: nil, group_id: 0,
+        work.update_attributes(description: nil, project_id: 0,
-                                 commit_user_id: nil, final_score: nil, work_score: nil, teacher_score: nil, teaching_asistant_score: nil)
+                                   late_penalty: 0, work_status: 0,
-      normal_status("删除成功")
+                                   commit_time: nil, update_time: nil, group_id: 0,
-    rescue Exception => e
+                                   commit_user_id: nil, final_score: nil, work_score: nil, teacher_score: nil, teaching_asistant_score: nil)
-      uid_logger(e.message)
+        work.attachments.destroy_all
-      tip_exception(e.message)
+        work.tidings.destroy_all
+        normal_status("删除成功")
+      rescue Exception => e
+        uid_logger(e.message)
+        tip_exception(e.message)
+      end
     end
   end
 
@@ -137,8 +142,9 @@ class StudentWorksController < ApplicationController
     @current_user = current_user
     if @homework.homework_type == "group"
       # todo user_extension
+      @commit_user_id = @work.commit_user_id
       @work_members = @course.students.where(user_id: @homework.student_works.where(group_id: @work.group_id).pluck(:user_id)).
-          order("course_members.id=#{@work.user_id} desc").includes(:course_group, user: :user_extension)
+          order("course_members.user_id=#{@work.commit_user_id} desc").includes(:course_group, user: :user_extension)
     end
   end
 
@@ -150,7 +156,7 @@ class StudentWorksController < ApplicationController
       begin
         @work.description = params[:description]
         @work.update_time = Time.now
-        @work.commit_user_id = current_user.id
+        # @work.commit_user_id = current_user.id
         if @work.save!
           Attachment.associate_container(params[:attachment_ids], @work.id, @work.class)
 
@@ -165,7 +171,8 @@ class StudentWorksController < ApplicationController
 
             # 原成员更新描述、更新时间以及附件
             @homework.student_works.where(group_id: @work.group_id, user_id: (work_user_ids & params_user_ids)).each do |work|
-              work.update_attributes(update_time: Time.now, description: @work.description, commit_user_id: current_user.id)
+              # work.update_attributes(update_time: Time.now, description: @work.description, commit_user_id: current_user.id)
+              work.update_attributes(update_time: Time.now, description: @work.description)
               work.attachments.destroy_all
               @work.attachments.each do |attachment|
                 att = attachment.copy
@@ -193,7 +200,7 @@ class StudentWorksController < ApplicationController
               stu_work.update_attributes(user_id: user_id, description: @work.description, homework_common_id: @homework.id,
                                          project_id: @work.project_id, late_penalty: @work.late_penalty,
                                          work_status: @work.work_status, commit_time: Time.now, update_time: Time.now,
-                                         group_id: @work.group_id, commit_user_id: current_user.id)
+                                         group_id: @work.group_id, commit_user_id: @work.commit_user_id)
               @work.attachments.each do |attachment|
                 att = attachment.copy
                 att.author_id = attachment.author_id

app/models/searchable/course.rb

@@ -25,7 +25,8 @@ module Searchable::Course
       author_school_name: teacher&.school_name,
       visits_count: visits,
       members_count: members_count,
-      is_public: is_public == 1
+      is_public: is_public == 1,
+      first_category_url: ApplicationController.helpers.module_url(none_hidden_course_modules.first, self)
     }
   end
 

app/views/homework_commons/works_list.json.jbuilder

@@ -69,6 +69,7 @@ elsif @user_course_identity == Course::STUDENT
         json.project_info project_info @work, @current_user, @user_course_identity
       end
       json.work_group @work.work_group_name
+      json.is_leader @work.user_id == @work.commit_user_id
     end
 
   end
@@ -140,6 +141,7 @@ elsif @homework.homework_type == "group" || @homework.homework_type == "normal"
         if @homework.homework_detail_group.base_on_project
           json.project_info project_info work, @current_user, @user_course_identity
         end
+        json.is_leader work.user_id == work.commit_user_id
         json.work_group work.work_group_name
       end
 

app/views/student_works/edit.json.jbuilder

@@ -1,12 +1,14 @@
 json.partial! "homework_commons/homework_public_navigation", locals: {homework: @homework, course: @course, user: @current_user}
 json.work_id @work.id
 json.description @work.description
+json.
 
 json.attachments @work.attachments do |atta|
   json.partial! "attachments/attachment_simple", locals: {attachment: atta, delete: @work.delete_atta(atta)}
 end
 
 if @homework.homework_type == "group"
+  json.is_leader_work @work.user_id == @commit_user_id
   json.min_num @homework.homework_detail_group.try(:min_num)
   json.max_num @homework.homework_detail_group.try(:max_num)
 
@@ -15,5 +17,6 @@ if @homework.homework_type == "group"
     json.user_name member.user.real_name
     json.group_name member.course_group_name
     json.student_id member.user.student_id
+    json.is_leader member.user_id == @commit_user_id
   end
 end

app/views/student_works/show.json.jbuilder

@@ -3,6 +3,7 @@ json.(@work, :description, :commit_time, :update_time)
 
 json.is_evaluation @is_evaluation
 json.author_name @is_evaluation ? "匿名" : @work.user.real_name
+json.is_leader_work @work.user_id == @work.commit_user_id if @homework.homework_type == "group"
 json.is_author @is_author
 json.update_user_name @is_evaluation ? "匿名" : @work.commit_user.try(:real_name)
 
@@ -17,8 +18,10 @@ unless @is_evaluation
     json.project_info project_info @work, @current_user, @user_course_identity
   end
 
-  json.work_members @work_members.each do |member|
+  json.work_members @work_members.each do |work|
-    json.user_name member.user.real_name
+    json.user_name work.user.real_name
-    json.user_login member.user.login
+    json.user_login work.user.login
+    json.work_id work.id
+    json.is_leader work.user_id == work.commit_user_id
   end
 end

db/migrate/20190815085136_modify_path_for_challenges.rb

@@ -0,0 +1,5 @@
+class ModifyPathForChallenges < ActiveRecord::Migration[5.2]
+  def change
+    change_column :challenges, :path, :text
+  end
+end

lib/tasks/public_course.rake

@@ -0,0 +1,99 @@
+#coding=utf-8
+# 执行示例  bundle exec rake public_course:student args=149,2903
+# args 第一个参数是subject_id，第二个参数是课程course_id
+# 第一期时间：2018-12-16 至2019-03-31
+# 第二期时间：2019-04-07 至2019-07-28
+#
+# 这次学习很有收获，感谢老师提供这么好的资源和细心的服务🎉🎉🎉
+#
+
+desc "同步精品课数据"
+namespace :public_course do
+  subject_id = ENV['args'].split(",")[0] # 对应课程的id
+  course_id = ENV['args'].split(",")[1] # 对应课堂的id
+  status = ENV['args'].split(",")[2] # 表示相应的期数
+  type = ENV['args'].split(",")[3] # 表示课程模块
+
+  if status.to_i == 1
+    start_time = '2018-12-16'
+    end_time = '2019-04-01'
+  elsif status.to_i == 2
+    start_time = '2019-04-07'
+    end_time = '2019-07-28'
+  else
+    # 这种情况是取所有的
+    start_time = '2015-01-01'
+    end_time = '2022-07-28'
+  end
+
+  task :student => :environment do
+    puts "subject_id is #{subject_id}"
+    puts "course_id is #{course_id}"
+
+    user_ids = Myshixun.find_by_sql("select distinct(user_id) from myshixuns where shixun_id in (select shixun_id from stage_shixuns
+                                     where stage_id in (select id from stages where subject_id=#{subject_id}))").map(&:user_id)
+    puts user_ids
+    if user_ids.present?
+      user_ids.each do |user_id|
+        puts user_id
+        begin
+          CourseMember.create!(course_id: course_id, user_id: user_id, role: 4)
+        rescue Exception => e
+          Rails.logger()
+        end
+      end
+    end
+  end
+
+  #
+  task :message => :environment do
+    discusses = Discuss.find_by_sql("select content, user_id, created_on, updated_on from discusses where dis_id in (select shixun_id from stage_shixuns where
+                                   stage_id in (select id from stages where subject_id=#{subject_id})) and created_at > #{start_time} and
+                                   created_at<#{end_time}")
+    discusses.find_each do |discuss|
+      puts discuss.user_id
+      puts discuss.content
+      # 回复帖子
+      # 讨论区发布帖子
+      # Message.create!(board: @message.board, root_id: @message.root_id || @message.id,
+      #                 author: current_user, parent: @message,
+      #                 message_detail_attributes: {
+      #                     content: params[:content]
+      #                 })
+    end
+  end
+
+
+  # 更新某个课程的某类时间
+  # 执行示例  bundle exec rake public_course:student tiems=149,2903
+  task :time => :environment do
+    course_id = ENV['args'].split(",")[0] # 对应课堂的id
+    satus = ENV['args'].split(",")[1]
+
+    course = Course.find(course_id)
+
+    hour = (6..24).to_a.sample(1).first
+    min = rand(60)
+    sec = rand(60)
+
+    start_time = Date.parse(start_time)
+    end_time = Date.parse(end_time)
+    date = (start_time..end_time).to_a.sample(1).first
+
+    time = "#{date} #{min_swith(hour)}:#{min_swith(min)}:#{min_swith(sec)}"
+
+    puts time
+    case type
+    when 1
+      # 讨论区
+
+    end
+
+  end
+
+  def min_swith(time)
+    puts time
+    return time < 9 ? "0#{time}" : time
+  end
+end
+

lib/tasks/publick_course.rake

@@ -1,25 +0,0 @@
-#coding=utf-8
-# 执行示例  bundle exec rake public_course:student args=149,2903
-# args 第一个参数是subject_id，第二个参数是课程course_id
-
-desc "同步精品课数据"
-namespace :public_course do
-  task :student => :environment do
-
-
-    subject_id = ENV['args'].split(",").first
-    course_id = ENV['args'].split(",").last
-    puts "subject_id is #{subject_id}"
-    puts "course_id is #{course_id}"
-
-    user_ids = Myshixun.find_by_sql("select distinct(user_id) from myshixuns where shixun_id in (select shixun_id from stage_shixuns
-                                     where stage_id in (select id from stages where subject_id=#{subject_id}))").map(&:user_id)
-    puts user_ids
-    if user_ids.present?
-      user_ids.each do |user_id|
-        puts user_id
-        CourseMember.create!(course_id: course_id, user_id: user_id, role: 4)
-      end
-    end
-  end
-end

public/react/src/AppConfig.js

@@ -10,6 +10,7 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list){
+	debugger
   if (window.location.port === "3007") {
 
   } else {
@@ -158,7 +159,8 @@ export function initAxiosInterceptors(props) {
         //   console.log("401401401")
         // }
         if (response.data.status === 403||response.data.status === "403") {
-            locationurl('/403');
+
+           locationurl('/403');
         }
 
         if (response.data.status === 404) {

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -496,6 +496,15 @@ class Coursesleftnav extends Component{
   saveNavmoda=()=>{
     let {Navmodaltypename,setnavid,NavmodalValue}=this.state;
     let id =setnavid;
+
+		if(Navmodaltypename===5&&NavmodalValue==="未分班"||Navmodaltypename===2&&NavmodalValue==="未分班"){
+			this.setState({
+				NavmodalValuetype:true,
+				NavmodalValues:"名称不能和未分班一样"
+			})
+			return
+		}
+
     if(NavmodalValue===""){
       this.setState({
         NavmodalValuetype:true,
@@ -639,6 +648,7 @@ class Coursesleftnav extends Component{
   }
 
   onDragEnd=(result)=>{
+  	debugger
     // console.log(result)
     // let {course_modules}=this.props;
     // let newcourse_modules=course_modules;
@@ -681,10 +691,10 @@ class Coursesleftnav extends Component{
      this.droppablepost(url,result.destination.index+1)
 
    }else if(result.source.droppableId==="course_group"){
-
+			if(result.draggableId!=1){
-     let url ="/course_groups/"+result.draggableId+"/move_category.json"
+				let url ="/course_groups/"+result.draggableId+"/move_category.json"
-     this.droppablepost(url,result.destination.index)
+				this.droppablepost(url,result.destination.index+1)
-
+			}
    }
 
   }
@@ -825,8 +835,16 @@ class Coursesleftnav extends Component{
                     onInput={this.setNavmodalValue}
                 />
              </div>
-             
+						 <style>
-             {this.state.NavmodalValuetype===true?<span className={"color-red"}>
+							 {
+							 	`
+							 	.ml70{
+    							margin-left: 70px;
+							 	}
+							 	`
+							 }
+						 </style>
+             {this.state.NavmodalValuetype===true?<span className={"ml70 color-red"}>
                  {this.state.NavmodalValues}
              </span>:""}
              <div className={this.state.NavmodalValuetype===true?"clearfix mt20 edu-txt-center":"clearfix mt50 edu-txt-center"}>
@@ -842,7 +860,7 @@ class Coursesleftnav extends Component{
                 .droppableul{
                   max-height: 500px;
                   overflow-y:auto;
-                  overflow:hidden auto;
+                  overflow-x:hidden;
                 }
 
                 .mr13{
@@ -858,8 +876,8 @@ class Coursesleftnav extends Component{
                             <li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1)}   className={this.props.mainurl===item.category_url&&key===this.props.indexs?"liactive":"clearfix active"}   onMouseLeave={(e)=>this.hidesandian(e,key)}  onMouseEnter={(e)=>this.showsandian(e,key)}>
                                 <a onClick={(e)=>this.showsandians(e,key,item.category_url,1)}  className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
                                   {
-                                    item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
+                                    item.type==="announcement"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xiaoxi1 mr10 fl":"iconfont icon-xiaoxi1 mr10 fl"}></i>:
-                                    item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
+                                    item.type==="online_learning"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-xuexizhongxin mr10 fl":"iconfont icon-xuexizhongxin mr10 fl"}></i>:
                                     item.type==="shixun_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-daima mr10 fl":"iconfont icon-daima mr10 fl"}></i>:
                                     item.type==="common_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-putongzuoye mr10 fl":"iconfont icon-putongzuoye mr10 fl"}></i>:
                                     item.type==="group_homework"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenzuzuoye mr10 fl":"iconfont icon-fenzuzuoye mr10 fl"}></i>:
@@ -935,8 +953,9 @@ class Coursesleftnav extends Component{
 
                                                                 <a className="fl pl46 pd0  Draggablelichild">
                                                                   <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth155 task-hide  Draggablelichild":"fl ml38 maxwidth155 task-hide  Draggablelichild"}>{iem.category_name}</span>
-                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
+                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index&&iem.category_id!=0?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                   {item.type===twosandiantypes&&twosandiantype===index?
+																																		iem.category_id===0?"":
                                                                     iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
                                                                       <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                       :<Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index}>

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -163,7 +163,7 @@ class Testpapersettinghomepage extends Component{
 		}
 
 	}
-    //打开pdf 
+    //打开pdf
 	 confpdf = (url) =>{
 		 window.open(url);
 	 }

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -760,6 +760,7 @@ class GraduationTasksSubmitedit extends Component{
                               height: '30px'
                             }}>
                               <Checkbox value={item.user_id}
+																				key={item.user_id}
 																				checked={
 																					task_status.map((item,key)=>{
 																						return  parseInt(task_status[key])===item.user_id?true:false

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -472,6 +472,9 @@ class GraduationTasksSubmitnew extends Component{
               // }
             // }
           }).catch((error) => {
+						this.setState({
+							spinnings:false
+						});
             console.log(error)
           })
 

public/react/src/modules/courses/graduation/tasks/index.js

@@ -179,8 +179,13 @@ class GraduationTasks extends Component{
     })
         .then((result)=>{
           if(result.data.status==0){
+          	this.setState({
+							checkBoxValues:[],
+							checkAllValue:false
+						})
+						this.fetchAll(search,page,order,15)
             this.props.showNotification(`${result.data.message}`);
-            this.fetchAll(search,page,order,15)
+
           }
         }).catch((error)=>{
       console.log(error);
@@ -554,9 +559,10 @@ class GraduationTasks extends Component{
   }
   // 题库选用成功后刷新页面
   useBankSuccess=(checkBoxValues,object_ids)=>{
-  	// debugger
+      //debugger
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
+
   }
   getcourse_groupslist=(id)=>{
     this.setState({
@@ -651,7 +657,7 @@ class GraduationTasks extends Component{
                 </Link>
               </WordsBtn> : ""}
 
-              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess=(checkBoxValues,object_ids)}></UseBank>:""}
+              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess(checkBoxValues,object_ids)}></UseBank>:""}
             </React.Fragment>
 
           }

public/react/src/modules/courses/graduation/topics/index.js

@@ -355,6 +355,13 @@ onBoardsNew=()=>{
       DownloadMessageval:undefined
     })
   }
+
+	// 题库选用成功后刷新页面
+	useBankSuccess=(checkBoxValues,object_ids)=>{
+		//debugger
+		let {searchValue,page,status} =this.state
+		this.fetchAll(searchValue,page,status);
+	}
   render(){
     let { 
       searchValue, 

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -367,9 +367,9 @@ class Listofworksstudentone extends Component {
 					render: (text, record) => (
 						<span>
                         {
-													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A',cursor:"default"}}>--</span>
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
 														:
-														<span style={{textAlign: "center",cursor:"default"}}
+														<span style={{textAlign: "center"}}
 																	className="color-blue"
 																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
 												}
@@ -691,9 +691,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
-                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
+                       <a style={{textAlign: "center"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
@@ -985,9 +985,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
-                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
+                       <a style={{textAlign: "center"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -500,8 +500,8 @@ class PathDetailIndex extends Component{
                                       </div>
                                       {
                                         detailInfoList===undefined?"":detailInfoList.allow_add_member===true? <div>
-                                              <div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>
+																						{key!=0?<div className="fr ml15 flex1"><a onClick={()=>this.moveup(item)}><Tooltip title="上移"><i className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a></div>:""}
-                                            <div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>
+																						{key+1!=detailInfoList.members.length?<div className="fr  ml15 flex1 "><a onClick={()=>this.movedown(item)}><Tooltip title="下移"><i className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a></div>:""}
                                             </div>
                                               :""
                                       }

public/react/src/modules/paths/PathDetail/addCollaborators.js

@@ -187,8 +187,8 @@ class addCollaborators extends Component{
               {
                 partnerList && partnerList.map((item,key)=>{
                   return(
-                        <li className="clearfix">
+                        <li className="clearfix" key={key}>
-                          <Checkbox value={item.user_id} key={key} className="fl"></Checkbox>
+                          <Checkbox value={item.user_id} key={item.user_id} className="fl"></Checkbox>
                           <a target="_blank" className="task-hide color-grey3 fl span1 edu-txt-w80">{item.user_name}</a>
                           <span className="task-hide fl color-grey edu-txt-w80 span2">{item.nickname}</span>
                           <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identity}</span>

public/react/src/modules/tpm/NewHeader.js

@@ -826,6 +826,9 @@ submittojoinclass=(value)=>{
                 {/* p 老师  l 学生 */}
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训</Link></li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
+								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
+									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>
+								</li>
                 <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
 								<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>
                 <li><a href={`/account/profile`}>账号管理</a></li>

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -362,6 +362,7 @@ export function TPMIndexHOC(WrappedComponent) {
 								overflow: hidden;
 							}
 							.newHeaders{
+							  // position: fixed;
 								max-width: unset;
 								background: #24292D !important;
 								width: 100%;

public/react/src/search/SearchPage.js

@@ -183,14 +183,14 @@ class SearchPage extends Component{
 										return (
 											<a key={key}
 											  href={
-													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`/courses/${item.id}/students`:item.type==="subject"?`/paths/${item.id}`:item.type==="memo"?`/forums/${item.id}`:""
+													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`${item.first_category_url}`:item.type==="subject"?`/paths/${item.id}`:item.type==="memo"?`/forums/${item.id}`:""
 												}
 												 target="_blank"
 											>
 
 											<div className="project-package-item">
 
-												<div className={"font-16 color-dark fl "} >
+												<div className={"font-16 color-dark fl "} style={{width:"100%"}} >
 													{/*标题*/}
 													<span className={"markdown-body fonttext"}
 															 dangerouslySetInnerHTML={{__html:item.title}}/>