diff --git a/app/assets/javascripts/admins/modals/admin-upload-file-modal.js b/app/assets/javascripts/admins/modals/admin-upload-file-modal.js new file mode 100644 index 000000000..cf1333381 --- /dev/null +++ b/app/assets/javascripts/admins/modals/admin-upload-file-modal.js @@ -0,0 +1,62 @@ +$(document).on('turbolinks:load', function() { + var $modal = $('.modal.admin-upload-file-modal'); + if ($modal.length > 0) { + var $form = $modal.find('form.admin-upload-file-form') + var $sourceIdInput = $modal.find('input[name="source_id"]'); + var $sourceTypeInput = $modal.find('input[name="source_type"]'); + + $modal.on('show.bs.modal', function(event){ + var $link = $(event.relatedTarget); + var sourceId = $link.data('sourceId'); + var sourceType = $link.data('sourceType'); + + $sourceIdInput.val(sourceId); + $sourceTypeInput.val(sourceType); + + $modal.find('.upload-file-input').trigger('click'); + }); + + $modal.find('.upload-file-input').on('change', function(e){ + var file = $(this)[0].files[0]; + + if(file){ + $modal.find('.file-names').html(file.name); + $modal.find('.submit-btn').trigger('click'); + } + }) + + var formValid = function(){ + if($form.find('input[name="file"]').val() == undefined || $form.find('input[name="file"]').val().length == 0){ + $form.find('.error').html('请选择文件'); + return false; + } + + return true; + }; + + $modal.on('click', '.submit-btn', function(){ + $form.find('.error').html(''); + + if (formValid()) { + var formDataString = $form.serialize(); + $.ajax({ + method: 'POST', + dataType: 'json', + url: '/admins/files?' + formDataString, + data: new FormData($form[0]), + processData: false, + contentType: false, + success: function(data){ + $.notify({ message: '上传成功' }); + $modal.trigger('upload:success', data); + $modal.modal('hide'); + }, + error: function(res){ + var data = res.responseJSON; + $form.find('.error').html(data.message); + } + }); + } + }); + } +}); \ No newline at end of file diff --git a/app/assets/javascripts/admins/shixun_settings/shixun_settings.js b/app/assets/javascripts/admins/shixun_settings/index.js similarity index 78% rename from app/assets/javascripts/admins/shixun_settings/shixun_settings.js rename to app/assets/javascripts/admins/shixun_settings/index.js index 9034ebe39..cff00a7c4 100644 --- a/app/assets/javascripts/admins/shixun_settings/shixun_settings.js +++ b/app/assets/javascripts/admins/shixun_settings/index.js @@ -28,6 +28,13 @@ $(document).on('turbolinks:load', function() { data: json }) }) + + $('.modal.admin-upload-file-modal').on('upload:success', function(e, data){ + var $imageElement = $('.shixun-image-' + data.source_id); + $imageElement.attr('src', data.url); + $imageElement.show(); + $imageElement.next().html('重新上传'); + }) } }); diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index e4b9cdbf3..d3a298dcf 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -19,6 +19,7 @@ body { align-items: stretch; font-size: 14px; background: #efefef; + overflow: hidden; } .simple_form { diff --git a/app/assets/stylesheets/admins/shixun_settings.scss b/app/assets/stylesheets/admins/shixun_settings.scss index c38fc0c6d..dcfc35650 100644 --- a/app/assets/stylesheets/admins/shixun_settings.scss +++ b/app/assets/stylesheets/admins/shixun_settings.scss @@ -1,14 +1,22 @@ -input[type="checkbox"]{ - font-size:18px; -} -.select2 input::-webkit-input-placeholder{ - color:#ccc; -} -.select2 .select2-selection__choice{ - border: 1px solid #eee !important; -} -.setting-chosen{ - font-weight: 400; - font-size: 10px; - color:#333; +.admins-shixun-settings-index-page { + input[type="checkbox"]{ + font-size:18px; + } + .select2 input::-webkit-input-placeholder{ + color:#ccc; + } + .select2 .select2-selection__choice{ + border: 1px solid #eee !important; + } + .setting-chosen{ + font-weight: 400; + font-size: 10px; + color:#333; + } + + .shixun-setting-image { + display: flex; + flex-direction: column; + align-items: center; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index e2deb745d..3310ec828 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -20,6 +20,11 @@ label.error { input.form-control { font-size: 14px; } +.input-group-prepend { + .input-group-text { + font-size: 14px; + } +} .flex-1 { flex: 1; diff --git a/app/controllers/admins/files_controller.rb b/app/controllers/admins/files_controller.rb new file mode 100644 index 000000000..3c799ceba --- /dev/null +++ b/app/controllers/admins/files_controller.rb @@ -0,0 +1,54 @@ +class Admins::FilesController < Admins::BaseController + before_action :convert_file!, only: [:create] + + def create + File.delete(file_path) if File.exist?(file_path) # 删除之前的文件 + + Util.write_file(@file, file_path) + + render_ok(source_id: params[:source_id], source_type: params[:source_type].to_s, url: file_url) + rescue StandardError => ex + logger_error(ex) + render_error('上传失败') + end + + private + + def convert_file! + max_size = 10 * 1024 * 1024 # 10M + if params[:file].class == ActionDispatch::Http::UploadedFile + @file = params[:file] + render_error('请上传文件') if @file.size.zero? + render_error('文件大小超过限制') if @file.size > max_size + else + file = params[:file].to_s.strip + return render_error('请上传正确的图片') if file.blank? + @file = Util.convert_base64_image(file, max_size: max_size) + end + rescue Base64ImageConverter::Error => ex + render_error(ex.message) + end + + def file_path + @_file_path ||= begin + case params[:source_type].to_s + when 'Shixun' then + disk_filename('Shixun', params[:source_id]) + else + disk_filename(params[:source_type].to_s, params[:source_id].to_s) + end + end + end + + def disk_filename(type, id) + File.join(storage_path, type.to_s, id.to_s) + end + + def storage_path + @_storage_path ||= File.join(Rails.root, 'public', 'images', 'avatars') + end + + def file_url + File.join('/images/avatars/', params[:source_type].to_s, params[:source_id].to_s) + end +end \ No newline at end of file diff --git a/app/controllers/concerns/git_common.rb b/app/controllers/concerns/git_common.rb index 1752df7cb..b8b2ec10a 100644 --- a/app/controllers/concerns/git_common.rb +++ b/app/controllers/concerns/git_common.rb @@ -46,9 +46,10 @@ module GitCommon # 为版本库添加文件 def add_file @path, message, content = params[:path].strip, params[:message], params[:content] - author_name, author_email = current_user.real_name, current_user.current_user.git_mail + author_name, author_email = current_user.real_name, current_user.git_mail + Rails.logger.info(" good repo_name is #{@repo_path}") @content = GitService.update_file(repo_path: @repo_path, - file_path: path, + file_path: @path, message: message, content: content, author_name: author_name, diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 50e349bab..b99cac96a 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1100,13 +1100,19 @@ class CoursesController < ApplicationController def export_member_act_score search = params[:search] ? "#{params[:search].strip}" : "" #用户名或学生学号id搜索 group_id = params[:group_id] #分班的班级id - @all_members = student_act_score group_id, search + @all_members = @course.students + @all_members = @all_members.where(course_group_id: group_id) unless group_id.blank? + unless search.blank? + @all_members = @all_members.joins(user: [:user_extension]).where('concat(users.lastname, users.firstname) like ? or user_extensions.student_id like ?',"%#{search}%","%#{search}%") + end + if @all_members.size == 0 normal_status(-1,"课堂暂时没有学生") elsif params[:export].present? && params[:export] normal_status(0,"正在下载中") else set_export_cookies + @all_members = student_act_score group_id, search act_score_to_xlsx(@all_members) filename_ = "#{current_user.real_name}_#{@course.name}_活跃度_#{Time.now.strftime('%Y%m%d_%H%M%S')}" render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_member_act_score.xlsx.axlsx", @@ -1238,7 +1244,8 @@ class CoursesController < ApplicationController end tip_exception("课堂所属单位不能为空！") if params[:school].blank? tip_exception("请至少添加一个课堂模块") if params[:course_module_types].blank? - @school = School.find_by!(name: params[:school].strip) + @school = School.find_by(name: params[:school].strip) + tip_exception("所属单位不存在") unless @school.present? end def validate_start_end_date diff --git a/app/controllers/homework_banks_controller.rb b/app/controllers/homework_banks_controller.rb index a812da751..7e10509ba 100644 --- a/app/controllers/homework_banks_controller.rb +++ b/app/controllers/homework_banks_controller.rb @@ -11,7 +11,12 @@ class HomeworkBanksController < ApplicationController def update ActiveRecord::Base.transaction do - @bank.update_attributes(name: params[:name], description: params[:description], reference_answer: params[:reference_answer]) + if @bank.homework_type == 1 + @bank.update_attributes(name: params[:name], description: params[:description], reference_answer: params[:reference_answer]) + elsif @bank.homework_type == 3 + @bank.update_attributes(name: params[:name], description: params[:description], reference_answer: params[:reference_answer], + base_on_project: params[:base_on_project], min_num: params[:min_num], max_num: params[:max_num]) + end # 作业描述的附件 Attachment.associate_container(params[:attachment_ids], @bank.id, @bank.class) if params[:attachment_ids] diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 78e6cc0f0..3dc27edc6 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -3,14 +3,17 @@ class ShixunsController < ApplicationController include ApplicationHelper before_action :require_login, :check_auth, except: [:download_file, :index, :menus, :show, :show_right, :ranking_list, - :discusses, :collaborators, :fork_list, :propaedeutics] + :discusses, :collaborators, :fork_list, :propaedeutics, :add_file] before_action :check_account, only: [:new, :create, :shixun_exec] + before_action :find_shixun, except: [:index, :new, :create, :menus, :get_recommend_shixuns, + :propaedeutics, :departments, :apply_shixun_mirror, + :get_mirror_script, :download_file] - before_action :find_shixun, :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns, - :propaedeutics, :departments, :apply_shixun_mirror, - :get_mirror_script, :download_file] - before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy] + before_action :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns, :add_file, + :propaedeutics, :departments, :apply_shixun_mirror, + :get_mirror_script, :download_file] + before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file] before_action :allowed, only: [:update, :close, :update_propaedeutics, :settings, :publish, :shixun_members_added, :change_manager, :collaborators_delete, diff --git a/app/controllers/users/question_banks_controller.rb b/app/controllers/users/question_banks_controller.rb index 1f51b701c..d2f111973 100644 --- a/app/controllers/users/question_banks_controller.rb +++ b/app/controllers/users/question_banks_controller.rb @@ -1,4 +1,5 @@ class Users::QuestionBanksController < Users::BaseController + before_action :require_login before_action :check_query_params! before_action :check_user_permission! @@ -62,12 +63,10 @@ class Users::QuestionBanksController < Users::BaseController end def check_user_permission! - return if User.current.admin? || (observed_logged_user? && read_question_bank_permission?) - - render_forbidden - end - - def read_question_bank_permission? - params[:type] == 'personal' ? User.current.is_teacher? : User.current.certification_teacher? + if params[:type] == 'publicly' + render_error("未通过职业认证") unless User.current.admin? || User.current.certification_teacher? + else + render_forbidden unless User.current.admin? || User.current.is_teacher? + end end end \ No newline at end of file diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb index 64aec92c6..6659ec760 100644 --- a/app/services/homeworks_service.rb +++ b/app/services/homeworks_service.rb @@ -314,8 +314,8 @@ class HomeworksService if work.work_status != 0 if myshixun_endtime.present? - work.cost_time = myshixun_endtime.to_i - setting_time.publish_time.to_i - + work_cost_time = myshixun_endtime.to_i - setting_time.publish_time.to_i + work.cost_time = work_cost_time > 0 ? work_cost_time : games.select{|game| game.status == 2}.pluck(:cost_time).sum efficiency = (pass_consume_time == 0 ? 0 : Math.log((user_total_score / pass_consume_time.to_f) + 1.0)) work.efficiency = format("%.2f", efficiency) diff --git a/app/views/admins/shared/_admin_common_refuse_modal.html.erb b/app/views/admins/shared/_admin_common_refuse_modal.html.erb index a2daf7f0c..ee1b3177e 100644 --- a/app/views/admins/shared/_admin_common_refuse_modal.html.erb +++ b/app/views/admins/shared/_admin_common_refuse_modal.html.erb @@ -2,7 +2,7 @@
- +
拒绝原因
diff --git a/app/views/admins/shared/modal/_upload_file_modal.html.erb b/app/views/admins/shared/modal/_upload_file_modal.html.erb new file mode 100644 index 000000000..036f1122a --- /dev/null +++ b/app/views/admins/shared/modal/_upload_file_modal.html.erb @@ -0,0 +1,32 @@ + \ No newline at end of file diff --git a/app/views/admins/shixun_settings/index.html.erb b/app/views/admins/shixun_settings/index.html.erb index 939ed7d72..fe92a69a7 100644 --- a/app/views/admins/shixun_settings/index.html.erb +++ b/app/views/admins/shixun_settings/index.html.erb @@ -74,3 +74,4 @@ <%= render partial: 'admins/shixun_settings/shared/list', locals: { shixun_settings: @shixun_settings } %>
+<%= render partial: 'admins/shared/modal/upload_file_modal', locals: { title: '上传图片' } %> \ No newline at end of file diff --git a/app/views/admins/shixun_settings/shared/_td.html.erb b/app/views/admins/shixun_settings/shared/_td.html.erb index 931ad11ac..efdec4f8d 100644 --- a/app/views/admins/shixun_settings/shared/_td.html.erb +++ b/app/views/admins/shixun_settings/shared/_td.html.erb @@ -15,19 +15,11 @@ <%= select_tag(:tag_repertoires, options_for_select(@shixun_tags,shixun.tag_repertoires.pluck(:id)),multiple:true,class:"form-control shixun-setting-form",data:{id:shixun.id},id:"tags-chosen-#{shixun.id}") %> - - - -- - - - <%#= File.exist?(disk_filename("Shixun",shixun.id)) ? "重新上传" : "上传图片" %> - - <%# if File.exist?(disk_filename("Shixun",shixun.id)) %> - <%#= image_tag(url_to_avatar(shixun), :class => "w80 h80 fl ml5 shixun_image_show", :id => "shixun_image_show_#{shixun.id}") %> - <%# else %> - - <%# end %> - + + <% imageExists = File.exist?(disk_filename("Shixun",shixun.id)) %> + <% imageUrl = imageExists ? '/' + url_to_avatar(shixun) + "?#{Time.now.to_i}" : '' %> + <%= image_tag(imageUrl, width: 60, height: 40, class: "preview-image shixun-image-#{shixun.id}", data: { toggle: 'tooltip', title: '点击预览' }, style: imageExists ? '' : 'display:none') %> + <%= javascript_void_link imageExists ? '重新上传' : '上传图片', class: 'action upload-shixun-image-action', data: { source_id: shixun.id, source_type: 'Shixun', toggle: 'modal', target: '.admin-upload-file-modal' } %> <%= link_to shixun.owner.try(:show_real_name),"/users/#{shixun.owner.login}",target:'_blank' %> diff --git a/app/views/admins/shixuns/shared/_list.html.erb b/app/views/admins/shixuns/shared/_list.html.erb index 9d0c34b5f..afa457a77 100644 --- a/app/views/admins/shixuns/shared/_list.html.erb +++ b/app/views/admins/shixuns/shared/_list.html.erb @@ -9,7 +9,7 @@ 选择 状态 创建者 - <%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %> + <%= sort_tag('创建于', name: 'created_on', path: admins_shixuns_path) %> 单测 操作 diff --git a/app/views/colleges/shared/_navbar.html.erb b/app/views/colleges/shared/_navbar.html.erb index 9313b2044..32a253534 100644 --- a/app/views/colleges/shared/_navbar.html.erb +++ b/app/views/colleges/shared/_navbar.html.erb @@ -1,5 +1,5 @@
diff --git a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js index cde4f5f5e..2dc873167 100644 --- a/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js +++ b/public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js @@ -19,11 +19,11 @@ class CompletetopicdePage extends Component { constructor(props) { super(props); // this.answerMdRef = React.createRef(); - this.setState({ + this.state={ workid:1, isSpin:false, datas:[], - }) + } } @@ -48,13 +48,13 @@ class CompletetopicdePage extends Component { this.setState({ isSpin:true, }) - let url = `/homework_banks/${workids}.json`; + let url = `/gtopic_banks/${workids}.json`; // axios.get(url).then((response) => { if(response){ if(response.data){ this.setState({ - datas:response.data.informs, + datas:response.data, }) }else { this.setState({ @@ -88,9 +88,8 @@ class CompletetopicdePage extends Component { ///////////////教师截止 render() { - - const isAdmin = this.props.isAdmin(); - // console.log(119) + let{datas}=this.state; + // console.log(119) return ( @@ -110,10 +109,10 @@ class CompletetopicdePage extends Component {

- MySQL数据库编程开发实训（基础篇） + {datas&&datas.name}

@@ -128,7 +127,7 @@ class CompletetopicdePage extends Component { - + {/*{parseInt(tab) === 1 ? :""}*/} diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js index 15b4c24cf..5b15bc7f6 100644 --- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js +++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js @@ -56,52 +56,52 @@ class Completetopicdetails extends Component { render() { - + let{datas}=this.props; return (
-
+
- + {datas.attachment_list === undefined ? "" : datas.attachment_list.map((item, key) => { + return ( + + ) + })}

课题类型： - 设计 + {datas&&datas.topic_type===1?"设计":datas&&datas.topic_type===2?"论文":datas&&datas.topic_type===3?"创作":"设计"}

课题来源： - 生产/社会实践 + {datas&&datas.topic_source===1?"生产/社会实际":datas&&datas.topic_source===2?"结合科研":datas&&datas.topic_source===3?"其它":"生产/社会实际"}

课题性质1： - 设计 + {datas&&datas.topic_property_first===1?"真题":datas&&datas.topic_property_first===2?"模拟题":"真题"}

课题性质2： - 设计 + {datas&&datas.topic_property_second===1?"纵向课题":datas&&datas.topic_property_second===2?"横向课题":datas&&datas.topic_property_second===3?"自选":"纵向课题"}

课题重复情况： - 新需求 + {datas&&datas.topic_repeat===1?"新题":datas&&datas.topic_repeat===2?"往届题，有新要求":datas&&datas.topic_repeat===3?"往届题，无新要求":"新题"}

调研或实习地点： - 长沙 + {datas&&datas.province}{datas&&datas.city}

课题单位来源： - 湖南省据C++创始人Stroustrup有限公司 + {datas&&datas.source_unit}

diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index 71d92cd0c..3b25ceb6d 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -73,8 +73,9 @@ class AccessoryModal extends Component{ // ModalCancel:this.cancelAttachment // }) // return false; - - this.deleteAttachment(file); + if(file.response!=undefined){ + this.deleteAttachment(file); + } } @@ -256,7 +257,7 @@ class AccessoryModal extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js index 6808ded8a..a9a627387 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js @@ -64,8 +64,10 @@ class AccessoryModal2 extends Component{ // ModalCancel:this.cancelAttachment // }) // return false; + if(file.response!=undefined){ + this.deleteAttachment(file); + } - this.deleteAttachment(file); } @@ -178,7 +180,7 @@ class AccessoryModal2 extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index 2870c5d12..d52b328e2 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -296,37 +296,44 @@ class Selectsetting extends Component{ onAttachmentRemove = (file) => { + if(file.response!=undefined){ + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { - // const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - const { status } = response.data; - if (status == 0) { - - this.setState({ - fileListtype:false, - fileList:[] - }) - // this.setState((state) => { - // const index = state.fileList.indexOf(file); - // const newFileList = state.fileList.slice(); - // newFileList.splice(index, 1); - // return { - // fileList: newFileList, - // }; - // }); + this.setState({ + fileListtype:false, + fileList:[] + }) + // this.setState((state) => { + // const index = state.fileList.indexOf(file); + // const newFileList = state.fileList.slice(); + // newFileList.splice(index, 1); + // return { + // fileList: newFileList, + // }; + // }); + } } - } + }) + .catch(function (error) { + console.log(error); + }); + this.setState({ + fileListtype:false, }) - .catch(function (error) { - console.log(error); - }); - this.setState({ - fileListtype:false, - }) + }else{ + this.setState({ + fileListtype:false, + fileList:[] + }) + } + // const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + } onChangeTimepublishs= (date, dateString,key) => { @@ -389,7 +396,7 @@ class Selectsetting extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js index 715e4acf9..56c85439c 100644 --- a/public/react/src/modules/courses/coursesPublic/sendResource.js +++ b/public/react/src/modules/courses/coursesPublic/sendResource.js @@ -132,28 +132,34 @@ class Sendresource extends Component{ onAttachmentRemove = (file) => { -debugger - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - const { status } = response.data; - if (status == 0) { - this.setState({ - fileListtype:false, - fileList:[] - }) - } - - } - }) - .catch(function (error) { - console.log(error); - }); - this.setState({ - fileListtype:false, - }) + if(file.response!=undefined){ + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + this.setState({ + fileListtype:false, + fileList:[] + }) + } + + } + }) + .catch(function (error) { + console.log(error); + }); + this.setState({ + fileListtype:false, + }) + }else{ + this.setState({ + fileListtype:false, + fileList:[] + }) + } } ModalCancelModalCancel=()=>{ @@ -338,7 +344,7 @@ debugger // console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 4f37ac816..74637571f 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -708,7 +708,14 @@ a.white-btn.use_scope-btn:hover{ color: #999!important; padding:0px 10px; } - +.orangeLine{ + background: #fff; + border:1px solid #FE944B; + color: #FE944B!important; + padding:0px 10px; + line-height: 28px; + border-radius: 4px; +} .colorFF6800{ color:#FF6800; diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index b958faa5c..2c56b8b58 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -332,17 +332,17 @@ class Testpapersettinghomepage extends Component{
{this.props.isAdmin()===true? - 答题列表 - 统计结果 - 试卷预览 - 设置 + 答题列表 + 统计结果 + 试卷预览 + 设置 : - 答题列表 + 答题列表 {Commonheadofthetestpaper&&Commonheadofthetestpaper.show_statistic===true? - 统计结果:""} - 设置 + 统计结果:""} + 设置 }
@@ -370,7 +370,7 @@ class Testpapersettinghomepage extends Component{ padding-top: 10px; padding-bottom: 8px; } - a:hover { + .exercisesafonts:hover { color:#1A0B00 !important; } `} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index ce704ef6e..0d5a756de 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -157,49 +157,52 @@ class GraduationTasksSubmitedit extends Component{ } onAttachmentRemove = (file) => { - let {attachments,fileList}=this.state; - const url = `/attachments/${file}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - // const { status } = response.data; - if (response.data.status === 0) { - console.log('--- success') - let newattachments=attachments; - if(file.uid===undefined){ - for(var i=0; i { + if (response.data) { + // const { status } = response.data; + if (response.data.status === 0) { + console.log('--- success') + let newattachments=attachments; + if(file.uid===undefined){ + for(var i=0; i { - const index = state.fileList.indexOf(file); - const newFileList = state.fileList.slice(); - newFileList.splice(index, 1); - return { - fileList: newFileList, - }; - }); - } - } - }) - .catch(function (error) { - console.log(error); - }); + this.setState((state) => { + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + } inputSearchValue=(e)=>{ @@ -520,7 +523,7 @@ class GraduationTasksSubmitedit extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 3c8318796..9ebefcaef 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -146,14 +146,16 @@ class GraduationTasksSubmitnew extends Component{ // }, // }); // return false; + if(file.response!=undefined){ + this.setState({ + Modalstype:true, + Modalstopval:'确定要删除这个附件吗?', + ModalSave: ()=>this.deleteAttachment(file), + ModalCancel:this.cancelAttachment + }) + return false; + } - this.setState({ - Modalstype:true, - Modalstopval:'确定要删除这个附件吗?', - ModalSave: ()=>this.deleteAttachment(file), - ModalCancel:this.cancelAttachment - }) - return false; } cancelAttachment=()=>{ @@ -538,7 +540,7 @@ render(){ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js index 24fdd75cf..e8b076685 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js @@ -88,21 +88,24 @@ class GraduationTasksappraiseMainEditor extends Component{ this.setState({ fileList }); } onAttachmentRemove = (file, stateName) => { - this.props.confirm({ - content: '确定要删除这个附件吗?', - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - this.deleteAttachment(file, stateName) - }, - onCancel() { - console.log('Cancel'); - }, - }); + if(file.response!=undefined){ + this.props.confirm({ + content: '确定要删除这个附件吗?', + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + this.deleteAttachment(file, stateName) + }, + onCancel() { + console.log('Cancel'); + }, + }); + + + return false; + } - - return false; } deleteAttachment = (file, stateName) => { // 初次上传不能直接取uid @@ -169,7 +172,7 @@ class GraduationTasksappraiseMainEditor extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 869295c59..e6139bad6 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -103,14 +103,16 @@ class GraduationTasksedit extends Component{ } // 附件相关 START handleChange = (info) => { - let fileList = info.fileList; - // console.log(fileList) - // for(var list of fileList ){ - // console.log(fileList) - // } - this.setState({ - fileList: appendFileSizeToUploadFileAll(fileList), - }); + if(info.file.status == "done" || info.file.status == "uploading"){ + let fileList = info.fileList; + // console.log(fileList) + // for(var list of fileList ){ + // console.log(fileList) + // } + this.setState({ + fileList: appendFileSizeToUploadFileAll(fileList), + }); + } } // onAttachmentRemove = (file) => { @@ -148,39 +150,42 @@ class GraduationTasksedit extends Component{ } onAttachmentRemove = (file) => { - // debugger - this.cancelAttachment(); - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - // const url = `/attachments/${file}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - - if ( response.data.status === 0) { - - this.setState({ - Modalstype:false, - Modalstopval:response.data.message, - ModalSave:this.cancelAttachment, - Loadtype:true, - }) - - this.setState((state) => { - - const index = state.fileList.indexOf(file); - const newFileList = state.fileList.slice(); - newFileList.splice(index, 1); - return { - fileList: newFileList, - }; - }); - } - } - }) - .catch(function (error) { - console.log(error); - }); + if(file.response!=undefined){ + // debugger + this.cancelAttachment(); + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + // const url = `/attachments/${file}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + + if ( response.data.status === 0) { + + this.setState({ + Modalstype:false, + Modalstopval:response.data.message, + ModalSave:this.cancelAttachment, + Loadtype:true, + }) + + this.setState((state) => { + + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + } Commoninterface=(fileList)=>{ @@ -294,7 +299,7 @@ class GraduationTasksedit extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index fae87fb65..3b6b60ac8 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js @@ -57,24 +57,22 @@ class GraduationTasksnew extends Component { } // if (GraduationTasksnewtype === true) { this.props.form.validateFields((err, values) => { + if (values.tasktype === undefined) { + this.ifHasAnchorJustScorll("tasktypes"); + return + } + if (values.name === undefined) { + this.ifHasAnchorJustScorll("nametypes"); + return + } + if (values.description === undefined) { + this.ifHasAnchorJustScorll("descriptiontypes"); + return + }else if (values.description.length > 5000) { + this.ifHasAnchorJustScorll("descriptiontypes"); + return + } if (!err) { - if (values.tasktype === undefined) { - this.scrollToAnchors("tasktypes"); - return - } - - if (values.name === undefined) { - this.scrollToAnchors("nametypes"); - return - } - - if (values.description === undefined) { - this.scrollToAnchors("descriptiontypes"); - return - } else if (values.description.length > 5000) { - this.scrollToAnchors("descriptiontypes"); - return - } // console.log('Received values of form: ', values); // console.log(fileList); const course_id = this.props.match.params.coursesId; @@ -129,14 +127,16 @@ class GraduationTasksnew extends Component { } // 附件相关 START handleChange = (info) => { - let fileList = info.fileList; - - // for(var list of fileList ){ - // console.log(list) - // } - this.setState({ - fileList: appendFileSizeToUploadFileAll(fileList), - }); + if(info.file.status == "done" || info.file.status == "uploading"){ + let fileList = info.fileList; + + // for(var list of fileList ){ + // console.log(list) + // } + this.setState({ + fileList: appendFileSizeToUploadFileAll(fileList), + }); + } } // onAttachmentRemove = (file) => { @@ -173,30 +173,33 @@ class GraduationTasksnew extends Component { } onAttachmentRemove = (file) => { - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - // const url = `/attachments/${file}.json` - axios.delete(url, {}) - .then((response) => { - if (response.data) { - const {status} = response.data; - if (status == 0) { - console.log('--- success') - - this.setState((state) => { - const index = state.fileList.indexOf(file); - const newFileList = state.fileList.slice(); - newFileList.splice(index, 1); - return { - fileList: newFileList, - }; - }); - this.cancelAttachment() + if(file.response!=undefined){ + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + // const url = `/attachments/${file}.json` + axios.delete(url, {}) + .then((response) => { + if (response.data) { + const {status} = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + this.cancelAttachment() + } } - } - }) - .catch(function (error) { - console.log(error); - }); + }) + .catch(function (error) { + console.log(error); + }); + } + } //滚动 @@ -271,7 +274,7 @@ class GraduationTasksnew extends Component { console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js index 02fc5018e..511deb511 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js @@ -1,19 +1,28 @@ import React,{ Component } from "react"; -import { Select, Modal } from 'antd'; - +import { + Form, Input, InputNumber, Switch, Radio, + Slider, Button, Upload, Icon, Rate, Checkbox, message, + Row, Col, Select, Modal,Cascader +} from 'antd'; +import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor'; import axios from 'axios' - +import {getUrl} from 'educoder'; import "../../common/formCommon.css" import '../style.css' import '../../css/Courses.css' -import { WordsBtn } from 'educoder' +import { WordsBtn, City } from 'educoder' import {Link} from 'react-router-dom' +// import City from './City' -import GraduateTopicNewFrom from './GraduateTopicNewFrom' +// import './board.css' +// import { RouteHOC } from './common.js' +const confirm = Modal.confirm; const $ = window.$ +const { Option } = Select; +const NAME_COUNT=60; // 新建毕设选题 // https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=c6d9b36f-7701-4035-afdb-62404681108c class GraduateTopicNew extends Component{ @@ -24,12 +33,14 @@ class GraduateTopicNew extends Component{ this.state = { fileList: [], + boards: [], teacherList:[], topic_property_first:[], topic_property_second:[], topic_repeat:[], topic_source:[], topic_type:[], + attachments:undefined, addonAfter:0, left_banner_id:undefined, course_name:undefined @@ -42,11 +53,21 @@ class GraduateTopicNew extends Component{ axios.get((url)).then((result)=>{ if(result.status==200){ this.setState({ + teacherList:result.data.teacher_list, left_banner_id:result.data.left_banner_id, course_name:result.data.course_name, - left_banner_name:result.data.left_banner_name + left_banner_name:result.data.left_banner_name, + topic_property_first:result.data.topic_property_first, + topic_property_second:result.data.topic_property_second, + topic_repeat:result.data.topic_repeat, + topic_source:result.data.topic_source, + topic_type:result.data.topic_type + }) + console.log("sdfds"); + console.log(this.props.current_user && this.props.current_user.user_id); + this.props.form.setFieldsValue({ + tea_id:this.props.current_user && this.props.current_user.user_id }) - this.GraduateTopicNewFromRef.initNewInfo(result); } }).catch((error)=>{ console.log(error); @@ -66,91 +87,240 @@ class GraduateTopicNew extends Component{ //编辑，信息显示 getEditInfo=()=>{ const cid = this.props.match.params.coursesId - let topicId=this.props.match.params.topicId; - if(topicId){ - let url=`/courses/${cid}/graduation_topics/${topicId}/edit.json`; - axios.get((url)).then((result)=>{ - if(result){ - this.setState({ - left_banner_id:result.data.left_banner_id, - course_name:result.data.course_name, - left_banner_name:result.data.left_banner_name - }) - this.GraduateTopicNewFromRef.initValue(result); - - } - }).catch((error)=>{ - console.log(error); - }) - } - } - - // 编辑保存 - editSave = (param,attachments,topicId) =>{ - const cid = this.props.match.params.coursesId - const editUrl = `/courses/${cid}/graduation_topics/${topicId}.json` - let params = { - graduation_topic:param, - attachment_ids:attachments - } - axios.put(editUrl, params).then((response) => { - if (response.status == 200) { - const { id } = response.data; - if (id) { - this.props.showNotification('保存成功！'); - this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`); - } + let topicId=this.props.match.params.topicId + let url=`/courses/${cid}/graduation_topics/${topicId}/edit.json`; + axios.get((url)).then((result)=>{ + if(result){ + this.setState({ + left_banner_id:result.data.left_banner_id, + course_name:result.data.course_name, + left_banner_name:result.data.left_banner_name, + teacherList:result.data.teacher_list, + topic_property_first:result.data.topic_property_first, + topic_property_second:result.data.topic_property_second, + topic_repeat:result.data.topic_repeat, + topic_source:result.data.topic_source, + topic_type:result.data.topic_type, + attachments:result.data.attachments, + addonAfter:parseInt(result.data.selected_data.name.length) + }) + this.props.form.setFieldsValue({ + tea_id:result.data.selected_data.tea_id, + name:result.data.selected_data.name, + city: [result.data.selected_data.province,result.data.selected_data.city], + topic_type:result.data.selected_data.topic_type || undefined, + topic_source:result.data.selected_data.topic_source || undefined, + topic_property_first:result.data.selected_data.topic_property_first || undefined, + topic_property_second:result.data.selected_data.topic_property_second || undefined, + source_unit:result.data.selected_data.source_unit, + topic_repeat:result.data.selected_data.topic_repeat || undefined + }); + this.mdRef.current.setValue(result.data.selected_data.description) + const _fileList = result.data.attachments.map(item => { + return { + id: item.id, + uid: item.id, + name: item.title, + url: item.url, + status: 'done' + } + }) + this.setState({ fileList: _fileList, cityDefaultValue: [result.data.selected_data.province,result.data.selected_data.city] }) } - }).catch(function (error) { + }).catch((error)=>{ console.log(error); - }); + }) } - // 新建提交 - newSubmit = (param,attachments,topicId) =>{ + handleSubmit = (e) => { + e.preventDefault(); const cid = this.props.match.params.coursesId - const url = `/courses/${cid}/graduation_topics.json` - let params = { - graduation_topic:param, - attachment_ids:attachments - } - axios.post(url, params).then((response) => { - if (response.data) { - const { id } = response.data; - if (id) { - this.props.showNotification('提交成功！'); - this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`); + const topicId = this.props.match.params.topicId + // console.log(this.props); + + this.props.form.validateFieldsAndScroll((err, values) => { + if (!err) { + console.log('Received values of form: ', values); + if (topicId !=undefined) { + const editTopic = this.editTopic + const editUrl = `/courses/${cid}/graduation_topics/${topicId}.json` + + let attachment_ids = undefined + if (this.state.fileList) { + attachment_ids = this.state.fileList.map(item => { + return item.response ? item.response.id : item.id + }) + } + axios.put(editUrl, { + graduation_topic:{ + ...values, + province: values.city==undefined?"":values.city[0], + city: values.city==undefined?"":values.city[1], + }, + attachment_ids + }).then((response) => { + if (response.status == 200) { + const { id } = response.data; + if (id) { + this.props.showNotification('保存成功！'); + this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`); + } + } + }).catch(function (error) { + console.log(error); + }); + } else { + const url = `/courses/${cid}/graduation_topics.json` + let attachment_ids = undefined + if (this.state.fileList) { + attachment_ids = this.state.fileList.map(item => { + return item.response.id + }) + } + + axios.post(url, { + graduation_topic:{ + ...values, + province: values.city==undefined?"":values.city[0], + city: values.city==undefined?"":values.city[1], + }, + attachment_ids, + }).then((response) => { + if (response.data) { + const { id } = response.data; + if (id) { + this.props.showNotification('提交成功！'); + this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`); + } + } + }) + .catch(function (error) { + console.log(error); + }); } + } else { + $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) } - }).catch(function (error) { - console.log(error); }); } - // 取消编辑或者新建 - editCancel = () =>{ - const cid = this.props.match.params.coursesId; - let topicId=this.props.match.params.topicId; - if(topicId){ - this.props.history.push(`/courses/${cid}/graduation_topics/${topicId}/detail`); - }else{ - this.props.history.push(`/courses/${cid}/graduation_topics/${this.state.left_banner_id}`); - } + + // 选择省市 + ChangeCity=(value, selectedOptions)=>{ + console.log(selectedOptions); + } + + // 附件相关 START + handleChange = (info) => { + let fileList = info.fileList; + this.setState({ fileList }); } + onAttachmentRemove = (file) => { + + if(file.response!=undefined){ + confirm({ + title: '确定要删除这个附件吗?', + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } - + } + deleteAttachment = (file) => { + console.log(file); + let id=file.response ==undefined ? file.id : file.response.id + const url = `/attachments/${id}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + + // 附件相关 ------------ END + + changeTopicName=(e)=>{ + // let num= 60 - parseInt(e.target.value.length); + this.setState({ + addonAfter:e.target.value.length + }) + } render() { let { + fileList, + teacherList, + topic_property_first, + topic_property_second, + topic_repeat, + topic_source, + topic_type, + addonAfter, left_banner_id, course_name, left_banner_name } = this.state; const { current_user } = this.props + const { getFieldDecorator } = this.props.form; let{ topicId,coursesId }=this.props.match.params - const common={ - editSave:this.editSave, - newSubmit:this.newSubmit, - editCancel:this.editCancel - } + // console.log(this.props); + + const formItemLayout = { + labelCol: { + xs: { span: 24 }, + // sm: { span: 8 }, + sm: { span: 24 }, + }, + wrapperCol: { + xs: { span: 24 }, + // sm: { span: 16 }, + sm: { span: 24 }, + }, + }; + const uploadProps = { + width: 600, + fileList, + multiple: true, + // https://github.com/ant-design/ant-design/issues/15505 + // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 + // showUploadList: false, + action: `${getUrl()}/api/attachments.json`, + onChange: this.handleChange, + onRemove: this.onAttachmentRemove, + beforeUpload: (file) => { + console.log('beforeUpload', file.name); + const isLt150M = file.size / 1024 / 1024 < 150; + if (!isLt150M) { + this.props.showNotification('文件大小必须小于150MB!'); + } + return isLt150M; + }, + }; + // console.log("dfsf"); + // console.log(this.props); return(
+ + {getFieldDecorator('name', { + rules: [{ + required: true, message: '请输入选题名称', + }, { + max: 60, message: '最大限制为60个字符', + }], + })( + + )} + +
+ + + +
+ + + {getFieldDecorator('description', { + rules: [{ + required: true, message: '请输入选题简介', + }, { + max: 10000, message: '最大限制为10000个字符', + }], + })( + + )} + + + { + getFieldDecorator('file',{ + rules:[{ + required:false + }] + })( + + + (单个文件150M以内) + + ) + } + +
+ + {getFieldDecorator('topic_type', { + rules: [{ + required: false, message: '', + }], + })( + + )} + + + {getFieldDecorator('topic_source', { + rules: [{ + required: false, message: '', + }], + })( + + )} + + + {getFieldDecorator('topic_property_first', { + rules: [{ + required: false, message: '', + }], + })( + + )} + + + {getFieldDecorator('topic_property_second', { + rules: [{ + required: false, message: '', + }], + })( + + )} + +
+
+ + + + + +
+ + {getFieldDecorator('source_unit', { + rules: [{ + required: false, message: '', + }], + })( + + )} + + + {getFieldDecorator('topic_repeat', { + rules: [{ + required: false, message: '', + }], + })( + + )} + + + {getFieldDecorator('city', { + rules: [{ + initialValue: this.state.cityDefaultValue, + type: 'array', + required: false, message: '', + }], + })( + + )} + +
+ + +
+ + this.props.history.goBack()}>取消 +
+ +
) } } -// const WrappedGraduateTopicNew = Form.create({ name: 'topicPostWorksNew' })(GraduateTopicNew); +const WrappedGraduateTopicNew = Form.create({ name: 'topicPostWorksNew' })(GraduateTopicNew); // RouteHOC() -export default GraduateTopicNew; \ No newline at end of file +export default (WrappedGraduateTopicNew); \ No newline at end of file diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js index 50551adae..3998669d7 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js @@ -163,21 +163,25 @@ class GraduateTopicPostWorksNew extends Component{ this.setState({ fileList }); } onAttachmentRemove = (file) => { - confirm({ - title: '确定要删除这个附件吗?', - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); + if(file.response!=undefined){ + confirm({ + title: '确定要删除这个附件吗?', + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + + + return false; + } + - - return false; } deleteAttachment = (file) => { const url = `/attachments/${file.id}.json` @@ -249,7 +253,7 @@ class GraduateTopicPostWorksNew extends Component{ console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage.js b/public/react/src/modules/courses/groupjobbank/GroupPackage.js index 8014585d1..73132b3fa 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupPackage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupPackage.js @@ -21,7 +21,9 @@ class GroupPackage extends Component { } } - + DownloadOpenPdf=(type,url)=>{ + type===true?window.open(url):window.location.href=url; + } componentDidMount() { console.log("Groupjobquesanswer"); console.log("componentDidMount"); @@ -54,9 +56,9 @@ class GroupPackage extends Component { render() { - + let{attachments}=this.props; return ( -
+
@@ -73,11 +75,11 @@ class GroupPackage extends Component { ` } - this.DownloadOpenPdf(attachments.is_pdf,attachments.url)} title={attachments&&attachments.title} className="mr12 yslahover overflowHidden1" length="58" style={{maxWidth:'480px',fontSize:"16px",}}> - 清除浏览器缓存或换个浏览器操作指南更新版本.zip + {attachments&&attachments.title} - {2} + {attachments&&attachments.filesize}
) diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js index 6a48a51c8..349c2b97e 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js +++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js @@ -54,18 +54,42 @@ class GroupPackage extends Component { render() { + let{datas,bool}=this.props; return ( + bool===true? +
-

- 分组要求： - 2~ 5（学生提交作品时需要关联同组成员，组内成员作品共享） -

+ { + datas===undefined?"":datas.min_num===undefined||datas.max_num===undefined?"":datas.min_num===null||datas.max_num===null?"": +

+ 分组要求： + {datas&&datas.min_num}~ {datas&&datas.max_num}（学生提交作品时需要关联同组成员，组内成员作品共享） +

+ }

基于项目实施 （学生必须在本平台创建项目，项目管理员可以提交作品）

+ :
+ { + datas===undefined?"":datas.group_info===undefined?"":datas.group_info.min_number===undefined||datas.group_info.max_number===undefined?"": + datas.group_info.min_number===null||datas.group_info.max_number===null?"": +

+ 分组要求： + {datas&&datas.group_info&&datas.group_info.min_number}~ {datas&&datas.group_info&&datas.group_info.max_number}（学生提交作品时需要关联同组成员，组内成员作品共享） +

+ } + { + datas&&datas.group_info&&datas.group_info.base_on_project? +

+ 基于项目实施 + （学生必须在本平台创建项目，项目管理员可以提交作品） +

+ :"" + } +
) } } diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js index 772752def..6b3e817c1 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -57,20 +57,21 @@ class Groupjobbandetails extends Component { render() { + let{datas}=this.props; return (
-
+
- + {datas.attachments === undefined ? "" : datas.attachments.map((item, key) => { + return ( + + ) + })} - +
diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js index 27827eb28..6dba2a1e1 100644 --- a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -14,6 +14,7 @@ import "../common/formCommon.css"; import '../css/Courses.css'; import '../css/busyWork.css'; import '../poll/pollStyle.css'; +import Generaljobdetails from "../questionbank/Generaljobdetails"; class GroupjobbankPage extends Component { //分组作业内容详情 @@ -43,7 +44,7 @@ class GroupjobbankPage extends Component { console.log(e); console.log("44"); } - + this.getonedata(); } @@ -64,6 +65,9 @@ class GroupjobbankPage extends Component { this.setState({ shixuntypes: types[3] }) + this.getonedata(); + } + getonedata=()=>{ if( this.props.match.params.workid){ this.setState({ workid: this.props.match.params.workid, @@ -88,7 +92,7 @@ class GroupjobbankPage extends Component { if(response){ if(response.data){ this.setState({ - datas:response.data.informs, + datas:response.data, }) }else { this.setState({ @@ -120,9 +124,8 @@ class GroupjobbankPage extends Component { ///////////////教师截止 render() { - let {tab} = this.state; + let {tab,datas} = this.state; - const isAdmin = this.props.isAdmin(); // console.log(119) @@ -143,10 +146,10 @@ class GroupjobbankPage extends Component {

- MySQL数据库编程开发实训（基础篇） + {datas&&datas.name}

@@ -155,15 +158,15 @@ class GroupjobbankPage extends Component {
this.ChangeTab(0)}>内容详情 this.ChangeTab(1)}>参考答案 - 发送 - 编辑 - 删除 + 发送 + 编辑 + 删除
- {parseInt(tab) === 0 ? :""} - {parseInt(tab) === 1 ? :""} + {parseInt(tab) === 0 ? :""} + {parseInt(tab) === 1 ? :""}
diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js index c6a0f787f..a951769be 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -10,6 +10,7 @@ import { Tooltip, notification, } from "antd"; +import AttachmentsList from '../../../common/components/attachment/AttachmentList' import GroupPackage from './GroupPackage'; import GroupPackage2 from './GroupPackage2'; import './questionbanks.css'; @@ -56,20 +57,18 @@ class Groupjobquesanswer extends Component { render() { - + let{datas}=this.props; return (
-
+
+ + {datas.attachments === undefined ? "" : + } - - +
diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js index 9b3d72e00..77a41e47d 100644 --- a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js +++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js @@ -73,18 +73,21 @@ class CreateGroupByImportModal extends Component{ } onAttachmentRemove = (file) => { - this.props.confirm({ - content: '是否确认删除?', - - onOk: () => { - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); - - return false; + if(file.response!=undefined){ + this.props.confirm({ + content: '是否确认删除?', + + onOk: () => { + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + + return false; + } + } deleteAttachment = (file) => { const url = `/attachments/${file.response ? file.response.id : file.uid}.json` diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 171a27c5e..091f45b94 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -280,9 +280,13 @@ class PollNew extends Component { questionnair: true, left_banner_id:result.data.left_banner_id }) - // console.log(this.state.polls_nametest) - // console.log(this.state.polls_descriptiontest) - // } + if( result.data.poll.polls_name){ + if( result.data.poll.polls_name.length>0){ + this.setState({ + addonAfter: result.data.poll.polls_name.length, + }) + } + } }).catch((error) => { console.log(error) }) @@ -326,8 +330,13 @@ class PollNew extends Component { polls_descriptiontest: result.data.poll.polls_description, questionnair: true, }) - - // } + if( result.data.poll.polls_name){ + if( result.data.poll.polls_name.length>0){ + this.setState({ + addonAfter: result.data.poll.polls_name.length, + }) + } + } }).catch((error) => { console.log(error) }) @@ -966,18 +975,23 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex); + this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex,0); // newarrpoll.push(question); newarrpoll.splice(thiss.state.Insertposition, 0, question); } else if (object.question.question_type === 2) { //插入多选题 - if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + if(object.question.max_choices){ + if(object.question.max_choices>0){ + if (object.question.max_choices < object.question.min_choices) { + this.props.showNotification(`可选的最大限制不能小于最小限制`); - return; + return; + } + } } + var questiontwo = {}; var other = []; var option = []; @@ -1026,7 +1040,7 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex); + this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex,object.question.answers.length); //插入多选题 // if (object.question.max_choices > arrc.length) { // // console.log("选择题的最大可选项不能大于选项数") @@ -1096,7 +1110,7 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex); + this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex,0); // newarrpoll.push(question); newarrpoll.splice(thiss.state.Insertposition, 0, question); } @@ -1159,23 +1173,31 @@ class PollNew extends Component { question = {"question": questiontwo}; if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 1, arrc, null, 0, 0); + this.edittotheserver(object, 1, arrc, null, 0, 0,0); newarrpoll.splice(uuk, 1, question); } else { // console.log("他原来的删除掉了") - this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id); + this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id,0); newarrpoll.push(question); } newarr[indexo].question.new = "new" // console.log(newarrpoll) } else if (object.question.question_type === 2) { //插入多选题 + if(object.question.max_choices){ + if(object.question.max_choices>0){ + if (object.question.max_choices < object.question.min_choices) { + this.props.showNotification(`可选的最大限制不能小于最小限制`); - if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification('可选的最大限制不能小于最小限制！'); - - return; + return; + } + } } + // if (object.question.max_choices < object.question.min_choices) { + // this.props.showNotification('可选的最大限制不能小于最小限制！'); + // + // return; + // } var questiontwo = {}; var other = []; var option = []; @@ -1230,11 +1252,11 @@ class PollNew extends Component { // } if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices); + this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices,object.question.answers.length); newarrpoll.splice(uuk, 1, question); } else { // console.log("删除") - this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id); + this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id,object.question.answers.length); newarrpoll.push(question); } // console.log(newarrpoll) @@ -1276,11 +1298,11 @@ class PollNew extends Component { if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 3, null, null, 0, 0); + this.edittotheserver(object, 3, null, null, 0, 0,0); newarrpoll.splice(uuk, 1, question); } else { // console.log("删除") - this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id); + this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id,0); newarrpoll.push(question); } // console.log(newarrpoll) @@ -1448,15 +1470,24 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex); + this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex,0); newarrpoll.splice(thiss.state.Insertposition, 0, question); } else if (object.question.question_type === 2) { //插入多选题 - if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + if(object.question.max_choices){ + if(object.question.max_choices>0){ + if (object.question.max_choices < object.question.min_choices) { + this.props.showNotification(`可选的最大限制不能小于最小限制`); - return; + return; + } + } } + // if (object.question.max_choices < object.question.min_choices) { + // this.props.showNotification(`可选的最大限制不能小于最小限制`); + // + // return; + // } var questiontwo = {}; var other = []; @@ -1502,7 +1533,7 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex); + this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex,object.question.answers.length); //插入多选题 // if (object.question.max_choices > arrc.length) { @@ -1550,7 +1581,7 @@ class PollNew extends Component { if (this.state.problemtopicbool === true) { insindex = this.state.problemtopic; } - this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex); + this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex,0); // newarrpoll.push(question); newarrpoll.splice(thiss.state.Insertposition, 0, question); } @@ -1611,21 +1642,30 @@ class PollNew extends Component { question = {"question": questiontwo}; if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 1, arrc, null, 0, 0); + this.edittotheserver(object, 1, arrc, null, 0, 0,0); newarrpoll.splice(uuk, 1, question); } else { // console.log("删除") - this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id); + this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id,0); newarrpoll.push(question); } // console.log(newarrpoll) } else if (object.question.question_type === 2) { //插入多选题 - if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选的最大限制不能小于最小限制`); + if(object.question.max_choices){ + if(object.question.max_choices>0){ + if (object.question.max_choices < object.question.min_choices) { + this.props.showNotification(`可选的最大限制不能小于最小限制`); - return; + return; + } + } } + // if (object.question.max_choices < object.question.min_choices) { + // this.props.showNotification(`可选的最大限制不能小于最小限制`); + // + // return; + // } var questiontwo = {}; var other = []; var option = []; @@ -1667,11 +1707,11 @@ class PollNew extends Component { //插入多选题 if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices); + this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices,object.question.answers.length); newarrpoll.splice(uuk, 1, question); } else { // console.log("删除") - this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id); + this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id,object.question.answers.length); newarrpoll.push(question); } // console.log(newarrpoll) @@ -1712,11 +1752,11 @@ class PollNew extends Component { question = {"question": questiontwo}; if (uuk !== -1) { // console.log("修改") - this.edittotheserver(object, 3, null, null, 0, 0); + this.edittotheserver(object, 3, null, null, 0, 0,0); newarrpoll.splice(uuk, 1, question); } else { // console.log("删除") - this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id); + this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id,0); newarrpoll.push(question); } // console.log(newarrpoll) @@ -1752,7 +1792,8 @@ class PollNew extends Component { ////新增到服务器中 - createquestionsandanswers = (object, number, option, other, max_choices, min_choices, insert_id) => { + createquestionsandanswers = (object, number, option, other, max_choices, min_choices, insert_id,length) => { + var thiss = this; var poll_id = this.state.pollid; var urlly = `/polls/${poll_id}/poll_questions.json` @@ -1765,12 +1806,16 @@ class PollNew extends Component { max_choicess = max_choices; min_choicess = min_choices; } + console.log("createquestionsandanswers"); + console.log(max_choicess); + console.log(min_choicess); + console.log(length); axios.post(urlly, { question_title: object.question.question_title, question_type: number, is_necessary: object.question.is_necessary, - max_choices: max_choicess, - min_choices: min_choicess, + max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess, + min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess, question_answers: option, question_other_answer: null, insert_id: insert_id @@ -1801,17 +1846,30 @@ class PollNew extends Component { } ///编辑修改到服务器当中 - edittotheserver = (object, number, option, other, max_choices, min_choices) => { + edittotheserver = (object, number, option, other, max_choices, min_choices,length) => { // console.log("调用了edittotheserver") var url = `/poll_questions/${object.question.id}.json` var thiss = this; + var max_choicess = null; + var min_choicess = null; + if (max_choices === 0 && min_choices === 0) { + max_choicess = null; + min_choicess = null; + } else { + max_choicess = max_choices; + min_choicess = min_choices; + } + console.log("createquestionsandanswers"); + console.log(max_choicess); + console.log(min_choicess); + console.log(length); axios.put(url, { // debug: true, question_title: object.question.question_title, question_type: number, is_necessary: object.question.is_necessary, - max_choices: max_choices, - min_choices: min_choices, + max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess, + min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess, question_answers: option, question_other_answer: null, }).then((result) => { @@ -2123,6 +2181,12 @@ class PollNew extends Component { //最小值 HandleGradationGroupChangee = (value, index, max, length) => { + // console.log("最小值"); + // console.log(value); + // console.log(index); + // console.log(max); + // console.log(length); + // debugger var minbool = false; var maxbool = false; @@ -2137,7 +2201,7 @@ class PollNew extends Component { if (minbool === true && maxbool === true) { for (var i = 0; i < arr.length; i++) { if (index === i) { - arr[i].question.min_choices = parseInt(value); + arr[i].question.min_choices = parseInt(value); } } this.setState({ @@ -2146,18 +2210,8 @@ class PollNew extends Component { } else { for (var i = 0; i < arr.length; i++) { if (index === i) { - try { - if(parseInt(value)===0){ - arr[i].question.min_choices = 2; - arr[i].question.max_choices = length; - }else{ arr[i].question.min_choices = parseInt(value); arr[i].question.max_choices = length; - } - }catch (e) { - arr[i].question.min_choices = 2; - arr[i].question.max_choices = length; - } break; } } @@ -2169,19 +2223,32 @@ class PollNew extends Component { } //最大值 - HandleGradationGroupChangeee = (value, index,minchoices) => { + HandleGradationGroupChangeee = (value, index,minchoices,length) => { // console.log("2112"); // console.log(value); // console.log(minchoices); + // console.log("最大值"); + // console.log(value); + // console.log(index); + // console.log(minchoices); + // console.log(length); let arr = this.state.adddom; for (var i = 0; i < arr.length; i++) { if (index === i) { if(parseInt(value)===0&&parseInt(minchoices)===0){ + arr[i].question.min_choices= parseInt(0); + arr[i].question.max_choices = parseInt(0); + }else if(parseInt(minchoices)===0){ + arr[i].question.min_choices= parseInt(2); + arr[i].question.max_choices = parseInt(value); + } + else if(parseInt(value)===0&&parseInt(minchoices)>0){ arr[i].question.min_choices= parseInt(minchoices); arr[i].question.max_choices = parseInt(value); - }else { + } + else { arr[i].question.min_choices= minchoices===null?2:minchoices===undefined?2:minchoices===0?2:parseInt(minchoices); - arr[i].question.max_choices = parseInt(value); + arr[i].question.max_choices = parseInt(value); } } } @@ -2465,6 +2532,7 @@ class PollNew extends Component { modalsBottomval={this.state.ModalsBottomval} loadtype={this.state.Loadtype} /> : ""} +

this.gotohome()}>{this.props.coursedata.name} @@ -2867,7 +2935,7 @@ class PollNew extends Component { value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices} > - + {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { return ( indext >= 1 ? : "" @@ -2878,10 +2946,10 @@ class PollNew extends Component { className="ml10 mr10 color-grey-6 lineh-40 fl">~ {/*可选最大*/} this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices)} + onChange={(value) => this.HandleGradationGroupChangeee(value, indexo,itemo.question.min_choices,itemo.question.answers.length)} value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices} > @@ -3373,7 +3441,7 @@ class PollNew extends Component { className="ml10 mr10 color-grey-6 lineh-40 fl">~ {/*可选最大*/} + +

+
+ + +
问卷须知
+ + + { + this.state.Newedit === true || this.state.mysave === true ? +
+ + {cancellation === false ? + + : ""} + +
+ : "" + } + +
+ +
:"" + } + + + +

+ + + { + this.state.mysingles + this.state.mydoubles + this.state.mymainsint === 0 ? "" : +

+ + {this.state.mysingles === 0 ? "" : 单选题{this.state.mysingles === undefined ? "" : this.state.mysingles} 题} + + {this.state.mydoubles === 0 ? "" : + 多选题{this.state.mydoubles === undefined ? "" : this.state.mydoubles}题} + {this.state.mymainsint === 0 ? "" : + + 主观题{this.state.mymainsint === undefined ? "" : this.state.mymainsint}题 + + } + + + 合计 {this.state.q_counts === undefined ? "" :this.state.q_counts} 题 +
+ + } + +

+ + {polls_status === undefined || polls_status === 1 ? +
+
+ this.addmysingles()}>单选题 + this.addmydoubles()}>多选题 + this.addmymainsint()}>主观题 +
+
+ :
} + +
+ + {/*自动生成修改好的获取到的*/} + {/**************************************************************************/} + {this.state.poll_questions === undefined ? "" : this.state.poll_questions.map((item, index) => { + console.log('打印this.state.poll_questions'); + console.log(this.state.poll_questions); + console.log(this.state.adddom); + let resultDom; + resultDom =
+

+ 第{index + 1}题： + {item.question.question_type === 1 ? "(单选题)" : item.question.question_type === 2 ? "(多选题)" : "(主观题)"} + {item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"} + {(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")} + { + polls_status === undefined || polls_status === 1 ? + + this.showDeleteConfirm(item.question.question_type, index, item)}> + {index === 0 ? "" : + this.handleClickBySortUp(index, item)}>} + {index === this.state.poll_questions.length - 1 ? "" : + this.handleClickBySortDown(index, item)}>} + this.addMytopic(item.question.question_type, this.state.pollid, index + 1, true, item.question.id)}> + this.adddomedit(item)}> + : this.adddomedit(item)}> + } + +

+

{item.question.question_title}

+ {/*
{item.question.question_title}
*/} + {item.question.question_type === 1 ? +
+ + {item.question.answers === undefined ? "" : item.question.answers.map((items, i) => { + return ( +
+ + {items.answer_text} + +
+ ) + })} + + {/*单选题*/} + + +
+ : item.question.question_type === 2 ? +
+ + {item.question.answers === undefined ? "" : item.question.answers.map((items, i) => { + return ( +
+ + {items.answer_text} +
+ ) + })} + + {/*多选题*/} +
+ + : item.question.question_type === 3 ? + // 主观题 + (
+
) : (
)} +
+ + return ( +
+ {/*这里是编辑和新增的地方*/} + { + this.state.bindingid && this.state.bindingid===item.question.id? + (this.state.Newdisplay === false? +
+
+ {this.state.adddom === undefined ? "" :this.state.adddom===undefined?"": this.state.adddom.length===0?"":item.question.id === this.state.adddom[0].question.id&&this.state.adddom.map((itemo, indexo) => { + let arrid = itemo.question.id; + let resultDomtwo; + resultDomtwo = +
+ {itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"} + this.OnCheckAllChange(e, indexo)} + className="lineh-40" + style={{"marginLeft": "20px"}}>必答 + + + + + {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { + return ( +
+ {itemt.answer_text === undefined ? ( +
) : itemt.answer_text === "其他" ? ( +

+ 其它 + + + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Deleteentrys(arrid, indext, true)}> + : ""} +

) : (

+ 选项 + + + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Deleteentrys(arrid, indext, false)}> + : ""} +

)} +
+ ) + })} + +
+ {itemo.question.question_type === 1 ? ( +
+
+ {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Ewoption(itemo.question.id, itemo)}>新增选项 + + : ""} + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + + (this.state.newoption === false ? + this.Addanotheroption(itemo.question.id)}>新增其他选项 + : "") + : ""} + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+
+ + + ) + + + : itemo.question.question_type === 2 ? ( + //////////////////////////////////////////// 可选 +
+
+
+ 可选 +
+ {/*可选最小*/} + + + ~ + {/*可选最大*/} + + 项 + （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） +
+ +
+
+
+ ) + + : (
) + + } +
+
+ {itemo.question.question_type === 2 ? + ( + this.state.polls_status === undefined || this.state.polls_status === 1 ? +
+ +
this.Ewoption(itemo.question.id, itemo)}>新增选项 + + { + this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" + } + +
+ + + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ + + : +
+ + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ ) + + : itemo.question.question_type === 3 ? +
+ + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ : + ""} + + +
+
+ + + return ( +
+ {resultDomtwo} +
+ ) + })} +
+
:"") + : +
+ {resultDom} + {this.state.Newdisplay === false? + +
+ {this.state.adddom === undefined ? "" :this.state.adddom===undefined?"": this.state.adddom.length===0?"":item.question.id === this.state.adddom[0].question.id&&this.state.adddom.map((itemo, indexo) => { + let arrid = itemo.question.id; + let resultDomtwo; + resultDomtwo = +
+ {itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"} + this.OnCheckAllChange(e, indexo)} + className="lineh-40" + style={{"marginLeft": "20px"}}>必答 + + + + + {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { + return ( +
+ {itemt.answer_text === undefined ? ( +
) : itemt.answer_text === "其他" ? ( +

+ 其它 + + + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Deleteentrys(arrid, indext, true)}> + : ""} +

) : (

+ 选项 + + + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Deleteentrys(arrid, indext, false)}> + : ""} +

)} +
+ ) + })} + +
+ {itemo.question.question_type === 1 ? ( +
+
+ {this.state.polls_status === undefined || this.state.polls_status === 1 ? + this.Ewoption(itemo.question.id, itemo)}>新增选项 + + : ""} + {this.state.polls_status === undefined || this.state.polls_status === 1 ? + + (this.state.newoption === false ? + this.Addanotheroption(itemo.question.id)}>新增其他选项 + : "") + : ""} + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+
+ + + ) + + + : itemo.question.question_type === 2 ? ( + //////////////////////////////////////////// 可选 +
+
+
+ 可选 +
+ {/*可选最小*/} + + + ~ + {/*可选最大*/} + + 项 + （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） +
+ +
+
+
+ ) + + : (
) + + } +
+
+ {itemo.question.question_type === 2 ? + ( + this.state.polls_status === undefined || this.state.polls_status === 1 ? +
+ +
this.Ewoption(itemo.question.id, itemo)}>新增选项 + + { + this.state.newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" + } + +
+ + + + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ + + : +
+ + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ ) + + : itemo.question.question_type === 3 ? +
+ + this.Deleteadddom(indexo,true)}>取消 + this.Deleteadddomthree(indexo, itemo,true)}>保存 + this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续 + +
+ : + ""} + + +
+
+ + + return ( +
+ {resultDomtwo} +
+ ) + })} +
:""} +
+ } +
+ + ) + })} + + + + {/*新建单选多选2*/} +
+ { + this.state.Newdisplay === true? +
+ {this.state.adddom === undefined ? "" : this.state.adddom.map((itemo, indexo) => { + // console.log('打印this.state.adddom') + // console.log(this.state.adddom); + let arrid = itemo.question.id; + let resultDomtwo; + resultDomtwo = +
+ {itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"} + this.OnCheckAllChange(e, indexo)} + className="lineh-40" + style={{"marginLeft": "20px"}}>必答 + + + + + {itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => { + return ( +
+ {itemt.answer_text === undefined ? ( +
) : itemt.answer_text === "其他" ? ( +

+ 其它 + + + {polls_status === undefined || polls_status === 1 ? + this.Deleteentrys(arrid, indext, true)}> + : ""} +

) : (

+ 选项 + + + {polls_status === undefined || polls_status === 1 ? + this.Deleteentrys(arrid, indext, false)}> + : ""} +

)} +
+ ) + })} + +
+ {itemo.question.question_type === 1 ? ( +
+
+ {polls_status === undefined || polls_status === 1 ? + this.Ewoption(itemo.question.id, itemo)}>新增选项 + + : ""} + {polls_status === undefined || polls_status === 1 ? + + (newoption === false ? + this.Addanotheroption(itemo.question.id)}>新增其他选项 + : "") + : ""} + + this.Deleteadddom(indexo)}>取消 + this.Deleteadddomthree(indexo, itemo)}>保存 + this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + +
+
+ + + ) + + + : itemo.question.question_type === 2 ? ( + //////////////////////////////////////////// 可选 +
+
+
+ 可选 +
+ {/*可选最小*/} + + + ~ + {/*可选最大*/} + + 项 + （学生答题时，系统对其选择的选项个数进行限制，--表示不限制） +
+ +
+
+
+ ) + + : (
) + + } +
+
+ {itemo.question.question_type === 2 ? + ( + polls_status === undefined || polls_status === 1 ? +
+ +
this.Ewoption(itemo.question.id, itemo)}>新增选项 + + { + newoption === false ? this.Addanotheroption(itemo.question.id)}>新增其他选项 : "" + } + +
+ + + + this.Deleteadddom(indexo)}>取消 + this.Deleteadddomthree(indexo, itemo)}>保存 + this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + +
+ + + : +
+ + this.Deleteadddom(indexo)}>取消 + this.Deleteadddomthree(indexo, itemo)}>保存 + this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + +
+ ) + + : itemo.question.question_type === 3 ? +
+ + this.Deleteadddom(indexo)}>取消 + this.Deleteadddomthree(indexo, itemo)}>保存 + this.Deleteadddomtwo(indexo, itemo)}>保存并继续 + +
+ : + ""} + + +
+
+ + + return ( +
+ {resultDomtwo} +
+ ) + })} +
+ : + "" + } + + + + +
+
+
+
  • + this.toWorkDetail()}>取消 + this.submitQuestionnaire()}>提交 +
    • +
    + {/**/} +
    +
    +
    + ) + } + +} + +// RouteHOC() +export default PollNewQuestbank +{/*
    */} +{/* {*/} +{/* this.props.match.params.news === "new" ?*/} +{/* this.state.Newedit === false ?*/} +{/*
    */} +{/*
    */} + +{/*
    */} +{/* this.addmysingles()}>单选题*/} +{/* this.addmydoubles()}>多选题*/} +{/* this.addmymainsint()}>主观题*/} +{/*
    */} +{/*
    */} +{/* : ""*/} +{/* :*/} +{/*
    */} +{/*
    */} +{/*
    */} +{/* this.addmysingles()}>单选题*/} +{/* this.addmydoubles()}>多选题*/} +{/* this.addmymainsint()}>主观题*/} +{/*
    */} +{/*
    */} +{/* }*/} +{/*
    */} +{/*{*/} +{/* this.props.match.params.news === "new" ?*/} +{/* (this.state.Newedit === false ?*/} +{/* */} +{/*
  • */} +{/* this.props.history.goBack()}>取消*/} +{/* this.submitQuestionnaire(this.props.match.params.news)}>提交*/} +{/*
    • */} + + +{/* */} + +{/* : "")*/} +{/* :*/} +{/* */} +{/*}*/} \ No newline at end of file diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index 3bfc6cd36..d8d86ffa5 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -55,18 +55,19 @@ class Generaljobanswer extends Component { render() { - + let{datas}=this.props return (
    -
    +
    + {datas.attachments === undefined ? "" : datas.attachments.map((item, key) => { + return ( + + ) + })} + -
    diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js index 29453a7b5..0a29b0864 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -43,7 +43,7 @@ class Generaljobbankdetails extends Component { console.log(e); console.log("44"); } - + this.getonedata(); } @@ -58,17 +58,19 @@ class Generaljobbankdetails extends Component { this.setState({ tab: type[1], }); - - console.log("Generaljobbankdetails"); console.log(this.props); + this.getonedata(); + } + + getonedata=()=>{ if( this.props.match.params.workid){ this.setState({ workid: this.props.match.params.workid, }) } this.getdata(this.props.match.params.workid); - } + }; //获取数据的地方 getdata=(workid)=>{ var workids= workid; @@ -86,7 +88,7 @@ class Generaljobbankdetails extends Component { if(response){ if(response.data){ this.setState({ - datas:response.data.informs, + datas:response.data, }) }else { this.setState({ @@ -118,9 +120,9 @@ class Generaljobbankdetails extends Component { ///////////////教师截止 render() { - let {tab} = this.state; + let {tab,datas} = this.state; - const isAdmin = this.props.isAdmin(); + // console.log(119) @@ -141,10 +143,10 @@ class Generaljobbankdetails extends Component {

    - MySQL数据库编程开发实训（基础篇） + {datas&&datas.name}

    @@ -160,8 +162,8 @@ class Generaljobbankdetails extends Component {
    - {parseInt(tab) === 0 ? :""} - {parseInt(tab) === 1 ? :""} + {parseInt(tab) === 0 ? :""} + {parseInt(tab) === 1 ? :""} diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js index 9de444123..64413b368 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js @@ -13,14 +13,13 @@ import { import GroupPackage from '../groupjobbank/GroupPackage' import './questionbank.css'; - +//内容详情 class Generaljobdetails extends Component { constructor(props) { super(props); this.state = { - } } @@ -56,18 +55,18 @@ class Generaljobdetails extends Component { render() { - + let{datas}=this.props; return (
    -
    +
    + {datas.attachments === undefined ? "" : datas.attachments.map((item, key) => { + return ( + + ) + })} -
    diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index dd5a93534..dd694828a 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1100,7 +1100,7 @@ class ShixunHomework extends Component{ {course_modules&&course_modules.main_category.map((item,key)=>{ return( - datas&&datas.category_id===null?"":
  • this.moveTos(item.main_category_id)} title={item.main_category_name}>{item.main_category_name}
    • + datas&&datas.category_id===null?"":
  • this.moveTos(item.main_category_id)} title={item.main_category_name.length>18?item.main_category_name:""}>{item.main_category_name}
    • ) })} @@ -1109,10 +1109,10 @@ class ShixunHomework extends Component{ return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1) }).map( (item,key) => { if(datas&&datas.category_id!=null&&datas&&datas.category_id===item.category_id===false){ - return
  • this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}
    • + return
  • this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}
    • } if(datas&&datas.category_id===null){ - return
  • this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}
    • + return
  • this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}
    • } })} diff --git a/public/react/src/modules/forums/MemoNew.js b/public/react/src/modules/forums/MemoNew.js index 00a39b184..476d41a8a 100644 --- a/public/react/src/modules/forums/MemoNew.js +++ b/public/react/src/modules/forums/MemoNew.js @@ -561,21 +561,24 @@ class MemoNew extends Component { } } onAttachmentRemove = (file) => { - this.props.confirm({ - // title: '确定要删除这个附件吗?', - content: '是否确认删除?', - - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); - return false; + if(file.response!=undefined){ + this.props.confirm({ + // title: '确定要删除这个附件吗?', + content: '是否确认删除?', + + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } + } deleteAttachment = (file) => { // 初次上传不能直接取uid diff --git a/public/react/src/modules/moop_cases/CaseDetail.js b/public/react/src/modules/moop_cases/CaseDetail.js index 6e278307e..e99f6bab0 100644 --- a/public/react/src/modules/moop_cases/CaseDetail.js +++ b/public/react/src/modules/moop_cases/CaseDetail.js @@ -82,10 +82,10 @@ class CaseDetail extends Component{ 教学案例 > { CaseDetail.title}

    - + { CaseDetail.title} - + { CaseDetail.status == "pending" && 草稿 diff --git a/public/react/src/modules/moop_cases/CaseNew.js b/public/react/src/modules/moop_cases/CaseNew.js index 7d0cd735c..6d9e5b251 100644 --- a/public/react/src/modules/moop_cases/CaseNew.js +++ b/public/react/src/modules/moop_cases/CaseNew.js @@ -1,452 +1,458 @@ -import React,{ Component } from "react"; -import './css/moopCases.css' -import '../courses/css/Courses.css' -import { Form , Input , Upload , Button , Icon , message , Tooltip } from "antd"; - -import { getImageUrl , setImagesUrl , MarkdownToHtml , ActionBtn , appendFileSizeToUploadFile , appendFileSizeToUploadFileAll , getUrl , getUploadActionUrl } from 'educoder'; - -import Tags from './CaseTags' - -import axios from 'axios'; -import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor'; -import _ from 'lodash' -const { Dragger } = Upload; -function beforeUpload(file) { - const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; - if (!isJpgOrPng) { - message.error('You can only upload JPG/PNG file!'); - } - const isLt2M = file.size / 1024 / 1024 < 2; - if (!isLt2M) { - message.error('Image must smaller than 2MB!'); - } - return isJpgOrPng && isLt2M; -} -function getBase64(img, callback) { - const reader = new FileReader(); - reader.addEventListener('load', () => callback(reader.result)); - reader.readAsDataURL(img); -} - const $ = window.$; -class CaseNew extends Component{ - constructor(props){ - super(props); - this.DescMdRef = React.createRef(); - - this.state={ - casesTags:[], - contentFileList:[], - filesID:[], - imageUrl:undefined, - loading: false, - checkTag:false, - checkFile:false, - coverID:undefined - } - } - - // 上传附件-删除确认框 - onAttachmentRemove = (file, stateName) => { - this.props.confirm({ - content: '是否确认删除?', - onOk: () => { - this.deleteAttachment(file, stateName) - }, - onCancel() { - console.log('Cancel'); - }, - }); - return false; - } - - // 上传附件-确认删除 - deleteAttachment = (file, stateName) => { - // 初次上传不能直接取uid - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - axios.delete(url, { - }).then((response) => { - if (response.data) { - const { status } = response.data; - if (status == 0) { - console.log('--- success') - - this.setState((state) => { - const index = state[stateName].indexOf(file); - const newFileList = state[stateName].slice(); - newFileList.splice(index, 1); - console.log("newFileList"); - console.log(newFileList.map(item =>{ return( item.id )})); - return { - [stateName]: newFileList, - filesID:newFileList.map(item =>{ return( item.id )}) - }; - }); - } - } - }) - .catch(function (error) { - console.log(error); - }); - } - // 上传附件-change - handleContentUploadChange = (info) => { - if (info.file.status === 'done' || info.file.status === 'uploading') { - let contentFileList = info.fileList; - this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)}); - let list = appendFileSizeToUploadFileAll(contentFileList); - let arr = list.map(item=>{ - return ( item.response && item.response.id ) - }) - this.setState({ - filesID:arr, - checkFile:arr.length > 0 ? false : true - }) - } - } - - // 上传封面图-change - handleChange = (info) => { - if (info.file.status === 'uploading') { - this.setState({ loading: true }); - return; - } - if (info.file.status === 'done') { - // Get this url from response in real world. - getBase64(info.file.originFileObj, imageUrl => - this.setState({ - imageUrl, - loading: false - }), - ); - console.log(info.file); - this.setState({ - coverID:info.file.response && info.file.response.id - }) - } - }; - - // 编辑时加载数据 - componentDidMount=()=>{ - if(this.props.match.params.caseID){ - this.InitEditData(); - } - } - - componentDidUpdate=(prevState)=>{ - if(this.props.CaseDetail && prevState.CaseDetail != this.props.CaseDetail){ - this.props.form.setFieldsValue({ - caseTitle:this.props.CaseDetail.title, - userName:this.props.CaseDetail.author_name, - userUnit:this.props.CaseDetail.author_school_name, - }) - this.setState({ - contentFileList:this.props.attachments.map(item => { - return { - id: item.id, - uid: item.id, - name: appendFileSizeToUploadFile(item), - url: item.url, - filesize: item.filesize, - status: 'done' - } - }), - filesID:this.props.attachments.map(item => { - return ( item.id ) - }), - coverID:this.props.cover && this.props.cover.id, - imageUrl:this.props.CaseDetail.cover && setImagesUrl(this.props.CaseDetail.cover.url), - casesTags:this.props.tags.map(item=>{ - return (item.id); - }) - }) - console.log(this.props.attachments.map(item => { - return ( item.id ) - })) - } - } - - InitEditData=()=>{ - let caseID = this.props.match.params.caseID; - this.props.getDetail(caseID); - } - - // 申请提交和保存 - handleSubmit = (type) => { - let caseID = this.props.match.params.caseID; - console.log(type); - this.props.form.validateFieldsAndScroll((err, values) => { - let { casesTags , filesID } = this.state; - if(casesTags.length == 0){ - $("html").animate({ scrollTop: $("#tagFormItem").offset().top - 100 }); - this.setState({ - checkTag:true - }) - return; - } - if(filesID.length == 0){ - $("html").animate({ scrollTop: $("#fileFormItem").offset().top - 100 }); - this.setState({ - checkFile:true - }) - return; - } - - const mdContnet = this.DescMdRef.current.getValue().trim(); - console.log(mdContnet) - values.description = mdContnet; - - console.log(values); - let url = caseID ? `/libraries/${caseID}.json`: `/libraries.json`; - if(caseID){ - axios.put((url),{ - title:values.caseTitle, - author_name:values.userName, - author_school_name:values.userUnit, - content:values.description, - attachment_ids:this.state.contentFileList.map(item=>{ - return (item.response ? item.response.id : item.id ) - }), - tag_ids:this.state.casesTags, - cover_id:this.state.coverID, - publish:type == 'save' ? false : true - }).then((result)=>{ - if(result){ - this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`); - this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`); - } - }).catch((error)=>{ - console.log(error); - }) - }else{ - axios.post((url),{ - title:values.caseTitle, - author_name:values.userName, - author_school_name:values.userUnit, - content:values.description, - attachment_ids:this.state.filesID, - tag_ids:this.state.casesTags, - cover_id:this.state.coverID, - publish:type == 'save' ? false : true - }).then((result)=>{ - if(result){ - this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`); - this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`); - } - }).catch((error)=>{ - console.log(error); - }) - } - - }) - } - - // 选择标签 - changeType=(type)=>{ - let tags = []; - if(this.state.casesTags.indexOf(type) > -1){ - tags = this.state.casesTags.filter(item => item != type); - }else{ - tags = this.state.casesTags.concat(type); - } - const tagUniqed = _.uniq(tags); - this.setState({ - casesTags: tagUniqed, - checkTag:tags.length > 0 ? false : true - }) - } - - render(){ - let { caseID } = this.props.match.params; - let { CaseDetail } = this.props; - let { casesTags , contentFileList , imageUrl , checkTag , checkFile } = this.state; - const {getFieldDecorator} = this.props.form; - - - // 上传附件点击事件 - const uploadProps = { - width: 600, - multiple: true, - fileList:contentFileList, - action: `${getUploadActionUrl()}`, - onChange: this.handleContentUploadChange, - onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'), - beforeUpload: (file) => { - const isLt150M = file.size / 1024 / 1024 < 150; - if (!isLt150M) { - //message.error('文件大小必须小于150MB!'); - this.props.define({ - title:'提示', - content:"该文件无法上传。超过文件大小限制(150MB),建议上传到百度云等其它共享工具里，然后再txt文档里给出链接以及共享密码并上传" - }) - return isLt150M; - } - } - }; - // 上传封面图-html - const uploadButton = ( -

    - -
    - ); - // 上传封面图点击事件 - const uploadCover = { - listType:"picture-card", - className:"avatar-uploader", - showUploadList:false, - action:`${getUploadActionUrl()}`, - onChange:this.handleChange, - } - console.log('111'); - console.log(!caseID || (CaseDetail && CaseDetail.status == "pending")); - return( -
    - -

    - 教学案例 > { caseID ? "编辑" : "新建" } -

    -

    上传教学案例

    -
    -
    - - {getFieldDecorator('caseTitle', { - rules: [{required: true, message: "案例标题不能为空"}], - })( - - )} - 简明扼要介绍文档/视频所包含的主要的内容 - -
    - - {getFieldDecorator('userName', { - rules: [{required: true, message: "请输入作者姓名"}], - })( - - )} - - - {getFieldDecorator('userUnit', { - rules: [{required: true, message: "请输入作者单位名称"}], - })( - - )} - -
    -
    - 标签 -
      -
    • -1 ? "active" :"" } onClick={()=>this.changeType(1)}>获奖案例
      • -
    • -1 ? "active" :"" } onClick={()=>this.changeType(2)}>入库案例
      • -
    - { - checkTag &&
    请选择标签
    - } -
    - - {getFieldDecorator('description', { - rules: [{ - required: true, message: '请输入描述内容' - }], - })( - - )} - -
    - -

    上传附件

    -

    从我的电脑选择要上传的文档：按住CTRL可以上传多份文档。单个文件最大限制：150MB

    -     - { - checkFile == true &&
    请先上传附件
    - } -
    -

    - 封面图（上传尺寸：120*90 px） -

    -
    - - { imageUrl ? - - avatar - - : - - {uploadButton} - - } - -
    -
    -
    -
  • 审核说明
    • -
      -
    • 平台管理员将对每天新上传的文档进行审核，审核通过的文档将公开显示，否则将私有化或移除
      • -
    -
    -
    -
  • 温馨提示
    • -
      -
    • 1.请勿上传已设置加密口令的文档资源；
      • -
    • 2.可以上传符合教学案例标准的文档资料，如 - 案例入库标准、 - 案例使用说明书以及其他资料等，上传支持的文件最大容量：100MB；
      • -
    • 3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；
      • -
    • 4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；
      • -
    -
    - -
    - { - (!caseID || (CaseDetail && CaseDetail.status == "pending" || CaseDetail && CaseDetail.status == "refused")) ? : "" - } - this.handleSubmit("save")}>保存 -
    -     - -
    - ) - } -} -const WrappedCoursesNewApp = Form.create({name: 'CaseNew'})(CaseNew); +import React,{ Component } from "react"; +import './css/moopCases.css' +import '../courses/css/Courses.css' +import { Form , Input , Upload , Button , Icon , message , Tooltip } from "antd"; + +import { getImageUrl , setImagesUrl , MarkdownToHtml , ActionBtn , appendFileSizeToUploadFile , appendFileSizeToUploadFileAll , getUrl , getUploadActionUrl } from 'educoder'; + +import Tags from './CaseTags' + +import axios from 'axios'; +import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor'; +import _ from 'lodash' +const { Dragger } = Upload; +function beforeUpload(file) { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'; + if (!isJpgOrPng) { + message.error('You can only upload JPG/PNG file!'); + } + const isLt2M = file.size / 1024 / 1024 < 2; + if (!isLt2M) { + message.error('Image must smaller than 2MB!'); + } + return isJpgOrPng && isLt2M; +} +function getBase64(img, callback) { + const reader = new FileReader(); + reader.addEventListener('load', () => callback(reader.result)); + reader.readAsDataURL(img); +} + const $ = window.$; +class CaseNew extends Component{ + constructor(props){ + super(props); + this.DescMdRef = React.createRef(); + + this.state={ + casesTags:[], + contentFileList:[], + filesID:[], + imageUrl:undefined, + loading: false, + checkTag:false, + checkFile:false, + coverID:undefined + } + } + + // 上传附件-删除确认框 + onAttachmentRemove = (file, stateName) => { + if(file.response!=undefined){ + this.props.confirm({ + content: '是否确认删除?', + onOk: () => { + this.deleteAttachment(file, stateName) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } + } + + // 上传附件-确认删除 + deleteAttachment = (file, stateName) => { + // 初次上传不能直接取uid + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }).then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state[stateName].indexOf(file); + const newFileList = state[stateName].slice(); + newFileList.splice(index, 1); + console.log("newFileList"); + console.log(newFileList.map(item =>{ return( item.id )})); + return { + [stateName]: newFileList, + filesID:newFileList.map(item =>{ return( item.id )}) + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + // 上传附件-change + handleContentUploadChange = (info) => { + if (info.file.status === 'done' || info.file.status === 'uploading') { + let contentFileList = info.fileList; + this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)}); + let list = appendFileSizeToUploadFileAll(contentFileList); + let arr = list.map(item=>{ + return ( item.response && item.response.id ) + }) + this.setState({ + filesID:arr, + checkFile:arr.length > 0 ? false : true + }) + } + } + + // 上传封面图-change + handleChange = (info) => { + if (info.file.status === 'uploading') { + this.setState({ loading: true }); + return; + } + if (info.file.status === 'done') { + // Get this url from response in real world. + getBase64(info.file.originFileObj, imageUrl => + this.setState({ + imageUrl, + loading: false + }), + ); + console.log(info.file); + this.setState({ + coverID:info.file.response && info.file.response.id + }) + } + }; + + // 编辑时加载数据 + componentDidMount=()=>{ + if(this.props.match.params.caseID){ + this.InitEditData(); + } + } + + componentDidUpdate=(prevState)=>{ + if(this.props.CaseDetail && prevState.CaseDetail != this.props.CaseDetail){ + this.props.form.setFieldsValue({ + caseTitle:this.props.CaseDetail.title, + userName:this.props.CaseDetail.author_name, + userUnit:this.props.CaseDetail.author_school_name, + }) + this.setState({ + contentFileList:this.props.attachments.map(item => { + return { + id: item.id, + uid: item.id, + name: appendFileSizeToUploadFile(item), + url: item.url, + filesize: item.filesize, + status: 'done' + } + }), + filesID:this.props.attachments.map(item => { + return ( item.id ) + }), + coverID:this.props.cover && this.props.cover.id, + imageUrl:this.props.CaseDetail.cover && setImagesUrl(this.props.CaseDetail.cover.url), + casesTags:this.props.tags.map(item=>{ + return (item.id); + }) + }) + console.log(this.props.attachments.map(item => { + return ( item.id ) + })) + } + } + + InitEditData=()=>{ + let caseID = this.props.match.params.caseID; + this.props.getDetail(caseID); + } + + // 申请提交和保存 + handleSubmit = (type) => { + let caseID = this.props.match.params.caseID; + console.log(type); + this.props.form.validateFieldsAndScroll((err, values) => { + let { casesTags , filesID } = this.state; + if(casesTags.length == 0){ + $("html").animate({ scrollTop: $("#tagFormItem").offset().top - 100 }); + this.setState({ + checkTag:true + }) + return; + } + if(filesID.length == 0){ + $("html").animate({ scrollTop: $("#fileFormItem").offset().top - 100 }); + this.setState({ + checkFile:true + }) + return; + } + + const mdContnet = this.DescMdRef.current.getValue().trim(); + console.log(mdContnet) + values.description = mdContnet; + + console.log(values); + let url = caseID ? `/libraries/${caseID}.json`: `/libraries.json`; + if(caseID){ + axios.put((url),{ + title:values.caseTitle, + author_name:values.userName, + author_school_name:values.userUnit, + content:values.description, + attachment_ids:this.state.contentFileList.map(item=>{ + return (item.response ? item.response.id : item.id ) + }), + tag_ids:this.state.casesTags, + cover_id:this.state.coverID, + publish:type == 'save' ? false : true + }).then((result)=>{ + if(result){ + this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`); + this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`); + } + }).catch((error)=>{ + console.log(error); + }) + }else{ + axios.post((url),{ + title:values.caseTitle, + author_name:values.userName, + author_school_name:values.userUnit, + content:values.description, + attachment_ids:this.state.filesID, + tag_ids:this.state.casesTags, + cover_id:this.state.coverID, + publish:type == 'save' ? false : true + }).then((result)=>{ + if(result){ + this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`); + this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`); + } + }).catch((error)=>{ + console.log(error); + }) + } + + }) + } + + // 选择标签 + changeType=(type)=>{ + // console.log(this.state.casesTags); + // debugger + let tags = []; + + if(this.state.casesTags.indexOf(type) > -1){ + tags = this.state.casesTags.filter(item => item != type); + }else{ + tags = this.state.casesTags.concat(type); + } + const tagUniqed = _.uniq(tags); + this.setState({ + casesTags: tagUniqed, + checkTag:tags.length > 0 ? false : true + }) + } + + render(){ + let { caseID } = this.props.match.params; + let { CaseDetail } = this.props; + let { casesTags , contentFileList , imageUrl , checkTag , checkFile } = this.state; + const {getFieldDecorator} = this.props.form; + + + // 上传附件点击事件 + const uploadProps = { + width: 600, + multiple: true, + fileList:contentFileList, + action: `${getUploadActionUrl()}`, + onChange: this.handleContentUploadChange, + onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'), + beforeUpload: (file) => { + const isLt150M = file.size / 1024 / 1024 < 150; + if (!isLt150M) { + //this.props.showNotification('文件大小必须小于150MB!'); + this.props.define({ + title:'提示', + content:"该文件无法上传。超过文件大小限制(150MB),建议上传到百度云等其它共享工具里，然后再txt文档里给出链接以及共享密码并上传" + }) + return isLt150M; + } + } + }; + // 上传封面图-html + const uploadButton = ( +
    + +
    + ); + // 上传封面图点击事件 + const uploadCover = { + listType:"picture-card", + className:"avatar-uploader", + showUploadList:false, + action:`${getUploadActionUrl()}`, + onChange:this.handleChange, + } + console.log('111'); + console.log(!caseID || (CaseDetail && CaseDetail.status == "pending")); + return( +
    + +

    + 教学案例 > { caseID ? "编辑" : "新建" } +

    +

    上传教学案例

    +
    +
    + + {getFieldDecorator('caseTitle', { + rules: [{required: true, message: "案例标题不能为空"}], + })( + + )} + 简明扼要介绍文档/视频所包含的主要的内容 + +
    + + {getFieldDecorator('userName', { + rules: [{required: true, message: "请输入作者姓名"}], + })( + + )} + + + {getFieldDecorator('userUnit', { + rules: [{required: true, message: "请输入作者单位名称"}], + })( + + )} + +
    +
    + 标签 +
      +
    • -1 ? "active" :"" } onClick={()=>this.changeType(1)}>获奖案例
      • +
    • -1 ? "active" :"" } onClick={()=>this.changeType(2)}>入库案例
      • +
    • -1 ? "active" :"" } onClick={()=>this.changeType(3)}>企业案例
      • +
    + { + checkTag &&
    请选择标签
    + } +
    + + {getFieldDecorator('description', { + rules: [{ + required: true, message: '请输入描述内容' + }], + })( + + )} + +
    + +

    上传附件

    +

    从我的电脑选择要上传的文档：按住CTRL可以上传多份文档。单个文件最大限制：150MB

    +     + { + checkFile == true &&
    请先上传附件
    + } +
    +

    + 封面图（上传尺寸：120*90 px） +

    +
    + + { imageUrl ? + + avatar + + : + + {uploadButton} + + } + +
    +
    +
    +
  • 审核说明
    • +
      +
    • 平台管理员将对每天新上传的文档进行审核，审核通过的文档将公开显示，否则将私有化或移除
      • +
    +
    +
    +
  • 温馨提示
    • +
      +
    • 1.请勿上传已设置加密口令的文档资源；
      • +
    • 2.可以上传符合教学案例标准的文档资料，如 + 案例入库标准、 + 案例使用说明书以及其他资料等，上传支持的文件最大容量：100MB；
      • +
    • 3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；
      • +
    • 4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；
      • +
    +
    + +
    + { + (!caseID || (CaseDetail && CaseDetail.status == "pending" || CaseDetail && CaseDetail.status == "refused")) ? : "" + } + this.handleSubmit("save")}>保存 +
    +     + +
    + ) + } +} +const WrappedCoursesNewApp = Form.create({name: 'CaseNew'})(CaseNew); export default WrappedCoursesNewApp; \ No newline at end of file diff --git a/public/react/src/modules/moop_cases/CaseTags.js b/public/react/src/modules/moop_cases/CaseTags.js index 4b4f0670c..3d0c93a20 100644 --- a/public/react/src/modules/moop_cases/CaseTags.js +++ b/public/react/src/modules/moop_cases/CaseTags.js @@ -14,7 +14,17 @@ class CaseTags extends Component{ { tags && tags.map((item,key)=>{ return( - {item.name} + + { + item.name == "获奖案例" ? + {item.name} + : + item.name == "入库案例" ? + {item.name} + : + {item.name} + } + ) }) } diff --git a/public/react/src/modules/moop_cases/css/moopCases.css b/public/react/src/modules/moop_cases/css/moopCases.css index 47c98a833..7a58cee61 100644 --- a/public/react/src/modules/moop_cases/css/moopCases.css +++ b/public/react/src/modules/moop_cases/css/moopCases.css @@ -62,6 +62,13 @@ border: 1px solid #4CACFF; line-height: 17px; } +.edu-activity-orange-sub { + background-color: #FF781B; + color: #fff!important; + cursor: pointer; + border: 1px solid #ff6800; + line-height: 17px; +} .pointsBtn { width: 70px; diff --git a/public/react/src/modules/topic_bank/Topic_bank.js b/public/react/src/modules/topic_bank/Topic_bank.js new file mode 100644 index 000000000..f019ab45c --- /dev/null +++ b/public/react/src/modules/topic_bank/Topic_bank.js @@ -0,0 +1,47 @@ +import React, { Component } from 'react'; + +import { Redirect } from 'react-router'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import Loading from '../../Loading' + +import Loadable from 'react-loadable'; +import { TPMIndexHOC } from '../tpm/TPMIndexHOC' +import { SnackbarHOC } from 'educoder' + + +const PackageIndex = Loadable({ + loader: () => import('../user/usersInfo/InfosTopics'), + loading: Loading, +}) + + +class Topic_bank extends Component { + constructor(props) { + super(props) + } + + componentDidMount(){ + } + + render() { + return ( +
    + + + {/*众包首页*/} + + () + } + > + + +
    + ); + } +} + +export default SnackbarHOC() (TPMIndexHOC (Topic_bank)) ; \ No newline at end of file diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index a0178c895..1782cff56 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -481,12 +481,13 @@ export function TPMIndexHOC(WrappedComponent) { } ` } + + + - -
    this.initCommonState(user)} {...this.props} {...this.state} @@ -497,11 +498,12 @@ export function TPMIndexHOC(WrappedComponent) {
    +     - +
    ); } diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js index a011dc1b2..e7e8a1d75 100644 --- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js +++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js @@ -1384,20 +1384,23 @@ export default class TPMsettings extends Component { } onAttachmentRemove = (file) => { - confirm({ - title: '确定要删除这个附件吗?', - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - console.log("665") - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); - return false; + if(file.response!=undefined){ + confirm({ + title: '确定要删除这个附件吗?', + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + console.log("665") + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } + } deleteAttachment = (file) => { diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index fbbc807b5..9a22269f6 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -772,20 +772,23 @@ class Newshixuns extends Component { } onAttachmentRemove = (file) => { - confirm({ - title: '确定要删除这个附件吗?', - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - console.log("665") - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); - return false; + if(file.response!=undefined){ + confirm({ + title: '确定要删除这个附件吗?', + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + console.log("665") + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } + } deleteAttachment = (file) => { console.log(file); @@ -913,7 +916,7 @@ class Newshixuns extends Component { // // console.log('beforeUpload', file.name); // const isLt50M = file.size / 1024 / 1024 < 50; // if (!isLt50M) { - // message.error('文件大小必须小于150MB!'); + // this.props.showNotification('文件大小必须小于150MB!'); // } // return isLt50M; // }, diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js index c888ba6d8..ea9e51694 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js @@ -13,6 +13,7 @@ import axios from 'axios'; import { trace, trace_collapse ,getImageUrl, toPath} from "educoder"; import RepositoryDirectories from './RepositoryDirectories' +import RepositoryAddFile from './RepositoryAddFile' const $ = window.$; // 点击按钮复制功能 @@ -82,10 +83,10 @@ class Repository extends Component { Git使用指南 - + {/* */}
    - - 网址克隆： + { jsCopy() diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js new file mode 100644 index 000000000..79133f34c --- /dev/null +++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js @@ -0,0 +1,52 @@ +import React, { Component } from 'react'; +import { ActionBtn } from 'educoder' + +import { Form , Modal } from 'antd' + +class RepositoryAddFile extends Component { + constructor(props) { + super(props); + this.state={ + visible:false + } + } + + addFile = () =>{ + this.setState({ + visible:true + }) + } + cancelAdd = () =>{ + this.setState({ + visible:false + }) + } + render(){ + let { visible } = this.state + return( + + +添加文件 + +
    + +
    +
    + 取消 + 提交 +
    + + + ) + } +} +const WrappedRepositoryAddFile = Form.create({name: 'taskRepositoryAddFile'})(RepositoryAddFile); +// RouteHOC() +export default (WrappedRepositoryAddFile); \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index cf2c1eaa0..439bb3843 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -34,7 +34,6 @@ class InfosTopics extends Component{ let types=this.props.match.params.topicstype; let professional_certification=this.props.current_user&&this.props.current_user.professional_certification; - console.log(professional_certification) if(professional_certification===false&&types==="publicly"){ this.setState({ isshowprofes:true @@ -43,6 +42,22 @@ class InfosTopics extends Component{ this.updataslist() } } + componentDidUpdate(prevProps) { + + if(prevProps.current_user!=this.props.current_user){ + let types=this.props.match.params.topicstype; + let professional_certification=this.props.current_user&&this.props.current_user.professional_certification; + + console.log(professional_certification) + if(professional_certification===false&&types==="publicly"){ + this.setState({ + isshowprofes:true + }) + }else{ + this.updataslist() + } + } + } updataslist=()=>{ let types=this.props.match.params.topicstype; let { category,course_list_id,sort_by,sort_direction,page}=this.state; @@ -55,7 +70,7 @@ class InfosTopics extends Component{ let url=`/users/${user_id}/question_banks.json`; axios.get(url,{params:{ type, - category, + object_type:category, course_list_id, sort_by, sort_direction, @@ -143,15 +158,17 @@ class InfosTopics extends Component{ deletecheckBoxValues=()=>{ let {checkBoxValues}=this.state; + if(checkBoxValues.length===0){ this.props.showNotification("请选择题库") + }else{ + this.setState({ + Modalstype:true, + Modalstopval:"是否确认删除？", + ModalCancel:this.topicscancelmodel, + ModalSave:this.topicssavedelete, + }) } - this.setState({ - Modalstype:true, - Modalstopval:"是否确认删除？", - ModalCancel:this.topicscancelmodel, - ModalSave:this.topicssavedelete, - }) } topicssavedelete=()=>{ @@ -258,14 +275,15 @@ class InfosTopics extends Component{ ] let types=this.props.match.params.topicstype; + let username=this.props.match.params.username; - console.log(isshowprofes) //types===publicly 公共 //types===personal 私有 let user_id=this.props.current_user&&this.props.current_user.user_id; let user_type=this.props.current_user&&this.props.current_user.user_identity; let targetuserid=this.props.data&&this.props.data.id; + const menu = ( this.updatedlist("updated_at")}> @@ -280,9 +298,17 @@ class InfosTopics extends Component{ ); return( -
    +
    {/*提示*/} - + {Modalstype&&Modalstype===true? {types==="publicly"?
    个人题库 + href={`/users/${username}/topics/personal`}>个人题库 公共题库
    :
    我的题库 + >我的题库 公共题库
    } - - {isshowprofes===false?
    @@ -423,7 +446,7 @@ class InfosTopics extends Component{ {isshowprofes===true?"":data===undefined?:data.question_banks===undefined||data.question_banks.length===0?: - + {data.question_banks.map((item,key)=>{ return(
    @@ -432,7 +455,17 @@ class InfosTopics extends Component{
    {user_type!="学生"?:""} - + + + {item.name} @@ -455,12 +488,12 @@ class InfosTopics extends Component{
    {types==="personal"?user_id===targetuserid&&user_type!="学生"? 编辑 :"":""} diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index 6af94a58d..47c4c47cf 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -7,12 +7,10 @@ import { SnackbarHOC } from 'educoder'; import { TPMIndexHOC } from '../../../tpm/TPMIndexHOC'; import { CNotificationHOC } from '../../../courses/common/CNotificationHOC' - import "../usersInfo.css" import "../../../courses/css/members.css" import "../../../courses/css/Courses.css" - import Loadable from 'react-loadable'; import Loading from '../../../../Loading'; @@ -33,6 +31,37 @@ const GtopicBanksEdit = Loadable({ const HomeworkBanksEdit = Loadable({ loader: () => import('./HomeworkBanksEdit'), loading: Loading, +}); + +//普通作业题库详情 +const Generaljobbankdetails =Loadable({ + loader: () => import('../../../courses/questionbank/Generaljobbankdetails'), + loading: Loading, +}); +//分组作业题库详情 +const GroupjobbankPage =Loadable({ + loader: () => import('../../../courses/groupjobbank/GroupjobbankPage'), + loading: Loading, +}); +//毕设选题详情 +const CompletetopicdePage =Loadable({ + loader: () => import('../../../courses/comtopicdetails/CompletetopicdePage'), + loading: Loading, +}); +//毕设任务详情 +const Completetaskpage =Loadable({ + loader: () => import('../../../courses/completetaskdetails/Completetaskpage'), + loading: Loading, +}); +//问卷编辑 +const PollNewQuestbank =Loadable({ + loader: () => import('../../../courses/poll/PollNewQuestbank'), + loading: Loading, +}); + +const GtaskBanksEdit = Loadable({ + loader: () => import('./GtaskBanksEdit'), + loading: Loading, }) class BanksIndex extends Component{ @@ -59,7 +88,7 @@ class BanksIndex extends Component{
    { crumbData && - + 题库 { crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{ @@ -70,27 +99,36 @@ class BanksIndex extends Component{ } } - -

    + + { + crumbData &&

    {crumbData && crumbData.title} - { - crumbData && {crumbData.is_public == true ? '公开':'私有'} - } -

    + {crumbData.is_public == true ? '公开':'私有'} + +

    } - { + return () + } + }> + + { - return () } }> - { - return () } @@ -103,18 +141,47 @@ class BanksIndex extends Component{ } }> - { - return () - } - }> - () + } + > + + + { return () } }> + + {/*毕设任务题库详情*/} + () + } + > + {/*毕设内容题库详情*/} + () + } + > + {/*分组作业题库详情*/} + () + } + > + {/* 普通作业题库详情*/} + () + } + > +
    @@ -122,4 +189,13 @@ class BanksIndex extends Component{ ) } } -export default CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(BanksIndex) )); \ No newline at end of file +export default CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(BanksIndex) )); + + + +// { +// return () +// } +// }> \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js new file mode 100644 index 000000000..b3145f00f --- /dev/null +++ b/public/react/src/modules/user/usersInfo/banks/GtaskBanksEdit.js @@ -0,0 +1,99 @@ +import React, { Component } from 'react'; +import axios from 'axios' +import NewGtaskForm from './NewGtaskForm'; +import NewWorkForm from "./HomeworkBanksEdit"; + +class GtaskBanksEdit extends Component { + constructor(props){ + super(props); + this.state = { + isPublic: undefined, + isGroup: false + } + } + componentDidMount = () =>{ + let workId = this.props.match.params.workId; + this.initData(workId); + } + + initData = (workId) =>{ + + let url = `/task_banks/${workId}.json`; + axios.get(url).then((result)=>{ + if(result){ + const crumbData={ + title:'编辑', + is_public:result && result.data && result.data.is_public, + crumbArray:[ + {to:`/banks/gtask/${workId}/edit`,content:'详情'}, + {content:'编辑'} + ] + } + this.props.initPublic(crumbData); + result.data.isEdit = true; + this.setState({ data:result.data}) + this.newWorkFormRef.initValue(result.data); + } + }).catch((error)=>{ + console.log(error) + }) + } + + + doNew = () => { + } + doEdit = (params) => { + const workId = this.props.match.params.workId + const newUrl = `/homework_banks/${workId}.json` + + // const isGroup = this.props.isGroup() + axios.put(newUrl, params) + .then((response) => { + if (response.data.status == 0) { + this.props.showNotification('保存成功') + this.toWorkDetail() + } + }) + .catch(function (error) { + console.log(error); + }); + } + toWorkDetail = () => { + this.props.history.push(`/banks/gtask/${this.props.match.params.workId}`); + this.props.initPublic(undefined); + } + onCancel = () => { + this.toWorkDetail() + } + isGroup = () => { + return this.state.isGroup; + } + render(){ + + const common = { + onCancel:this.onCancel, + isGroup: this.isGroup, + doNew: this.doNew, + doEdit: this.doEdit, + } + return( +
    + + this.newWorkFormRef = ref} + topicId={this.props.match.params.workId} + > +
    + ) + } +} +export default GtaskBanksEdit; \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js index ea7563893..ade1b3361 100644 --- a/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js @@ -22,7 +22,7 @@ class GtopicBanksEdit extends Component{ if(result){ const crumbData={ title:'编辑', - is_public:result && result.selected_data && result.selected_data.is_public, + is_public:result && result.data.selected_data && result.data.selected_data.is_public, crumbArray:[ {to:`/banks/gtopic/${bankId}/edit`,content:'详情'}, {content:'编辑'} @@ -57,6 +57,7 @@ class GtopicBanksEdit extends Component{ // 取消 editCancel = () =>{ this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}`); + this.props.initPublic(undefined); } render(){ diff --git a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js index 42a402266..149c631e9 100644 --- a/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js +++ b/public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js @@ -64,7 +64,8 @@ class HomeworkBanksEdit extends Component { return this.props.isGroup ? 'group' : 'normal' } toWorkDetail = () => { - this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}`) + this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}?tab=0`) + this.props.initPublic(undefined); } onCancel = () => { this.toWorkDetail() diff --git a/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js new file mode 100644 index 000000000..78f2c1d7d --- /dev/null +++ b/public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js @@ -0,0 +1,358 @@ +import React,{ Component } from "react"; +import { Input, InputNumber, Form, Button, Checkbox, Upload, Icon, message, Modal } from "antd"; +import axios from 'axios' +import { WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder' +import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor'; + + +const MAX_TITLE_LENGTH = 60; +class NewGtaskForms extends Component{ + constructor(props){ + super(props); + this.contentMdRef = React.createRef(); + this.state={ + title_num:0, + description:"", + contentFileList: [], + } + } + + + initValue = (data) => { + if (data.isEdit) { + const contentFileList = data.attachments.map(item => { + return { + id: item.id, + uid: item.id, + name: appendFileSizeToUploadFile(item), + url: item.url, + filesize: item.filesize, + status: 'done' + } + }) + this.setState({ + ...data, + base_on_project: data.group_info.base_on_project, + title_num: parseInt(data.name.length), + min_num: data.group_info.min_number, + max_num: data.group_info.max_number, + contentFileList, + }, () => { + setTimeout(() => { + this.contentMdRef.current.setValue(data.description || '') + }, 2000) + + this.props.form.setFieldsValue({ + title: data.name, + description: data.description || '', + }); + + }) + } else { // new + + } + } + + + // 输入title + changeTitle=(e)=>{ + console.log(e.target.value.length); + this.setState({ + title_num: parseInt(e.target.value.length) + }) + } + handleContentUploadChange = (info) => { + let contentFileList = info.fileList; + this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) }); + } + deleteAttachment = (file, stateName) => { + // 初次上传不能直接取uid + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state[stateName].indexOf(file); + const newFileList = state[stateName].slice(); + newFileList.splice(index, 1); + return { + [stateName]: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + + onAttachmentRemove = (file, stateName) => { + if(file.response!=undefined){ + this.props.confirm({ + content: '是否确认删除?', + + onOk: () => { + this.deleteAttachment(file, stateName) + }, + onCancel() { + console.log('Cancel'); + }, + }); + return false; + } + + } + + handleSubmit = () => { + + let {contentFileList,min_num,max_num,base_on_project}=this.state; + let {data}=this.props; + let task_type=data.task_type + let topicId=this.props.topicId + this.props.form.validateFieldsAndScroll((err, values) => { + + const mdContnet = this.contentMdRef.current.getValue().trim(); + + values.description = mdContnet; + + if (!err) { + if (this.state.isEdit) { + let url="/task_banks/"+topicId+".json"; + axios.put(url, { + gtask_bank: { + name: values.title, + description: values.description, + min_num:task_type===1?undefined:min_num, + max_num:task_type===1?undefined:max_num, + base_on_project: task_type===1?undefined:base_on_project===true?1:0 + }, + attachment_ids:contentFileList + } + ).then((response) => { + if(response.data.status===0){ + this.props.showNotification(response.data.message) + }else{ + this.props.showNotification(response.data.message) + } + }).catch((error) => { + console.log(error) + }) + + } else { + + } + + } else { + $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) + } + }) + } + + max_num_change = (val) => { + if (val < 2) { + this.setState({ + max_num: 2, + }) + return; + } + const { min_num } = this.state; + this.setState({ + max_num: val, + min_num: val <= min_num ? val - 1 : min_num + }) + } + + min_num_change = (val) => { + this.setState({ min_num: val }) + } + + base_on_project_change = () => { + this.setState({ base_on_project: !this.state.base_on_project }) + } + + render(){ + const { getFieldDecorator } = this.props.form; + let{ + title_value, contentFileList, answerFileList, max_num, min_num, base_on_project, + init_max_num, init_min_num, + title_num, course_name, category, has_commit, has_project, + isEdit + }=this.state + const uploadProps = { + width: 600, + fileList: contentFileList, + multiple: true, + // https://github.com/ant-design/ant-design/issues/15505 + // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 + // showUploadList: false, + action: `${getUrl()}/api/attachments.json`, + onChange: this.handleContentUploadChange, + onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'), + beforeUpload: (file) => { + console.log('beforeUpload', file.name); + const isLt150M = file.size / 1024 / 1024 < 150; + if (!isLt150M) { + message.error('文件大小必须小于150MB!'); + } + return isLt150M; + }, + }; + + + return( +
    + +
    +
    +
    + {this.props.data&&this.props.data.task_type===1?"普通作业":this.props.data&&this.props.data.task_type===2?"分组作业":""} +
    +
    + + {getFieldDecorator('title', { + rules: [{ + required: true, message: '请输入标题' + }], + })( + + )} + + + + + + { + {getFieldDecorator('description', { + rules: [{ + required: true, message: '请输入任务内容说明' + }], + })( + + )} + } + + + (单个文件150M以内) + + {this.props.data&&this.props.data.task_type===2? + + {getFieldDecorator('personNum', { + rules: [{ + required: false + // required: true, message: '请输入最小人数和最大人数' + }], + })( +
    +

    + + {/* max={has_commit ? init_min_num : null } */} + 每组最小人数： 人 + + + + {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) } */} + + 每组最大人数： 人 + +

    学生提交作品时需要关联同组成员，组内成员作品共享
    +

    +

    + + 基于项目（选中，则必须在本平台创建项目，项目管理员可以提交作品；不选中，无需在平台创建项目，任意小组成员均可以提交作品） + +

    +
    + )} +     :"" + } + +
    + {/* htmlType="submit" */} + + this.props.onCancel()}>取消 +
    +     + +
    + ) + } +} + + +const NewGtaskForm = Form.create({ name: 'NewGtaskForm' })(NewGtaskForms); +export default NewGtaskForm; \ No newline at end of file diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index c66453b4c..1cceab275 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -170,7 +170,7 @@ input::-ms-clear{display:none;} .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;} .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/ .newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;}/*padding-bottom根据底部的高度而定*/ -.newMain{ padding-bottom: 120px !important; } +.newMain{ padding-bottom: 124px !important; } /*高度*/ .height-100{height: 100%;}