调整

Gemfile.lock

@@ -378,6 +378,7 @@ DEPENDENCIES
   kaminari (~> 1.1, >= 1.1.1)
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
+  newrelic_rpm
   oauth2
   pdfkit
   puma (~> 3.11)

app/assets/javascripts/admins/schools/index.js

@@ -0,0 +1,4 @@
+$(document).on('turbolinks:load', function() {
+  if ($('body.admins-schools-index-page').length > 0) {
+  }
+});

app/assets/stylesheets/admins/schools.scss

@@ -0,0 +1,3 @@
+.admins-schools-index-page {
+
+}

app/controllers/admins/schools_controller.rb

@@ -0,0 +1,30 @@
+class Admins::SchoolsController < Admins::BaseController
+  def index
+    params[:sort_by] ||= 'created_at'
+    params[:sort_direction] ||= 'desc'
+
+    schools = Admins::SchoolQuery.call(params)
+
+    @schools = paginate schools
+
+    school_ids = @schools.map(&:id)
+    @department_count = Department.where(school_id: school_ids).group(:school_id).count
+  end
+
+  def destroy
+    users = User.joins(:user_extension).where(user_extensions: { school_id: current_school.id })
+
+    ActiveRecord::Base.transaction do
+      users.update_all(profile_completed: false)
+      current_school.destroy!
+    end
+
+    render_delete_success
+  end
+
+  private
+
+  def current_school
+    @_current_school ||= School.find(params[:id])
+  end
+end

app/controllers/application_controller.rb

@@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base
 	#before_action :check_account
 
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
+	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
 	helper_method :current_user
 
@@ -246,6 +247,16 @@ class ApplicationController < ActionController::Base
 		User.current = find_current_user
 		uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
 
+		# 开放课程通过链接访问的用户
+		if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
+			content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
+			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
+				user = User.open_class_user
+				start_user_session(user) if user
+				User.current = user
+			end
+		end
+
 		if !User.current.logged? && Rails.env.development?
 			User.current = User.find 1
 		end

app/controllers/ecs/graduation_course_supports_controller.rb

@@ -3,6 +3,7 @@ class Ecs::GraduationCourseSupportsController < Ecs::BaseController
 
   def show
     @graduation_subitems = current_year.ec_graduation_subitems
+                             .reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC')
                              .includes(:ec_graduation_requirement, ec_course_supports: :ec_course)
     @course_count = current_year.ec_courses.count
 

app/controllers/ecs/graduation_subitems_controller.rb

@@ -0,0 +1,6 @@
+class Ecs::GraduationSubitemsController < Ecs::BaseController
+  def index
+    subitems = current_year.ec_graduation_subitems.reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC')
+    @graduation_subitems = subitems.includes(:ec_graduation_requirement)
+  end
+end

app/controllers/student_works_controller.rb

@@ -321,11 +321,12 @@ class StudentWorksController < ApplicationController
 
     ActiveRecord::Base.transaction do
       begin
-        revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
-        if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
-                                                                         and score is not null").count == 0
-          revise_attachment.destroy
-        end
+        # 补交作业附件不覆盖之前上传的附件
+        # revise_attachment = @work.attachments.where(attachtype: 7).reorder("created_on desc").last
+        # if revise_attachment.present? && @work.student_works_scores.where("created_at > '#{revise_attachment.created_on}'
+        #                                                                  and score is not null").count == 0
+        #   revise_attachment.destroy
+        # end
         Attachment.associate_container(params[:attachment_ids], @work.id, @work.class, 7)
         revise_attachment = Attachment.where(attachtype: 7, container_id: @work.id, container_type: "StudentWork").last
         revise_attachment.update_attributes(description: params[:description]) if revise_attachment.present?

app/decorators/tiding_decorator.rb

@@ -81,7 +81,7 @@ module TidingDecorator
   end
 
   def student_join_course_content
-    I18n.t(locale_format) % Course.find_by(id: container_id)&.name
+    I18n.t(locale_format) % [trigger_user.show_real_name, Course.find_by(id: container_id)&.name]
   end
 
   def teacher_join_course_content

app/jobs/apply_teacher_role_join_course_notify_job.rb

@@ -8,7 +8,7 @@ class ApplyTeacherRoleJoinCourseNotifyJob < ApplicationJob
     return if user.blank? || course.blank?
 
     attrs = %i[user_id trigger_user_id container_id container_type belong_container_id
-              belong_container_type tiding_type extra created_at updated_at]
+              belong_container_type tiding_type status extra created_at updated_at]
 
     same_attrs = {
       trigger_user_id: user.id, container_id: course.id, container_type: 'JoinCourse', status: 0,

app/libs/util/file_manage.rb

@@ -18,10 +18,18 @@ module Util::FileManage
     File.exist?(disk_filename(source_type, source_id))
   end
 
+  def exists?(source)
+    File.exist?(disk_filename(source.class, source.id))
+  end
+
   def disk_file_url(source_type, source_id)
     File.join('/images', relative_path, "#{source_type}", "#{source_id}")
   end
 
+  def source_disk_file_url(source)
+    File.join('/images', relative_path, "#{source.class}", "#{source.id}")
+  end
+
   def disk_auth_filename(source_type, source_id, type)
     File.join(storage_path, "#{source_type}", "#{source_id}#{type}")
   end

app/models/course_message.rb

@@ -32,6 +32,6 @@ class CourseMessage < ApplicationRecord
       belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status
     )
     # 将申请消息置为已处理
-    Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)
+    Tiding.where(trigger_user_id: course_message_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)
   end
 end

app/models/department.rb

@@ -5,7 +5,7 @@ class Department < ApplicationRecord
   has_many :member_users, through: :department_members, source: :user
 
   has_many :user_extensions, dependent: :nullify
-  has_many :apply_add_departments
+  has_many :apply_add_departments, dependent: :destroy
 
   scope :without_deleted, -> { where(is_delete: false) }
 

app/models/school.rb

@@ -17,6 +17,7 @@ class School < ApplicationRecord
   has_many :partners, dependent: :destroy
 
   has_many :apply_add_departments, dependent: :destroy
+  has_many :user_extensions, dependent: :nullify
 
   # 学校管理员
   def manager?(user)

app/models/student_graduation_topic.rb

@@ -21,7 +21,7 @@ class StudentGraduationTopic < ApplicationRecord
 
   def send_tiding
     self.tidings << Tiding.new(:user_id => self.graduation_topic.tea_id, :trigger_user_id => self.user_id, :parent_container_id => self.graduation_topic_id, :parent_container_type => "GraduationTopic",
-                               :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "GraduationTopic")
+                               :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "Apply")
   end
 
   # 学生名称

app/models/user.rb

@@ -610,6 +610,29 @@ class User < ApplicationRecord
     admin? || business?
   end
 
+  # 149课程的评审用户数据创建（包含创建课堂学生）
+  def open_class_user
+    user = User.find_by(login: "OpenClassUser")
+    unless user
+      ActiveRecord::Base.transaction do
+        user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+                       nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+                       password: "12345678", phone: "11122223333", profile_completed: 1}
+        user = User.create!(user_params)
+
+        UserExtension.create!(user_id: user.id, gender: 0, school_id: 117, :identity => 1, :student_id => "openclassuser")
+
+        subject = Subject.find_by(id: 149)
+        if subject
+          subject.courses.each do |course|
+            CourseMember.create!(course_id: course.id, role: 4, user_id: user.id) if !course.course_students.exists?(user_id: user.id)
+          end
+        end
+      end
+    end
+    user
+  end
+
   protected
   def validate_password_length
     # 管理员的初始密码是5位

app/models/user_extension.rb

@@ -1,6 +1,6 @@
 class UserExtension < ApplicationRecord
   # identity 0: 教师教授 1: 学生, 2: 专业人士, 3: 开发者
-  enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, cnmooc: 4, unselect: -1 }
+  enum identity: { teacher: 0, student: 1, professional: 2, developer: 3, enterprise: 4, unselect: -1 }
 
   belongs_to :user, touch: true
   belongs_to :school, optional: true

app/queries/admins/school_query.rb

@@ -0,0 +1,23 @@
+class Admins::SchoolQuery < ApplicationQuery
+  include CustomSortable
+
+  attr_reader :params
+
+  sort_columns :users_count, :created_at, default_by: :created_at, default_direction: :desc
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    schools = School.all
+
+    keyword = strip_param(:keyword)
+    schools = schools.where('schools.name LIKE ?', "%#{keyword}%") if keyword
+
+    schools = schools.joins(:user_extensions).group(:id)
+    schools = schools.select('schools.*, COUNT(*) AS users_count')
+
+    custom_sort schools, params[:sort_by], params[:sort_direction]
+  end
+end

app/views/admins/schools/index.html.erb

@@ -0,0 +1,16 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('单位列表') %>
+<% end %>
+
+<div class="box search-form-container school-list-form">
+  <%= form_tag(admins_schools_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '部门名称检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+  <% end %>
+
+  <%#= javascript_void_link '新建单位', class: 'btn btn-primary', data: { toggle: 'modal', target: '.admin-create-school-modal' } %>
+</div>
+
+<div class="box school-list-container">
+  <%= render partial: 'admins/schools/shared/list', locals: { schools: @schools } %>
+</div>

app/views/admins/schools/index.js.erb

@@ -0,0 +1 @@
+$('.school-list-container').html("<%= j(render partial: 'admins/schools/shared/list', locals: { schools: @schools }) %>");

app/views/admins/schools/shared/_list.html.erb

@@ -0,0 +1,48 @@
+<table class="table table-hover text-center school-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="6%">ID</th>
+    <th width="6%">LOGO</th>
+    <th width="8%">标识码</th>
+    <th width="14%" class="text-left">单位名称</th>
+    <th width="6%">地区</th>
+    <th width="6%">城市</th>
+    <th width="16%">详细地址</th>
+    <th width="6%"><%= sort_tag('用户数', name: 'users_count', path: admins_schools_path) %></th>
+    <th width="6%">部门数</th>
+    <th width="12%"><%= sort_tag('创建时间', name: 'created_at', path: admins_schools_path) %></th>
+    <th width="14%">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if schools.present? %>
+    <% schools.each do |school| %>
+      <tr class="school-item-<%= school.id %>">
+        <td><%= school.id %></td>
+        <td>
+          <% if Util::FileManage.exists?(school) %>
+            <%= image_tag(Util::FileManage.source_disk_file_url(school).to_s + "?#{Time.now.to_i}", width: 40, height: 40, class: 'preview-image') %>
+          <% else %>
+            <%= content_tag(:span, '--', class: 'text-secondary') %>
+          <% end %>
+        </td>
+        <td><%= display_text school.identifier %></td>
+        <td class="text-left"><%= school.name %></td>
+        <td><%= school.province %></td>
+        <td><%= school.city %></td>
+        <td class="text-left"><%= school.address %></td>
+        <td><%= school.users_count %></td>
+        <td><%= @department_count.fetch(school.id, 0) %></td>
+        <td><%= school.created_at&.strftime('%Y-%m-%d %H:%M') %></td>
+        <td>
+          <%= delete_link '删除', admins_school_path(school, element: ".school-item-#{school.id}"), class: 'delete-school-action' %>
+        </td>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: schools } %>

app/views/admins/shared/_sidebar.html.erb

@@ -31,6 +31,7 @@
 
     <li>
       <%= sidebar_item_group('#schools-submenu', '单位管理', icon: 'building') do %>
+        <li><%= sidebar_item(admins_schools_path, '单位列表', icon: 'university', controller: 'admins-schools') %></li>
         <li><%= sidebar_item(admins_departments_path, '部门列表', icon: 'sitemap', controller: 'admins-departments') %></li>
       <% end %>
     </li>

app/views/admins/users/index.html.erb

@@ -12,7 +12,7 @@
 
     <div class="form-group mr-2">
       <label for="identity">职业：</label>
-      <% identity_options = [['全部', '']] + UserExtension.identities.map { |k, v| [I18n.t("user.identity.#{k}"), v] } %>
+      <% identity_options = [['全部', ''], ['教师', 0], ['学生', 1], ['专业人士', 2]] %>
       <%= select_tag(:identity, options_for_select(identity_options), class: 'form-control') %>
     </div>
 

app/views/ecs/graduation_course_supports/shared/_ec_graduation_subitem.json.jbuilder

@@ -2,5 +2,5 @@ json.extract! ec_graduation_subitem, :id, :position, :content, :ec_graduation_re
 
 json.graduation_requirement_position ec_graduation_subitem.ec_graduation_requirement.position
 
-json.course_supports ec_graduation_subitem.ec_course_supports, partial: 'ec_course_support', as: :ec_course_support
+json.course_supports ec_graduation_subitem.ec_course_supports, partial: 'ecs/graduation_course_supports/shared/ec_course_support', as: :ec_course_support
 json.weights_total ec_graduation_subitem.ec_course_supports.to_a.sum(&:weights)

app/views/ecs/graduation_subitems/index.json.jbuilder

@@ -0,0 +1,8 @@
+json.graduation_subitems do
+  json.array! @graduation_subitems do |graduation_subitem|
+    json.extract! graduation_subitem, :id, :position, :content
+    json.graduation_requirement_position graduation_subitem.ec_graduation_requirement.position
+  end
+end
+
+json.count @graduation_subitems.size

app/views/tidings/_tiding.json.jbuilder

@@ -18,9 +18,7 @@ json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 
 # 需要系统头像
-show_system_user = tiding.trigger_user_id.zero? ||
-  (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System') ||
-  tiding.anonymous?
+show_system_user = tiding.trigger_user_id.zero? || tiding.tiding_type == 'System' || tiding.anonymous?
 
 json.trigger_user do
   if show_system_user

config/locales/tidings/zh-CN.yml

@@ -19,7 +19,7 @@
       "9_2_end": "你提交的加入课堂申请：%s（教师）, 审核未通过"
       "7_1_end": "你提交的加入课堂申请：%s（助教）, 审核已通过"
       "7_2_end": "你提交的加入课堂申请：%s（助教）, 审核未通过"
-    StudentJoinCourse_end: "加入了课堂：%s（学生）"
+    StudentJoinCourse_end: "%s 加入了课堂：%s（学生）"
     TeacherJoinCourse:
       "2_end": "%s将你加入课堂：%s（教师）"
       "3_end": "%s将你加入课堂：%s（助教）"

config/locales/users/zh-CN.yml

@@ -13,7 +13,9 @@
       professional: 专业人士
       developer: 从业者
       enterprise: 组织
+      unselect: 未选择
       "0": 教师
       "1": 学生
       "2": 专业人士
-      "3": 专业人士
+      "3": 从业者
+      "4": 组织

config/routes.rb

@@ -737,6 +737,7 @@ Rails.application.routes.draw do
         resource :graduation_course_supports, only: [:show, :create]
         resource :reach_evaluation, only: [:show, :create]
         resource :reach_criteria, only: [:create]
+        resources :graduation_subitems, only: [:index]
       end
 
       resources :ec_courses, only: [] do
@@ -927,6 +928,7 @@ Rails.application.routes.draw do
       resources :mirror_scripts, only: [:index, :new, :create, :edit, :update, :destroy]
     end
     resources :choose_mirror_repositories, only: [:new, :create]
+    resources :schools, only: [:index, :destroy]
     resources :departments, only: [:index, :create, :edit, :update, :destroy] do
       resource :department_member, only: [:create, :update, :destroy]
       post :merge, on: :collection

public/react/config/webpack.config.prod.js

@@ -1,5 +1,5 @@
 'use strict';
-
+// extract-css-assets-webpack-plugin
 const autoprefixer = require('autoprefixer');
 const path = require('path');
 const webpack = require('webpack');

public/react/src/common/educoder.js

@@ -63,7 +63,7 @@ export { default as Clappr } from './components/media/Clappr'
 export { default as AliyunUploader } from './components/media/AliyunUploader'
 
 
-export { default as ImageLayerHook } from './hooks/ImageLayerHook'
+export { default as ImageLayer2 } from './hooks/ImageLayer2'
 
 // 外部
 export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'

public/react/src/common/hooks/ImageLayer2.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect, memo } from 'react';
 import ImageLayer from '../../modules/page/layers/ImageLayer';
 import { isImageExtension } from 'educoder';
 const $ = window.$;
-function ImageLayerHook(props) {
+function ImageLayer2(props) {
     const [showImage, setShowImage] = useState(false)
     const [imageSrc, setImageSrc] = useState('')
 
@@ -45,4 +45,4 @@ function ImageLayerHook(props) {
     )
 }
 
-export default memo(ImageLayerHook)
+export default memo(ImageLayer2)

public/react/src/common/util/ShareUtil.js

@@ -16,7 +16,10 @@ const urlDoneMap = {}
 function requestForSignatrue (callback) {
     const currentUrl = window.location.href.split('#')[0]
 
-    if (window.wx && !urlDoneMap[currentUrl]) {
+    if (window.wx) {
+        if (urlDoneMap[currentUrl]) {
+            callback && callback()
+        } else {
             const wx = window.wx
             const url = '/wechats/js_sdk_signature.json'
             urlDoneMap[currentUrl] = true
@@ -53,6 +56,7 @@ function requestForSignatrue (callback) {
             })
         }
     }
+}
 /**
     实践课程	平台提供涵盖基础入门、案例实践和创新应用的完整实训项目体系，通过由浅入深的实训路径，帮助学生快速提升实战能力。
     实训项目	覆盖不同专业的IT实验和实训，每周更新，无需配置本机实验环境，随时随地开启企业级真实实训。
@@ -115,14 +119,14 @@ export function configShareForCourses () {
 }
 
 // detail
-export function configShareForCustom (title, desc, path, imgUrl) {
+export function configShareForCustom (title, desc, imgUrl, path) {
     requestForSignatrue(() => {
         console.log('configShareForCustom', host)
-
+        const _url = window.location.href.split('#')[0];
         var shareData = {
             title: title,
             desc: desc,
-            link: `${host}/${path}`,
+            link: path ? `${host}/${path}` : _url,
             imgUrl: imgUrl || window.__testImageUrl 
                 || host + '/react/build/images/share_logo_icon.jpg'
         };

public/react/src/modules/comment/CommentInput.js

@@ -68,7 +68,7 @@ class CommentInput extends Component {
                             </textarea>
                         </div>
                         <div className="tips"
-                            style={{ 'float': 'left', 'margin-top': '6px', 'font-size': '12px', 'color': '#ff6800'}}>
+                            style={{ 'float': 'left', 'marginTop': '6px', 'fontSize': '12px', 'color': '#ff6800'}}>
                             请勿粘贴答案，否则将造成账号禁用等后果！
                         </div>
                         <div className="fr buttons" style={{ minWidth:'25px', height: '32px' }}>

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, MarkdownToHtml, markdownToHTML } from 'educoder';
+import { WordsBtn, MarkdownToHtml, markdownToHTML, ImageLayer2 } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
@@ -197,6 +197,7 @@ class CommonWorkAppraise extends Component{
               border-bottom: none !important; 
             }
           `}</style>
+          <ImageLayer2 parentSel=".workAppraise" childSel="a.imageTarget"></ImageLayer2>
           <div className={"workAppraise"}>
           {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
             <div className={"color-grey-6 mb15 font-16"}>
@@ -247,7 +248,9 @@ class CommonWorkAppraise extends Component{
 
           </div> }
 
-          <CommonWorkAppraiseReviseAttachments {...this.state}></CommonWorkAppraiseReviseAttachments>
+          <CommonWorkAppraiseReviseAttachments {...this.state}
+            onAttachmentRemove={this.onAttachmentRemove}
+          ></CommonWorkAppraiseReviseAttachments>
 
             {is_evaluation != true && project_info && project_info.name && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
               <div className={"color-grey-6 mb10"}>

public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js

@@ -33,7 +33,7 @@ function CommonWorkAppraiseReviseAttachments(props) {
                     {item.title}
                 </a>
                 <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.props.onAttachmentRemove(item.id)}></i>:""}
                 </div>
             )
             })}

public/react/src/modules/courses/busyWork/NewWorkForm.js

@@ -73,7 +73,6 @@ class NewWorkForm extends Component{
           setTimeout(() => {
             this.contentMdRef.current.setValue(data.description || '')
             this.answerMdRef.current.setValue(data.reference_answer || '')
-          
           }, 2000)
           
           this.props.form.setFieldsValue({
@@ -86,8 +85,13 @@ class NewWorkForm extends Component{
       } else { // new
 
       }
+    this._scrollToTop()
+  }
+  _scrollToTop = () => {
+    setTimeout(() => {
+      $("html").animate({ scrollTop: 0 })
+    }, 1500)
   }
-  
 
   // 输入title
   changeTitle=(e)=>{
@@ -289,6 +293,7 @@ class NewWorkForm extends Component{
   }
   componentDidMount() {
     window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required')
+    this._scrollToTop()
   }
   
   render(){

public/react/src/modules/courses/coursesPublic/CoursesMarkdown.js

@@ -141,7 +141,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
       $("#" + _id + " [type=\"inline\"]").bind("click", function () {
         _editorName.cm.replaceSelection("`$$$$`");
         var __Cursor = _editorName.cm.getDoc().getCursor();
-        _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+        _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
         _editorName.cm.focus();
       });
       $("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -78,7 +78,7 @@ class NewShixunModel extends Component{
 						{item.map((list,key)=>{
 							return(
 								<Menu.Item key={key} id={list.id}>
-										<a target="_blank" href={`/paths/${list.id}`} className={"newshixun500"} title={list.name}>{list.name}</a>
+										<a target="_blank" href={`/paths/${list.id}`} className={"newshixun500"}>{list.name}</a>
 								</Menu.Item>
 								)
 						})}
@@ -340,26 +340,45 @@ class NewShixunModel extends Component{
 						`body{  overflow: hidden !important; }
 					   .ant-drawer-content{ overflow:auto !important; background: #f5f5f5; }
 					   .yslbottomsj{position: absolute;bottom: -8px;}
+					   .ant-drawer-close{
+					     font-size:24px !important;
+					   }
+					   .ant-drawer-body {
+								padding:15px 24px 24px 0px;
+					  	}
 					  `
 					}
 				</style>
 
 				<Drawer
 					placement="bottom"
-					closable={false}
+					closable={true}
 					destroyOnClose={true}
+					onClose={()=>this.props.hideNewShixunModelType()}
 					visible={this.props.NewShixunModelType}
 					height={'100%'}
 				>
 					<Spin spinning={this.state.isspinning}>
-					<div className={"clearfix educontent pr"}>
+					<div className={"clearfix educontent pr mb60shixun"}>
 
 						<div className={"square-list clearfix"}>
 
 							<div className="newshixunheadersear">
 								<div style={{height:"53px"}}></div>
+								<style>
+									{
+										`
+										.ant-input, .ant-input .ant-input-suffix{
+   											background-color: #fff !important;
+										}
+										.packinput .ant-input{
+   											border: 1px solid rgba(217,217,217,1) !important;
+										}
+										`
+									}
+								</style>
 								<Search
-									style={{ width: "800px"}}
+									style={{ width: "780px"}}
 									className="packinput"
 									placeholder="实训信息 / 院校名称 / 创建者"
 									value={this.state.keyword}
@@ -378,8 +397,8 @@ class NewShixunModel extends Component{
 									<span className="fl color-grey-9 pointer mr30">
 										<a className={" color-grey-6"} onClick={()=>this.updatedlist(order)}>学习人数</a>
 										<sapn className="relativef ml5 " >
-											<i className={order==="desc"?"iconfont icon-sanjiaoxing-up font-12 ntopsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9"}></i>
-											<i className={order==="asc"?"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
+											<i className={order==="asc"?"iconfont icon-sanjiaoxing-up font-12 ntopsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9"}></i>
+											<i className={order==="desc"?"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
 										</sapn>
 									</span>
 
@@ -397,8 +416,8 @@ class NewShixunModel extends Component{
 								</div>
 
 								<div className="font-12 alltopiscright ml25 fr">
-									<span className={"fr pointer color-grey-3"}  onClick={()=>this.props.hideNewShixunModelType()}>返回</span>
-									<span className={type==="mine"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的实训</span>
+									{/*<span className={"fr pointer color-grey-3"}  onClick={()=>this.props.hideNewShixunModelType()}>返回</span>*/}
+									<span className={type==="mine"?"fr topcsactive pointer color-grey-3 color-blue":"fr pointer color-grey-3"} onClick={()=>this.belongto("mine")}>我的实训</span>
 									<span className={type==="all"?"fr mr30 topcsactive pointer color-grey-3 color-blue":"fr mr30 pointer color-grey-3"}  onClick={()=>this.belongto("all")}>全部实训</span>
 								</div>
 
@@ -409,7 +428,7 @@ class NewShixunModel extends Component{
 							{shixun_list===undefined?"":shixun_list.length===0?"":shixun_list.map((item,key)=>{
 
 							return(
-								<div className="mt20 edu-back-white pd20 relativef newshixunlist" key={key}>
+								<div className="mt10 edu-back-white pd20 relativef newshixunlist" key={key}>
 									<div className="clearfix">
 										<div className="item-body">
 											<div className="clearfix ds pr contentSection">
@@ -419,7 +438,7 @@ class NewShixunModel extends Component{
 													className="fl task-hide edu-txt-left mt3"
 													name="shixun_homework[]"
 												></Checkbox>
-												<a target="_blank" href={`/shixuns/${item.identifier}/challenges`} title={item.title} className="ml15 fl font-16  color-dark maxwidth1100"
+												<a target="_blank" href={`/shixuns/${item.identifier}/challenges`} className="ml15 fl font-16  color-dark maxwidth1100"
 													 dangerouslySetInnerHTML={{__html: item.title}}
 												>
 												</a>
@@ -439,7 +458,7 @@ class NewShixunModel extends Component{
 														`
 													}
 												</style>
-												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles" title={item.description}  dangerouslySetInnerHTML={{__html: item.description}}>
+												{JSON.stringify(item.description) == "{}"?"":<div className="newshixunmodelmidfont newradioStyles"  dangerouslySetInnerHTML={{__html: item.description}}>
 												</div>}
 
 												{item.challenge_names.length===0?"":<div className="newshixunmodelbotfont">
@@ -511,14 +530,20 @@ class NewShixunModel extends Component{
 								:shixun_list.length===0? <NoneData></NoneData>:""
 							}
 
-							{
-								shixun_list===undefined?"":shixun_list.length===0?"":<div className={" edu-txt-center padding20-30"}>
-								<Button className={"mr20 newshixunmode"} onClick={()=>this.props.hideNewShixunModelType()}>取消</Button>
-								<Button className={"newshixunmode"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
-							</div>}
+
+
+						</div>
 
 					</div>
 
+						<div className="clearfix bor-bottom-greyE edu-back-white orderingbox newshixunbottombtn"
+
+						>
+							{
+								shixun_list===undefined?"":shixun_list.length===0?"":<div className={" edu-txt-center padding13-30"}>
+									<Button className={"mr20 newshixunmode"} onClick={()=>this.props.hideNewShixunModelType()}>取消</Button>
+									<Button className={"newshixunmode mr40"} type="primary" onClick={()=>this.savecouseShixunModal()} loading={this.state.hometypepvisible}>确定</Button>
+								</div>}
 						</div>
 					</Spin>
 				</Drawer>

public/react/src/modules/courses/coursesPublic/Newshixunmodel.css

@@ -195,7 +195,7 @@
     width: 100px;
     height: 38px;
     border-radius: 3px;
-    border: 1px solid rgba(191,191,191,1);
+    /*border: 1px solid rgba(191,191,191,1);*/
 }
 
 .ntopsj {
@@ -248,3 +248,22 @@
     color: #4CACFF;
 }
 
+.newshixunbottombtn{
+    position: fixed;
+    z-index: 1000;
+    bottom: 0px;
+    width: 100%;
+    height: 63px;
+    background: rgba(255,255,255,1);
+    box-shadow: 0px -4px 4px 0px rgba(0,0,0,0.05);
+}
+
+
+.mb60shixun{
+    margin-bottom: 60px !important;
+}
+
+.padding13-30 {
+    padding: 13px 30px;
+    box-sizing: border-box;
+}

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

@@ -22,7 +22,7 @@ import 'moment/locale/zh-cn';
 import './yslexercisetable.css';
 import {getImageUrl, toPath} from 'educoder';
 import CheckBoxGroup from "../../page/component/CheckBoxGroup";
-
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1217,6 +1217,7 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
+			exercise_status:0,
 		}
 		// console.log("Studentshavecompletedthelist");
 		// console.log(props.current_status);
@@ -1277,6 +1278,20 @@ class Studentshavecompletedthelist extends Component {
 		}catch (e) {
 
 		}
+		try {
+			if(this.props.Commonheadofthetestpaper.exercise_status !== undefined){
+				this.setState({
+					exercise_status:this.props.Commonheadofthetestpaper.exercise_status,
+				})
+			}else{
+				this.setState({
+					exercise_status:0,
+				})
+			}
+		}catch (e) {
+
+		}
+
 	}
 
 	componentWillReceiveProps = (nextProps) => {
@@ -2065,11 +2080,11 @@ class Studentshavecompletedthelist extends Component {
 			this.setState({
 				loadingstate: false,
 			})
-			console.log(response);
-			console.log(1997);
+			// console.log(response);
+			// console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
 		}).catch((error) => {
-			console.log(error)
+			// console.log(error)
 			this.setState({
 				loadingstate: false,
 			})
@@ -2472,7 +2487,7 @@ class Studentshavecompletedthelist extends Component {
 	render() {
 		const isAdmin = this.props.isAdmin();
 
-		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
+		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable,exercise_status, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
 		// console.log("Studentshavecompletedthelist");
 		// console.log(this.props.current_status);
 		return (
@@ -2483,6 +2498,11 @@ class Studentshavecompletedthelist extends Component {
 						" min-width": " 1200px",
 					}}>
 						{/*老师*/}
+						{
+							exercise_status===0 || exercise_status===1 ?
+								<NoneData></NoneData>
+								:
+								<div>
 									<div className="edu-back-white" >
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
@@ -2680,6 +2700,8 @@ class Studentshavecompletedthelist extends Component {
 											</div>
 											: ""
 									}
+								</div>
+						}
 
 					</div>
 
@@ -2691,6 +2713,10 @@ class Studentshavecompletedthelist extends Component {
 						<div>
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", " min-width": " 1200px"}}>
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<NoneData></NoneData>
+										:
 										<div className={"educontent mb20"}>
 
 											<div className="edu-back-white" id="graduation_work_list"
@@ -2754,7 +2780,7 @@ class Studentshavecompletedthelist extends Component {
 
 
 										</div>
-
+								}
 
 							</div>
 						</div>
@@ -2766,6 +2792,11 @@ class Studentshavecompletedthelist extends Component {
 								"padding-bottom": "100px",
 								" min-width": " 1200px"
 							}}>
+								{
+									exercise_status === 0 || exercise_status === 1 ?
+										<NoneData></NoneData>
+										:
+										<div>
 											<div className={"educontent mb20 edu-back-white"}>
 												<style>
 													{
@@ -2903,6 +2934,8 @@ class Studentshavecompletedthelist extends Component {
 													: ""
 											}
 										</div>
+								}
+							</div>
 
 						</div>
 

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

@@ -436,7 +436,7 @@ class Testpapersettinghomepage extends Component{
                     />
                     {
                         // 教师列表
-                        parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status}></Studentshavecompletedthelist>
+                        parseInt(tab[0])==0 && <Studentshavecompletedthelist {...this.props} {...this.state}  triggerRef={this.bindRef}  setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper}></Studentshavecompletedthelist>
                     }
 
                     {/*统计结果*/}

public/react/src/modules/courses/exercise/new/SingleEditor.js

@@ -182,6 +182,10 @@ class SingleEditor extends Component{
     this.setState({ standard_answers })
   }
   onOptionContentChange = (value, index) => {
+    if (index >= this.state.question_choices.length) {
+      // TODO 新建，然后删除CD选项，再输入题干，会调用到这里，且index是3
+      return;
+    }
     let question_choices  = this.state.question_choices.slice(0);    
     question_choices[index] = value;
     this.setState({ question_choices })

public/react/src/modules/courses/gradinforms/Eduinforms.js

@@ -25,16 +25,61 @@ class Eduinforms extends Component{
 			eduintits:"",
 			informs:[],
 			yslbool:false,
+			dataquerys:{},
 		}
 	}
 
 	componentDidMount() {
+		console.log("Eduinformss");
 		console.log("获取到数据");
-    console.log(this.props);
+    // console.log(this.props);
+		const query = this.props.location.search;
+		// const type = query.split('?chinaoocTimestamp=');
+		// console.log("Eduinforms12345");
+	  // console.log(this.foo(query));
+		// console.log(JSON.stringify(this.foo(query)));
+		var dataqueryss={}
+		 try {
+			 var foqus=this.foo(query);
+		 	if(JSON.stringify(foqus) ==="{}"){
+				this.setState({
+					dataquerys:{},
+				});
+			}else {
+				this.setState({
+					dataquerys:foqus,
+				});
+				dataqueryss=foqus;
+			}
+		 }catch (e) {
+			 this.setState({
+				 dataquerys:{},
+			 })
+		 }
+		this.getinputdatas(dataqueryss);
+	}
+ //截取数据
+ foo=(url)=> {
+		var json = {};
+		var regExp = /[\?\&](\w+)(=?)(\w*)/g;
+    var arr;
+		do {
+			arr = regExp.exec(url);
+			// console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
 
-    this.getinputdata();
+			if (arr) {
+				var key = arr[1];
+				var value = arr[3];
+				// arr[2] === ''时, value = undefined
+				if (!arr[2])
+					value = undefined;
+
+				json[key] = value;
 			}
+		} while (arr);
 
+		return json;
+	}
 	getyslbooltrue(){
 		console.log("调用了getyslbooltrue");
 		this.setState({
@@ -54,7 +99,47 @@ class Eduinforms extends Component{
 		})
 		let url = `/courses/${this.props.match.params.coursesId}/informs.json`;
 		//
-		axios.get(url).then((response) => {
+		axios.get(url,
+			{params:this.state.dataquerys}
+			).then((response) => {
+			if(response){
+				if(response.data){
+					this.setState({
+						informs:response.data.informs,
+						isSpin:false,
+					})
+				}else {
+					this.setState({
+						informs:[],
+						isSpin:false,
+
+					})
+
+				}
+			}else {
+				this.setState({
+					informs:[],
+					isSpin:false,
+				})
+
+			}
+		}).catch((error) => {
+			console.log(error)
+			this.setState({
+				informs:[],
+				isSpin:false,
+			})
+		});
+	}
+	getinputdatas=(yslwebobject)=>{
+		this.setState({
+			isSpin:true,
+		})
+		let url = `/courses/${this.props.match.params.coursesId}/informs.json`;
+		//
+		axios.get(url,
+			{params:yslwebobject}
+		).then((response) => {
 			if(response){
 				if(response.data){
 					this.setState({

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

@@ -389,7 +389,7 @@ class GraduationTasksSubmitedit extends Component{
     let listid=[];
 
     for(var list of fileList){
-      listid.push(list.response.id)
+      listid.push(list.response == undefined ? list.id : list.response.id)
     }
 
       this.props.form.validateFields((err, values) => {

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

@@ -33,6 +33,8 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import ShixunWorkModal from "./Shixunworkdetails/ShixunWorkModal";
+import NoneData from '../../../modules/courses/coursesPublic/NoneData'
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1451,13 +1453,14 @@ class Listofworksstudentone extends Component {
 			],
 			yslpros:false,
 			datajs:[],
+			homework_status:[],
 
 		}
 	}
 	componentDidCatch(error, info){
-		console.log("-----------------------------905错误信息");
-		console.log(error);
-		console.log(info);
+		// console.log("-----------------------------905错误信息");
+		// console.log(error);
+		// console.log(info);
 
 	}
 	// componentWillReceiveProps(nextProps) {
@@ -1569,7 +1572,8 @@ class Listofworksstudentone extends Component {
 				allow_late:result.data.allow_late,
 				loadingstate: false,
 				computeTimetype:true,
-			})
+				homework_status:result.data.homework_status,
+			});
 			this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
 
 			if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
@@ -1626,7 +1630,8 @@ class Listofworksstudentone extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 					view_report:result.data.view_report,
-				})
+					homework_status:result.data.homework_status,
+				});
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata(result.data);
 				} else {
@@ -2129,7 +2134,8 @@ class Listofworksstudentone extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 					view_report:result.data.view_report,
-				})
+					homework_status:result.data.homework_status,
+				});
 				this.seacthdata(result.data);
 				this.props.Getdataback(result,result.data);
 			}
@@ -2242,7 +2248,8 @@ class Listofworksstudentone extends Component {
 					end_immediately: result.data.end_immediately,
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
-				})
+					homework_status:result.data.homework_status,
+				});
 				this.seacthdatat(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
 				this.props.Getdataback(result,result.data);
 				// }
@@ -3037,7 +3044,7 @@ class Listofworksstudentone extends Component {
 		})
 	}
 	render() {
-		let {columns,course_groupysls,datajs,isAdmin, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
+		let {columns,course_groupysls,datajs,isAdmin,homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible,visibles, game_list,columnsstu,columnsstu2, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate,computeTimetype} = this.state;
 
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		// console.log(this.state.student_works);
@@ -3068,8 +3075,8 @@ class Listofworksstudentone extends Component {
 	 }
 
 		return (
+
 			this.props.isAdmin() === true ?
-				(
 							 <div className=" clearfix " style={{margin:  "auto" , minWidth:"1200px"}}>
 								 {visible === true ? <ModulationModal
 									 visible={visible}
@@ -3143,6 +3150,13 @@ class Listofworksstudentone extends Component {
 									 starttimes={this.state.starttimes}
 									 typs={this.state.typs}
 								 />
+								 {
+								 homework_status.length===0?
+								 <NoneData></NoneData>
+								 :
+								 homework_status.length>0 && homework_status[0]==="未发布"?
+								 <NoneData></NoneData>
+								 :
 								 <div className={"educontent "}>
 
 
@@ -3387,11 +3401,10 @@ class Listofworksstudentone extends Component {
 											 : ""
 									 }
 								 </div>
-
+								 }
 							 </div>
-					)
 				:
-				(
+
 								<div>
 									{
 										teacherdata === undefined || teacherdata.student_works === undefined || teacherdata.student_works === null || JSON.stringify(teacherdata.student_works) === "[]" ?
@@ -3473,6 +3486,19 @@ class Listofworksstudentone extends Component {
 													: ""
 												}
 
+												{
+													homework_status.length===0?
+														<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status.length>0 && homework_status[0]==="未发布"?
+															<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+																<NoneData></NoneData>
+															</div>
+															:
+
+
 												<div className={"educontent "}>
 													<div className="edu-back-white" style={{width: "1200"}}>
 
@@ -3593,7 +3619,7 @@ class Listofworksstudentone extends Component {
 													</div>
 
 												</div>
-
+												}
 											</div>
 											:
 											// 学生能查看别人的
@@ -3619,6 +3645,18 @@ class Listofworksstudentone extends Component {
 														Cancel={() => this.cancelModulationModels()}
 													/> : ""
 												}
+
+												{
+													homework_status.length===0?
+														<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+															<NoneData></NoneData>
+														</div>
+														:
+														homework_status.length>0 && homework_status[0]==="未发布"?
+															<div className=" clearfix "  style={{margin:  "auto" , minWidth:"1200px"}}>
+																<NoneData></NoneData>
+															</div>
+															:
 														<div className={"educontent mb20"}>
 
 													<div >
@@ -3807,10 +3845,12 @@ class Listofworksstudentone extends Component {
 														}
 													</div>
 												</div>
+												}
 											</div>
+
 					}
 				</div>
-				)
+
 
 		)
 	}

public/react/src/modules/ecs/EcSetting/CourseSupports/index.js

@@ -15,7 +15,7 @@ class CourseSupports extends Component {
         this.state={
             data:'',
             ec_courses_list:[],
-            editcourse:[{"weigths": 0,
+            editcourse:[{"weights": 0,
                 "ec_course_name":'',
                 "top_relation": false,
                 "ec_course_id":''
@@ -61,13 +61,15 @@ class CourseSupports extends Component {
 								this.setState({
 										data:response.data
 								})
-						}
+							  console.log(response.data.graduation_subitems.length)
 								if(response.data.graduation_subitems.length===0){
 									this.setState({
 										Supportstype:true,
 										Supportslist:'数据为空，请去毕业要求——>毕业要求指标点分解列表配置数据'
 									})
 								}
+						}
+
 				})
 				.catch(function (error) {
 						console.log(error);
@@ -153,12 +155,14 @@ class CourseSupports extends Component {
 					if(item.course_supports.length>0){
 						this.setState({
 							editcourse:item.course_supports,
-							Editkey:key
+							Editkey:key,
+							index:subindex,
 						})
 					}else if(item.course_supports.length===0){
 						this.setState({
 							editcourse:[{weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''}],
-							Editkey:key
+							Editkey:key,
+							index:subindex,
 						})
 					}
 
@@ -173,7 +177,7 @@ class CourseSupports extends Component {
     Addcourse=(e)=>{
         let {editcourse} =this.state;
         let neweditcourse=editcourse;
-        let newadd = {weigths: 0,top_relation: false,ec_course_name:'',ec_course_id:''};
+        let newadd = {weights: 0,top_relation: false,ec_course_name:'',ec_course_id:''};
         neweditcourse.push(newadd);
         this.setState({
             editcourse:neweditcourse
@@ -194,10 +198,10 @@ class CourseSupports extends Component {
         neweditcourse.splice(e,1);
         let newnum=0;
         for(var j=0;j<neweditcourse.length;j++){
-            if(neweditcourse[j].weigths===undefined){
+            if(neweditcourse[j].weights===undefined){
                 newnum=0
             }else{
-                newnum=newnum+neweditcourse[j].weigths;
+                newnum=newnum+neweditcourse[j].weights;
             }
         }
         newnum= Math.round(newnum*100)/100;
@@ -231,7 +235,7 @@ class CourseSupports extends Component {
 
 
         const person = new Object ();
-        person.weigths=value;
+        person.weights=value;
         person.ec_course_id= neweditcourse[id].ec_course_id;
         person.ec_course_name=neweditcourse[id].ec_course_name;
         person.top_relation=neweditcourse[id].top_relation;
@@ -242,12 +246,12 @@ class CourseSupports extends Component {
         let newnum=0;
         for(var j=0;j<neweditcourse.length;j++){
 
-            if(neweditcourse[j].weigths===undefined){
+            if(neweditcourse[j].weights===undefined){
                 newnum=newnum+0;
-            }else if(neweditcourse[j].weigths===""){
+            }else if(neweditcourse[j].weights===""){
                 newnum=newnum+0;
             }else{
-                newnum=newnum+neweditcourse[j].weigths;
+                newnum=newnum+neweditcourse[j].weights;
             }
 
         }
@@ -362,8 +366,8 @@ class CourseSupports extends Component {
         // }
 
 				editcourse.map((item,key)=>{
-					if(item.weigths===""){
-						item.weigths=0;
+					if(item.weights===""){
+						item.weights=0;
 					}
 					if(item.ec_course_id===""){
 						this.setState({
@@ -426,7 +430,7 @@ class CourseSupports extends Component {
     }
     render() {
         const Option = Select.Option;
-        let {data,ec_courses_list,editcourse,editnum,index,ec_year_id,schooldata,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
+        let {data,ec_courses_list,editcourse,editnum,index,ec_year_id,Supportsclasskey,ecComponentState,hidesupport,supportid,Editkey,titlemessage,Supportstype,Supportslist,Supportssum,Supportsclass,major_school_id} = this.state;
         var list = (length) => {
             var res = [];
             for(var i = 0; i < length; i++) {
@@ -480,7 +484,7 @@ class CourseSupports extends Component {
 
                         </div>
                         <div className="padding20-30" id="training_objective_contents">
-                            <span className="fl SystemParameters" >毕业要求指标点（<a href={data.subitems_url}><span className="Systemnum">{data.subitems_count}</span></a>）</span>
+                            <span className="fl SystemParameters" >毕业要求指标点（<a href={data.subitems_url}><span className="Systemnum">{data.count}</span></a>）</span>
                             <span className="fl ml20 SystemParameters">课程体系（<a href={data.course_url}><span className="Systemnum">{data.course_count}</span></a>）</span>
                         </div>
 
@@ -504,24 +508,25 @@ class CourseSupports extends Component {
                                     return (
                                         <li className={data.graduation_subitems.length===key+1?"clearfix mb10":"clearfix"}  key={key} style={{width: 120*data.max_support_count > 1134 ? 136*data.max_support_count : 1134+"px",margin: '0px 0px'}}>
                                             <Tooltip placement="bottom" title={item.sequence_title}>
-                                                <span className="column-1 columnlocation" style={{display:Editkey!=key?"block":'none',width: '95px', paddingLeft: '23px'}}>{item.sequence_num}</span>
+                                                <span className="column-1 columnlocation" style={{display:Editkey!=key?"block":'none',width: '95px', paddingLeft: '23px'}}>{item.graduation_requirement_position+"-"+item.position}</span>
                                             </Tooltip>
 
 
                                             {
                                                 item.course_supports.map((t,kes)=>{
+
                                                     return(
                                                         <span key={kes} className="column-1" 
                                                         style={{
                                                             display:Editkey!=key?"block":'none',
                                                             marginRight: '-1px'
                                                         }}>
-                                                        <div data-tip-down={t.name} className={t.top_relation===true?"DDred columnbox":"columnbox"}
+                                                        <div data-tip-down={t.ec_course_name} className={t.top_relation===true?"DDred columnbox":"columnbox"}
                                                         style={{textAlign: 'center'}}
-                                                        >{t.name.length>12?t.name.substring(0, 10)+"...":t.name}</div>
+                                                        >{t.ec_course_name.length>12?t.ec_course_name.substring(0, 10)+"...":t.ec_course_name}</div>
                                                         <div className={t.top_relation===true?"DDred":""}
                                                          style={{textAlign: 'center'}}
-                                                        >（{t.weigths}）</div>
+                                                        >（{t.weights}）</div>
                                                          </span>
                                                     )
 
@@ -586,7 +591,7 @@ class CourseSupports extends Component {
                                                                         size="large"
                                                                         className={Supportssum===true?"inputWeight bor-red":"inputWeight"}
                                                                         id={key}
-                                                                        value={it.weigths}
+                                                                        value={it.weights}
                                                                         onInput={this.enterweight.bind(this)}
                                                                     />
 

public/react/src/modules/forums/MemoNew.js

@@ -101,9 +101,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback){
             });
 
             $("#"+ id +" [type=\"inline\"]").bind("click", function(){
-                editorName.cm.replaceSelection("$$$$");
+                editorName.cm.replaceSelection("`$$$$`");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch-2);
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch-3);
                 editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");

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

@@ -408,7 +408,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -422,7 +422,7 @@ class ShixunsHome extends Component {
                                                                 <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
                                                                 <a href={"/users/"+item.login} className="color-dark">
                                                                     <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                    <p className="task-hide rankName mt5">{item.username}</p>
                                                                 </a>
                                                             </li>
                                                         )
@@ -436,7 +436,7 @@ class ShixunsHome extends Component {
                                                                 <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
                                                                 <a href={"/users/"+item.login} className="color-dark">
                                                                     <img src={'/images/'+item.image_url} />
-                                                                    <span className="task-hide rankName">{item.username}</span>
+                                                                    <p className="task-hide rankName mt5">{item.username}</p>
                                                                 </a>
                                                             </li>
                                                         )
@@ -452,7 +452,7 @@ class ShixunsHome extends Component {
                                                                 <li key={key}>
                                                                     <a href={"/users/"+item.login} className="color-dark">
                                                                         <img src={'/images/'+item.image_url}/>
-                                                                        <span className="task-hide rankName">{item.username}</span>
+                                                                        <p className="task-hide rankName mt5">{item.username}</p>
                                                                     </a>
                                                                 </li>
                                                             )
@@ -484,7 +484,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-two.png")} className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -498,7 +498,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan.png")}  className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -512,7 +512,7 @@ class ShixunsHome extends Component {
                                                             <img src={getImageUrl("images/educoder/huangguan-three.png")}  className="huangguan" />
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url} />
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )
@@ -528,7 +528,7 @@ class ShixunsHome extends Component {
                                                         <li key={key}>
                                                             <a href={"/users/"+item.login} className="color-dark">
                                                                 <img src={'/images/'+item.image_url}/>
-                                                                <span className="task-hide rankName">{item.username}</span>
+                                                                <p className="task-hide rankName mt5">{item.username}</p>
                                                             </a>
                                                         </li>
                                                     )

public/react/src/modules/message/js/Leftdialogue.js

@@ -5,7 +5,7 @@ import {
 } from "antd";
 import axios from 'axios';
 import moment from 'moment';
-import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
+import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
 //私信页面
@@ -51,8 +51,8 @@ class Leftdialogue extends Component{
 			</a>
 			<div className="fl pr OtherSide-info">
 				<span className="trangle"></span>
-				<ImageLayerHook parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
-				</ImageLayerHook>
+				<ImageLayer2 parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
+				</ImageLayer2>
 				<div className="sms break_word markdown-body" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-right mt5">
 					<a  className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a>

public/react/src/modules/message/js/Rightdialogue.js

@@ -5,7 +5,7 @@ import {
 } from "antd";
 import axios from 'axios';
 import moment from 'moment';
-import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
+import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
 //私信页面
@@ -51,8 +51,8 @@ class Rightdialogue extends Component{
 			</a>
 			<div className="fr pr ThisSide-info">
 				<span className="trangle"></span>
-				<ImageLayerHook parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
-				</ImageLayerHook>
+				<ImageLayer2 parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
+				</ImageLayer2>
 				<div className="sms break_word markdown-body" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-left mt5">
 					<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)}

public/react/src/modules/page/MainContentContainer.js

@@ -308,11 +308,12 @@ class MainContentContainer extends Component {
 			// })
     	}).then((fetchRepositoryCodeResponse) => {
 				// monaca 需要刷新，不然无法编辑
-				if (this.retryAndRefresh && fetchRepositoryCodeResponse.data.content) {
-					this.retryAndRefresh = false;
-					window.location.reload()
-					return;
-				}
+				// 加了dispose，应该不会重现了，暂时注释掉reload
+				// if (this.retryAndRefresh && fetchRepositoryCodeResponse.data.content) {
+				// 	this.retryAndRefresh = false;
+				// 	window.location.reload()
+				// 	return;
+				// }
 				// 空字符串还是正常切换
 				if (fetchRepositoryCodeResponse.data.status == 0) {
 					readingRepoTimes = readingRepoTimes + 1;
@@ -530,7 +531,7 @@ class MainContentContainer extends Component {
 		let codeContent = this.state.repositoryCode;
 		if (window['editor_CodeMirror']) {
 			codeContent = window.editor_CodeMirror.getValue();
-		} else if (window.editor_monaco) {
+		} else if (window.editor_monaco && window.editor_monaco.getModel()) { // (编程切选择题) 如果dispose了，model为空
 			codeContent = window.editor_monaco.getValue()
 		}
 		if (checkIfCodeChanged === true && this.oldRepositoryCode == codeContent) {

public/react/src/modules/page/component/monaco/TPIMonaco.js

@@ -17,6 +17,8 @@ import * as monaco from 'monaco-editor'
 
 import { fromStore, toStore } from 'educoder'
 import './TPIMonacoConfig'
+
+// https://microsoft.github.io/monaco-editor/playground.html#customizing-the-appearence-exposed-colors
 monaco.editor.defineTheme('myCoolTheme', {
       base: 'vs-dark',
       inherit: true,
@@ -35,6 +37,8 @@ monaco.editor.defineTheme('myCoolTheme', {
         // 'input.border': '#ffffff',
         'editor.lineHighlightBorder': '#222c34',        // .current-line
         
+        // 'editor.selectionBackground': '#FFFF0030',
+        // 'editor.selectionHighlightBackground' :'#0000FFFF',
       }
 });
 
@@ -245,6 +249,10 @@ class TPIMonaco extends Component {
             // extend_editor.clearHistory()
         } 
     }
+    componentWillUnmount() {
+        this.editor_monaco && this.editor_monaco.dispose()
+    }
+    
 	componentDidMount() {
         checkIfLoaded(() => {
             let value = [
@@ -282,6 +290,7 @@ class TPIMonaco extends Component {
 
                 // theme: "vs-dark",
                 theme: "myCoolTheme",
+                insertSpaces: false,
                 fontSize: this.state.cmFontSize
                 
             });

public/react/src/modules/paths/Index.js

@@ -43,7 +43,7 @@ class Index extends Component{
                     <Route path="/paths/:pathId/edit" exact
                         render={(props)=>(<PathsNew {...this.props} {...this.state} {...props}/>)}
                     ></Route>
-
+                     {/*编辑页面*/}
 										<Route path="/paths/:pathId" exact
 													 render={(props)=>(<PathsDetail {...this.props} {...this.state} {...props}/>)}
 										></Route>

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

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl,markdownToHTML} from 'educoder';
+import {getImageUrl,markdownToHTML, configShareForCustom} from 'educoder';
 import DetailTop from './DetailTop.js';
 import DetailCards from './DetailCards.js'
 import AddCollaborators from "./addCollaborators.js";
@@ -83,7 +83,8 @@ class PathDetailIndex extends Component{
 			loadtype:false,
 			courses:undefined,
 			items: getItems(10),
-			pathtopskey:1
+			pathtopskey:1,
+			dataquerys:{},
 		}
 		this.onDragEnd = this.onDragEnd.bind(this);
 
@@ -146,14 +147,62 @@ class PathDetailIndex extends Component{
 	}
 
 	componentDidMount(){
-		this.getdatasindex()
+
+		const query = this.props.location.search;
+		// const type = query.split('?chinaoocTimestamp=');
+		// console.log("Eduinforms12345");
+		// console.log(this.foo(query));
+		// console.log(JSON.stringify(this.foo(query)));
+		var dataqueryss={}
+		try {
+			var foqus=this.foo(query);
+			if(JSON.stringify(foqus) ==="{}"){
+				this.setState({
+					dataquerys:{},
+				});
+			}else{
+				this.setState({
+					dataquerys:foqus,
+				});
+				dataqueryss=foqus;
+			}
+		}catch (e) {
+			this.setState({
+				dataquerys:{},
+			})
 		}
 
-	getdatasindex=(key)=>{
+		this.getdatasindexs(undefined,dataqueryss);
+	}
+	//截取url 数据的
+	foo=(url)=> {
+		var json = {};
+		var regExp = /[\?\&](\w+)(=?)(\w*)/g;
+		var arr;
+		do {
+			arr = regExp.exec(url);
+			// console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
+
+			if (arr) {
+				var key = arr[1];
+				var value = arr[3];
+				// arr[2] === ''时, value = undefined
+				if (!arr[2])
+					value = undefined;
 
+				json[key] = value;
+			}
+		} while (arr);
+
+		return json;
+	}
+	getdatasindexs=(key,yslwebobject)=>{
+		// yslwebobject 后端需要的接口
 		let pathid=this.props.match.params.pathId;
 		let url="/paths/"+pathid+".json";
-		axios.get(url).then((result)=>{
+		axios.get(url,
+			{params:yslwebobject}
+			).then((result)=>{
 			if (result.data.status === 407 || result.data.status === 401) {
 				debugger
 				return;
@@ -164,6 +213,7 @@ class PathDetailIndex extends Component{
 				// window.location.href = "/403";
 				return;
 			}
+			configShareForCustom(result.data.name, result.data.description)
 
 			if(result.data.allow_visit===true){
 				this.setState({
@@ -179,6 +229,65 @@ class PathDetailIndex extends Component{
 		})
 
 
+		let righturl="/paths/"+pathid+"/right_banner.json";
+		axios.get(righturl).then((result)=>{
+			if (result.data.status === 407 || result.data.status === 401) {
+				debugger
+				return;
+			}
+
+			if (result.data.status === 403) {
+				debugger
+				// window.location.href = "/403";
+				return;
+			}
+
+			this.setState({
+				// detailInfoList:result.data,
+				tags:result.data.tags,
+				progress:result.data.progress,
+				members:result.data.members,
+				items:  getItems(result.data.members.length),
+			})
+
+		}).catch((error)=>{
+			console.log(error);
+		})
+	};
+
+	getdatasindex=(key)=>{
+		// yslwebobject 后端需要的接口
+		let pathid=this.props.match.params.pathId;
+		let url="/paths/"+pathid+".json";
+		axios.get(url,
+			{params:this.state.dataquerys}
+			).then((result)=>{
+			if (result.data.status === 407 || result.data.status === 401) {
+				debugger
+				return;
+			}
+
+			if (result.data.status === 403) {
+				debugger
+				// window.location.href = "/403";
+				return;
+			}
+			configShareForCustom(result.data.name, result.data.description)
+
+			if(result.data.allow_visit===true){
+				this.setState({
+					detailInfoList:result.data,
+					courses:result.data.courses,
+					pathtopskey:key===undefined?1:key,
+					// items:  getItems(result.data.members.length),
+				})
+			}
+
+		}).catch((error)=>{
+			console.log(error);
+		});
+
+
 		let righturl="/paths/"+pathid+"/right_banner.json";
 		axios.get(righturl).then((result)=>{
 			if (result.data.status === 407 || result.data.status === 401) {

public/react/src/modules/paths/PathNew.js

@@ -48,6 +48,8 @@ function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callb
       imageUploadURL: imageUrl,//url
       onload: function () {
           // this.previewing();
+          var id = this.id;
+          var editorName = this;
           $("#" + id + " [type=\"latex\"]").bind("click", function () {
               editorName.cm.replaceSelection("```latex");
               editorName.cm.replaceSelection("\n");
@@ -58,9 +60,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callb
           });
 
           $("#" + id + " [type=\"inline\"]").bind("click", function () {
-              editorName.cm.replaceSelection("$$$$");
+              editorName.cm.replaceSelection("`$$$$`");
               var __Cursor = editorName.cm.getDoc().getCursor();
-              editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+              editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
               editorName.cm.focus();
           });
           $("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/paths/SchoolStatistics/FirstTab.js

@@ -6,6 +6,11 @@ import axios from 'axios';
 const $ = window.$;
 const echarts = require('echarts');
 function InitChapterUsageSituation(_data){
+	var myChart = echarts.init(document.getElementById('chapterUsageSituation'));
+	myChart.showLoading({
+		text: "数据获取中",
+		effect: 'whirling'
+	})
   var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6','#F3857B', '#B97BF3','#4DE8B4','#f76d0c','#510cf7','#def70c','#3bf70c','#0cf7e1'];
 
   var option = {
@@ -84,8 +89,12 @@ function InitChapterUsageSituation(_data){
       }]
   };
   
-  var myChart = echarts.init(document.getElementById('chapterUsageSituation'));
+
+
+	setTimeout(() => {
 		myChart.setOption(option);
+		myChart.hideLoading();
+	}, 1000)
 }
 class FirstTab extends Component{
   constructor(props){

public/react/src/modules/paths/SchoolStatistics/SecondTab.js

@@ -166,15 +166,14 @@ class SecondTab extends Component{
   constructor(props){
     super(props);
     this.state = {
-
     }
   }
 
   componentDidMount(){
     var pathId = this.props.match.params.pathId;
 
-    var myChart = echarts.init(document.getElementById('shixunStudyStatistics'));
-    myChart.showLoading({
+		var myCharts = echarts.init(document.getElementById('showloding'));
+		myCharts.showLoading({
 			text: "数据获取中",
 			effect: 'whirling'
 		})
@@ -211,11 +210,20 @@ class SecondTab extends Component{
                 mapByNumber[item.number] = item
             })
         })
-        this.setState({ shixunList }, () => {
-            InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart);
-            myChart.hideLoading()
-        })
 
+			  this.setState({
+					shixunList
+			  })
+					var myChart = echarts.init(document.getElementById('shixunStudyStatistics'));
+					myChart.showLoading({
+						text: "数据获取中",
+						effect: 'whirling'
+					})
+				setTimeout(() => {
+					InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart);
+					myCharts.hideLoading();
+					myChart.hideLoading();
+				}, 1000)
         
     })
     .catch(function (error) {
@@ -229,7 +237,7 @@ class SecondTab extends Component{
       <div className="clearfix panelForm-2">
         <div className="with60 pr40 fl">
           <div className="static_shadow edu-back-white">
-            <p className="font-24 padding30-20">实训使用详情</p>
+            <div className="font-24 padding30-20">实训使用详情</div>
             <div className="minH-440" id="tableHeight">
               <table className="edu-pop-table head-color edu-txt-center bor-top-greyE" cellSpacing="0" cellPadding="0">
                 <thead>
@@ -260,9 +268,21 @@ class SecondTab extends Component{
           </div>
         </div>
         <div className="with40 fl static_shadow edu-back-white">
-          <p className="font-24 padding30-20">实训学习统计</p>
-          <div id="shixunStudyStatistics" 
-            style={{"width":"480px","height": shixunList ? `${shixunList.length * 35 + 100}px` : "440px"}}></div>
+					<style>
+						{
+							`
+							 .padding23-20{
+							     padding: 23px 20px;
+							     box-sizing: border-box;
+							 }
+							`
+						}
+					</style>
+          <div className="font-24 padding23-20">实训学习统计</div>
+					{shixunList===undefined?<div id="showloding"
+							 style={{"width":"480px","height":"440px"}}></div>:""}
+					{shixunList===undefined?"":<div id="shixunStudyStatistics"
+            style={{"width":"480px","minHeight":`${shixunList&&shixunList.length *50}px`}}></div>}
         </div>
       </div>
     )

public/react/src/modules/paths/SchoolStatistics/ThirdTab.js

@@ -238,7 +238,7 @@ class ThirdTab extends Component{
   render(){
     return(
       <div className="clearfix mb30 static_shadow edu-back-white panelForm panelForm-3">
-        <p className="font-24 padding30-20">院校学习情况</p> 
+        <div className="font-24 padding30-20">院校学习情况</div>
         <div id="collegeStatistic" style={{"width":"1200px","height":"540px"}}></div>
       </div>
     )

public/react/src/modules/projectPackages/MDEditors.js

@@ -168,7 +168,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
             $("#" + _id + " [type=\"inline\"]").bind("click", function () {
                 _editorName.cm.replaceSelection("`$$$$`");
                 var __Cursor = _editorName.cm.getDoc().getCursor();
-                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                _editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
                 _editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");

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

@@ -81,7 +81,8 @@ export function TPMIndexHOC(WrappedComponent) {
             isRender: false,
             AccountProfiletype: false,
 
-            globalLoading: false
+            globalLoading: false,
+					  dataquerys:{},
 	      }
 	    }
 
@@ -165,7 +166,32 @@ export function TPMIndexHOC(WrappedComponent) {
         $.ajaxSetup({
 	        cache: true
 	      });
-        this.fetchUser();
+
+        //帮助后台传参数
+				const query = this.props.location.search;
+				// const type = query.split('?chinaoocTimestamp=');
+				// console.log("Eduinforms12345");
+				// console.log(this.foo(query));
+				// console.log(JSON.stringify(this.foo(query)));
+				var dataqueryss={}
+				try {
+					var foqus=this.foo(query);
+					if(JSON.stringify(foqus) ==="{}"){
+						this.setState({
+							dataquerys:{},
+						});
+					}else{
+						this.setState({
+							dataquerys:foqus,
+						});
+						dataqueryss=foqus;
+					}
+				}catch (e) {
+					this.setState({
+						dataquerys:{},
+					})
+				}
+        this.fetchUsers(dataqueryss);
 
             let url=`/users/get_navigation_info.json`;
             axios.get(url, {
@@ -260,10 +286,23 @@ export function TPMIndexHOC(WrappedComponent) {
           courseId = parseInt(type[2])
           // url += `?course_id=${courseId}`
         }
-        axios.get(url,{params:{
+				var datay={};
+				if(JSON.stringify(this.state.dataquerys) ==="{}"){
+					datay={
 						course_id:isNaN(courseId)?undefined:courseId,
 						school:1
 					}
+				}else{
+					datay={
+						course_id:isNaN(courseId)?undefined:courseId,
+						school:1,
+						chinaoocTimestamp:this.state.dataquerys.chinaoocTimestamp,
+						websiteName:this.state.dataquerys.websiteName,
+						chinaoocKey:this.state.dataquerys.chinaoocKey,
+					}
+				}
+        axios.get(url,{params:
+							datay
         },
             {
               // withCredentials: true
@@ -301,7 +340,93 @@ export function TPMIndexHOC(WrappedComponent) {
           }).catch((error) => {
             console.log(error)
           })
+      };
+			fetchUsers = (yslurlobject) => {
+				let url = `/users/get_user_info.json`
+				let courseId;
+				let query = this.props.location.pathname;
+				const type = query.split('/');
+				if (type[1] == 'courses' && type[2]) {
+					courseId = parseInt(type[2])
+					// url += `?course_id=${courseId}`
+				}
+				var datay={};
+				if(JSON.stringify(yslurlobject) ==="{}"){
+					  datay={
+							course_id:isNaN(courseId)?undefined:courseId,
+							school:1
+						}
+				}else{
+					datay={
+						course_id:isNaN(courseId)?undefined:courseId,
+						school:1,
+						chinaoocTimestamp:yslurlobject.chinaoocTimestamp,
+						websiteName:yslurlobject.websiteName,
+						chinaoocKey:yslurlobject.chinaoocKey,
+					}
+				}
+				axios.get(url,{params:
+							datay
+					},
+					{
+						// withCredentials: true
+					}
+				).then((response) => {
+					/*
+						{
+								"username": "黄井泉",
+								"login": "Hjqreturn",
+								"user_id": 12,
+								"image_url": "avatar/User/12",
+								"admin": true,
+								"is_teacher": false,
+								"tidding_count": 0
+						}
+					*/
+					if(response=== undefined){
+						return
+					}
+					if (response.data) {
+						this.initCommonState(response.data)
+						this.setState({
+							tpmLoading: false,
+							coursedata: {
+								course_identity: response.data.course_identity >= 0 ? response.data.course_identity : undefined,
+								course_public: response.data.course_public,
+								name: response.data.course_name,
+								userid:response.data.user_id
+							},
+
+						})
+
 					}
+
+				}).catch((error) => {
+					console.log(error)
+				})
+			};
+			//截取url 数据的
+			foo=(url)=> {
+				var json = {};
+				var regExp = /[\?\&](\w+)(=?)(\w*)/g;
+				var arr;
+				do {
+					arr = regExp.exec(url);
+					// console.log(arr); // arr = [完整的字符串, key, 等号或'', value或'']
+
+					if (arr) {
+						var key = arr[1];
+						var value = arr[3];
+						// arr[2] === ''时, value = undefined
+						if (!arr[2])
+							value = undefined;
+
+						json[key] = value;
+					}
+				} while (arr);
+
+				return json;
+			};
       hideLoginDialog = () => {
         this.setState({
           isRender: false

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

@@ -156,9 +156,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl,initValue, callb
       });
 
       $("#" + id + " [type=\"inline\"]").bind("click", function () {
-        editorName.cm.replaceSelection("$$$$");
+        editorName.cm.replaceSelection("`$$$$`");
         var __Cursor = editorName.cm.getDoc().getCursor();
-        editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+        editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
         editorName.cm.focus();
       });
       $("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/tpm/challengesnew/TPManswer.js

@@ -130,9 +130,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
             });
 
             $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("$$$$");
+                editorName.cm.replaceSelection("`$$$$`");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
                 editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -73,9 +73,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
 			});
 
 			$("#" + id + " [type=\"inline\"]").bind("click", function () {
-				editorName.cm.replaceSelection("$$$$");
+				editorName.cm.replaceSelection("`$$$$`");
 				var __Cursor = editorName.cm.getDoc().getCursor();
-				editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+				editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
 				editorName.cm.focus();
 			});
 			$("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/tpm/challengesnew/editorMD.js

@@ -51,9 +51,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
             });
 
             $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("$$$$");
+                editorName.cm.replaceSelection("`$$$$`");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
                 editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");

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

@@ -160,9 +160,9 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
             });
 
             $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("$$$$");
+                editorName.cm.replaceSelection("`$$$$`");
                 var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 3);
                 editorName.cm.focus();
             });
             $("[type=\"inline\"]").attr("title", "行内公式");

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
 
-import { getImageUrl ,markdownToHTML} from 'educoder'
+import { getImageUrl ,markdownToHTML, configShareForCustom} from 'educoder'
 
 import { CircularProgress } from 'material-ui/Progress';
 
@@ -51,6 +51,7 @@ class Challenges extends Component {
         if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
         }else{
+          configShareForCustom(this.props.shixunsDetails.name, response.data.description)
           this.setState({
             ChallengesDataList: response.data,
             sumidtype: false,

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { message, Icon, Input, Form, Upload} from "antd";
 import axios from 'axios'
 import ModalWrapper from "../../courses/common/ModalWrapper"
-import { City, getUploadActionUrl, getImageUrl, ImageLayerHook, getUploadActionUrlOfAuth } from 'educoder'
+import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth } from 'educoder'
 import '../account/common.css'
 
 import authImg from '../../../images/account/auth.png'
@@ -308,8 +308,8 @@ class RealNameCertificationModal extends Component{
             <div className="df mt10 color-grey-9" style={{ justifyContent: 'center' }} >
               <span className="fl mr20 edu-txt-center" style={{width:"160px"}}>示例图片</span>
               <span className="fl edu-txt-center mr20" style={{width:"160px"}}>
-                <ImageLayerHook parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
-                ></ImageLayerHook>
+                <ImageLayer2 parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
+                ></ImageLayer2>
                 <a href="javascript:void(0)" id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{borderBottom:"1px solid #ff6800"}}>查看大图</a>
                 </span>
             </div>

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -370,17 +370,17 @@ class InfosTopics extends Component{
 
 					{
 						`
-						  ::-webkit-scrollbar-thumb {
-									background-color: #cde5fe;
-
-									box-shadow: 0px 0px black;
-							}
-
-
-							::-webkit-scrollbar-track {
-									-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
-									background-color: #fff;
-							}
+						  // ::-webkit-scrollbar-thumb {
+							// 		background-color: #cde5fe;
+							//
+							// 		box-shadow: 0px 0px black;
+							// }
+							//
+							//
+							// ::-webkit-scrollbar-track {
+							// 		-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+							// 		background-color: #fff;
+							// }
 
 							.shaiContent li.shaiItem {
 					    padding: 0px 9px;

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -430,3 +430,7 @@
 .topsicinline{
     display: inline-block;
 }
+/* 防抖 */
+.educontent .square-list {
+  min-height: 400px;
+}

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -1,3 +1,7 @@
+/* 撑开滚动条，防抖 */
+.educontent > .itemWrap {
+    min-height: 400px;
+}
 .itemWrap {
     display: flex;
     flex-wrap: wrap;