 %>){kind=avatar}
+ <% end %>
+ ') %>
#{user.student_id}" : '' %>
| 头像 | +姓名 | +身份证号 | +学校/单位 | +职称 | + <% unless is_processed %> ++ 照片 + + | + <% end %> +时间 | + <% if is_processed %> +拒绝原因 | +状态 | + <% else %> +操作 | + <% end %> +
|---|---|---|---|---|---|---|---|---|---|
|
+ <%= link_to "/users/#{user.login}", class: 'identity-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+
+ <% end %>
+ |
+ <%= user.real_name %> | +<%= user.ID_number %> | +<%= raw [user.school_name.presence, user.department_name.presence].compact.join(' ') %> |
+ <%= user.identity %> <%= raw user.user_extension.student? && user.student_id ? " #{user.student_id}" : '' %> |
+
+ <% unless is_processed %>
+ + <% if File.exists?(disk_real_name_auth_filename(user.id)) %> + <%= image_tag(real_name_auth_file_url(user.id).to_s + "?#{Time.now.to_i}", width: 40, height: 40, class: 'preview-image auth-image', data: { toggle: 'tooltip', title: '点击预览' }) %> + <% else %> + <%= content_tag(:span, '图片已删除', class: 'text-secondary') %> + <% end %> + | + <% end %> + +<%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %> | + + <% if is_processed %> +<%= overflow_hidden_span apply.remarks, width: 140 %> | +<%= apply.status_text %> | + <% else %> ++ <%= agree_link '同意', agree_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %> + <%= javascript_void_link('拒绝', class: 'action refuse-action', + data: { + toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, + url: refuse_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}") + }) %> + | + <% end %> +
| 头像 | +姓名 | +学校/单位 | +职称 | + <% unless is_processed %> ++ 照片 + + | + <% end %> +时间 | + <% if is_processed %> +拒绝原因 | +状态 | + <% else %> +操作 | + <% end %> +
|---|---|---|---|---|---|---|---|---|
|
+ <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+
+ <% end %>
+ |
+ <%= user.real_name %> | +<%= raw [user.school_name.presence, user.department_name.presence].compact.join(' ') %> |
+ <%= user.identity %> <%= raw user.user_extension.student? && user.student_id ? " #{user.student_id}" : '' %> |
+
+ <% unless is_processed %>
+ + <% if File.exists?(disk_professional_auth_filename(user.id)) %> + <%= image_tag(professional_auth_file_url(user.id).to_s + "?#{Time.now.to_i}", width: 40, height: 40, class: 'preview-image auth-image', data: { toggle: 'tooltip', title: '点击预览' }) %> + <% else %> + <%= content_tag(:span, '图片已删除', class: 'text-secondary') %> + <% end %> + | + <% end %> + +<%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %> | + + <% if is_processed %> +<%= overflow_hidden_span apply.remarks, width: 140 %> | +<%= apply.status_text %> | + <% else %> ++ <%= agree_link '同意', agree_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %> + <%= javascript_void_link('拒绝', class: 'action refuse-action', + data: { + toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, + url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}") + }) %> + | + <% end %> +
| 头像 | +创建者 | +实训名称 | +任务数 | +时间 | + <% if is_processed %> +拒绝原因 | +状态 | + <% else %> +操作 | + <% end %> +
|---|---|---|---|---|---|---|---|
|
+ <%= link_to "/users/#{user.login}", class: 'shixun-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+
+ <% end %>
+ |
+ <%= user.real_name %> | ++ <%= link_to "/shixuns/#{shixun.identifier}", target: '_blank' do %> + <%= overflow_hidden_span shixun.name, width: 300 %> + <% end %> + | +<%= shixun.challenges_count %> | +<%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %> | + + <% if is_processed %> +<%= overflow_hidden_span apply.reason, width: 140 %> | +<%= apply.status_text %> | + <% else %> ++ <%= agree_link '同意', agree_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %> + <%= javascript_void_link('拒绝', class: 'action refuse-action', + data: { + toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, + url: refuse_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}") + }) %> + | + <% end %> +
| 头像 | +创建者 | +实践课程名称 | +阶段数 | +实训数 | +关卡数 | +时间 | + <% if is_processed %> +拒绝原因 | +状态 | + <% else %> +操作 | + <% end %> +
|---|---|---|---|---|---|---|---|---|---|
|
+ <%= link_to "/users/#{user.login}", class: 'subject-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+
+ <% end %>
+ |
+ <%= user.real_name %> | ++ <%= link_to "/paths/#{subject.id}", target: '_blank' do %> + <%= overflow_hidden_span subject.name, width: 300 %> + <% end %> + | +<%= subject.stages_count %> | +<%= subject.shixuns_count %> | +<%= challenge_count_map.fetch(subject.id, 0) %> | +<%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %> | + + <% if is_processed %> +<%= overflow_hidden_span apply.reason, width: 140 %> | +<%= apply.status_text %> | + <% else %> ++ <%= agree_link '同意', agree_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %> + <%= javascript_void_link('拒绝', class: 'action refuse-action', + data: { + toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, + url: refuse_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}") + }) %> + | + <% end %> +
| ID | -真实姓名 | +真实姓名 | 邮件地址 | 手机号码 | 单位 | -<%= sort_tag('创建于', name: 'created_on', path: admins_users_path) %> | -<%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %> | -<%= sort_tag('经验值', name: 'experience', path: admins_users_path) %> | -<%= sort_tag('金币', name: 'grade', path: admins_users_path) %> | -操作 | +<%= sort_tag('创建于', name: 'created_on', path: admins_users_path) %> | +<%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %> | +<%= sort_tag('经验值', name: 'experience', path: admins_users_path) %> | +<%= sort_tag('金币', name: 'grade', path: admins_users_path) %> | +操作 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + | <%= link_to "/users/#{user.login}", target: '_blank' do %> - <%= overflow_hidden_span user.login, width: 100 %> - <% end %> - | -- <%= link_to edit_admins_user_path(user) do %> <%= overflow_hidden_span user.real_name, width: 100 %> <% end %> | @@ -35,6 +29,8 @@<%= user.experience.to_i %> | <%= user.grade.to_i %> |
+ <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
+
<%= javascript_void_link('奖励', class: 'action reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
<%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id, confirm: '确认解锁吗？' }, style: user.locked? ? '' : 'display: none;' %>
diff --git a/config/locales/apply_actions/zh-CN.yml b/config/locales/apply_actions/zh-CN.yml
new file mode 100644
index 000000000..933ef6223
--- /dev/null
+++ b/config/locales/apply_actions/zh-CN.yml
@@ -0,0 +1,7 @@
+zh-CN:
+ apply_action:
+ status:
+ '0': '待处理'
+ '1': '已同意'
+ '2': '已拒绝'
+ '3': '已撤销'
\ No newline at end of file
diff --git a/config/locales/apply_user_authentications/zh-CN.yml b/config/locales/apply_user_authentications/zh-CN.yml
new file mode 100644
index 000000000..e886c2695
--- /dev/null
+++ b/config/locales/apply_user_authentications/zh-CN.yml
@@ -0,0 +1,7 @@
+zh-CN:
+ apply_user_authentication:
+ status:
+ '0': '待处理'
+ '1': '已同意'
+ '2': '已拒绝'
+ '3': '已撤销'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5ed8ecd69..7e2cf72f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -753,7 +753,7 @@ Rails.application.routes.draw do
get :contrast, on: :collection
end
- resources :users, only: [:index, :edit, :update] do
+ resources :users, only: [:index, :edit, :update, :destroy] do
member do
post :reward_grade
post :lock
@@ -761,6 +761,31 @@ Rails.application.routes.draw do
post :active
end
end
+
+ resources :identity_authentications, only: [:index] do
+ member do
+ post :agree
+ post :refuse
+ end
+ end
+ resources :professional_authentications, only: [:index] do
+ member do
+ post :agree
+ post :refuse
+ end
+ end
+ resources :shixun_authorizations, only: [:index] do
+ member do
+ post :agree
+ post :refuse
+ end
+ end
+ resources :subject_authorizations, only: [:index] do
+ member do
+ post :agree
+ post :refuse
+ end
+ end
end
#git 认证回调
diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index b02f6a73f..2df6270c2 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -337,6 +337,17 @@ class BoardsNew extends Component{
}
+
-
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 7c499430a..fae87fb65 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -377,15 +377,23 @@ class GraduationTasksnew extends Component {
margin-top: 0px;
margin-bottom: 0px;
}
+ .yslgts .ant-input{
+ border-right: none !important;
+ height: 40px !important;
+ }
`
}
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index ca79e8ac5..525e13922 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -389,6 +389,17 @@ class NewWork extends Component{
{/* onSubmit={this.handleSubmit} */}
+
+
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index f847c87d3..10beb4507 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -287,11 +287,19 @@ class Eduinforms extends Component{
*
+
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 42a128719..869295c59 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -375,11 +375,21 @@ class GraduationTasksedit extends Component{
（选择确认后，无法修改）
-
+
+ {/*
+ 翻转课堂
+ >
+
-
+ className="searchViewAfter yslpollls">
{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"} +{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"} 返回
-
![]({getImageUrl("images/edu_user/EWM.jpg")})
+ ![]({getImageUrl("images/educoder/EWM.jpg")})
微信扫一扫 关注公众号 diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 48e1af926..5a569192c 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -1103,6 +1103,10 @@ class LoginRegisterComponent extends Component { right: 12px; height: 20px; } + .ant-input{ + border-right: none !important; + height: 40px !important; + } ` } @@ -1112,7 +1116,7 @@ class LoginRegisterComponent extends Component { autoComplete="new-password" onClick={this.changeType} value={this.state.passwords} onChange={this.passwordonChanges} - suffix={ + addonAfter={基本信息
-
+
标题：
- {String(title.length)}/{MAX_LENGTH}
}
- className="titleInput"
+ className="titleInput titleInputysl"
>
|