diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js
index 12b89804b..3e9601bf8 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin.js
@@ -12,6 +12,7 @@
//= require jquery.cxselect
//= require bootstrap-datepicker
//= require bootstrap.viewer
+//= require jquery.mloading
//= require echarts
//= require lib/codemirror
diff --git a/app/assets/javascripts/admins/message-modal.js b/app/assets/javascripts/admins/message-modal.js
new file mode 100644
index 000000000..227d75776
--- /dev/null
+++ b/app/assets/javascripts/admins/message-modal.js
@@ -0,0 +1,14 @@
+$(document).on('turbolinks:load', function() {
+ var $modal = $('.modal.admin-message-modal');
+ if ($modal.length > 0) {
+ $modal.on('hide.bs.modal', function(){
+ $modal.find('.modal-body').html('');
+ });
+ }
+});
+
+function showMessageModal(html) {
+ var $modal = $('.modal.admin-message-modal');
+ $modal.find('.modal-body').html(html);
+ $modal.modal('show');
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/admins/users/index.js b/app/assets/javascripts/admins/users/index.js
index f0ddf1e0f..4d4f0f945 100644
--- a/app/assets/javascripts/admins/users/index.js
+++ b/app/assets/javascripts/admins/users/index.js
@@ -117,5 +117,73 @@ $(document).on('turbolinks:load', function(){
});
}
});
+
+
+ // 导入学生
+ var $importUserModal = $('.modal.admin-import-user-modal');
+ var $importUserForm = $importUserModal.find('form.admin-import-user-form')
+
+ $importUserModal.on('show.bs.modal', function(){
+ $importUserModal.find('.file-names').html('选择文件');
+ $importUserModal.find('.upload-file-input').trigger('click');
+ });
+ $importUserModal.find('.upload-file-input').on('change', function(e){
+ var file = $(this)[0].files[0];
+
+ $importUserModal.find('.file-names').html(file ? file.name : '请选择文件');
+ })
+
+ var importUserFormValid = function(){
+ if($importUserForm.find('input[name="file"]').val() == undefined || $importUserForm.find('input[name="file"]').val().length == 0){
+ $importUserForm.find('.error').html('请选择文件');
+ return false;
+ }
+
+ return true;
+ };
+
+ var buildResultMessage = function(data){
+ var messageHtml = "导入结果：成功" + data.success + "条，失败"+ data.fail.length + "条
";
+
+ if(data.fail.length > 0){
+ messageHtml += '数据 失败原因 ';
+
+ data.fail.forEach(function(item){
+ messageHtml += '' + item.data + ' ' + item.message + '
'
+ }
+
+ return messageHtml;
+ }
+
+ $importUserModal.on('click', '.submit-btn', function(){
+ $importUserForm.find('.error').html('');
+
+ if (importUserFormValid()) {
+ $('body').mLoading({ text: '正在导入...' });
+
+ $.ajax({
+ method: 'POST',
+ dataType: 'json',
+ url: '/admins/import_users',
+ data: new FormData($importUserForm[0]),
+ processData: false,
+ contentType: false,
+ success: function(data){
+ $('body').mLoading('destroy');
+ $importUserModal.modal('hide');
+
+ showMessageModal(buildResultMessage(data));
+ },
+ error: function(res){
+ $('body').mLoading('destroy');
+ var data = res.responseJSON;
+ $importUserForm.find('.error').html(data.message);
+ }
+ });
+ }
+ });
}
});
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 07a3c90d4..839fadb57 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,4 +16,3 @@
//= require jquery3
//= require popper
//= require bootstrap-sprockets
-//= require_tree .
diff --git a/app/assets/javascripts/jquery.mloading.js b/app/assets/javascripts/jquery.mloading.js
new file mode 100644
index 000000000..6230186ab
--- /dev/null
+++ b/app/assets/javascripts/jquery.mloading.js
@@ -0,0 +1,202 @@
+/* Author：mingyuhisoft@163.com
+ * Github:https://github.com/imingyu/jquery.mloading
+ * Npm:npm install jquery.mloading.js
+ * Date：2016-7-4
+ */
+
+;(function (root, factory) {
+ 'use strict';
+
+ if (typeof module === 'object' && typeof module.exports === 'object') {
+ factory(require('jquery'),root);
+ } if(typeof define ==="function"){
+ if(define.cmd){
+ define(function(require, exports, module){
+ var $ = require("jquery");
+ factory($,root);
+ });
+ }else{
+ define(["jquery"],function($){
+ factory($,root);
+ });
+ }
+ }else {
+ factory(root.jQuery,root);
+ }
+} (typeof window !=="undefined" ? window : this, function ($, root, undefined) {
+ 'use strict';
+ if(!$){
+ $ = root.jQuery || null;
+ }
+ if(!$){
+ throw new TypeError("必须引入jquery库方可正常使用！");
+ }
+
+ var arraySlice = Array.prototype.slice,
+ comparison=function (obj1,obj2) {
+ var result=true;
+ for(var pro in obj1){
+ if(obj1[pro] !== obj2[obj1]){
+ result=true;
+ break;
+ }
+ }
+ return result;
+ }
+
+ function MLoading(dom,options) {
+ options=options||{};
+ this.dom=dom;
+ this.options=$.extend(true,{},MLoading.defaultOptions,options);
+ this.curtain=null;
+ this.render().show();
+ }
+ MLoading.prototype={
+ constructor:MLoading,
+ initElement:function () {
+ var dom=this.dom,
+ ops=this.options;
+ var curtainElement=dom.children(".mloading"),
+ bodyElement = curtainElement.children('.mloading-body'),
+ barElement = bodyElement.children('.mloading-bar'),
+ iconElement = barElement.children('.mloading-icon'),
+ textElement = barElement.find(".mloading-text");
+ if (curtainElement.length == 0) {
+ curtainElement = $('
');
+ dom.append(curtainElement);
+ }
+ if (bodyElement.length == 0) {
+ bodyElement = $('
');
+ curtainElement.append(bodyElement);
+ }
+ if (barElement.length == 0) {
+ barElement = $('
');
+ bodyElement.append(barElement);
+ }
+ if (iconElement.length == 0) {
+ var _iconElement=document.createElement(ops.iconTag);
+ iconElement = $(_iconElement);
+ iconElement.addClass("mloading-icon");
+ barElement.append(iconElement);
+ }
+ if (textElement.length == 0) {
+ textElement = $('
- <%= form_tag(admins_users_path, method: :get, class: 'form-inline search-form', remote: true) do %>
+ <%= form_tag(admins_users_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
状态：
<% status_options = [['全部', ''], ['正常', User::STATUS_ACTIVE], ['未激活', User::STATUS_REGISTERED], ['已锁定', User::STATUS_LOCKED]] %>
@@ -26,10 +26,13 @@
<%= text_field_tag(:school_name, params[:school_name], class: 'form-control col-sm-2', placeholder: '学校/单位检索') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
<% end %>
+
+ <%= javascript_void_link '导入用户', class: 'btn btn-secondary btn-sm', data: { toggle: 'modal', target: '.admin-import-user-modal'} %>
<%= render partial: 'admins/users/shared/user_list', locals: { users: @users } %>
-<%= render partial: 'admins/users/shared/reward_grade_modal' %>
\ No newline at end of file
+<%= render partial: 'admins/users/shared/reward_grade_modal' %>
+<%= render partial: 'admins/users/shared/import_user_modal' %>
\ No newline at end of file
diff --git a/app/views/admins/users/shared/_import_user_modal.html.erb b/app/views/admins/users/shared/_import_user_modal.html.erb
new file mode 100644
index 000000000..ff3c725b9
--- /dev/null
+++ b/app/views/admins/users/shared/_import_user_modal.html.erb
@@ -0,0 +1,30 @@
+
\ No newline at end of file
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index fc16c0beb..330ca8fc0 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -35,5 +35,8 @@
+
+
+ <%= render 'admins/shared/modal/message_modal' %>