|
@@ -4,187 +4,187 @@
|
|
|
*/
|
|
|
$(function() {
|
|
|
|
|
|
- // layer扩展皮肤
|
|
|
- if (window.layer !== undefined) {
|
|
|
- layer.config({
|
|
|
- extend: 'moon/style.css',
|
|
|
- skin: 'layer-ext-moon'
|
|
|
- });
|
|
|
- }
|
|
|
+ // layer扩展皮肤
|
|
|
+ if (window.layer !== undefined) {
|
|
|
+ layer.config({
|
|
|
+ extend: 'moon/style.css',
|
|
|
+ skin: 'layer-ext-moon'
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- // 回到顶部绑定
|
|
|
- if ($.fn.toTop !== undefined) {
|
|
|
- $('#scroll-up').toTop();
|
|
|
- }
|
|
|
+ // 回到顶部绑定
|
|
|
+ if ($.fn.toTop !== undefined) {
|
|
|
+ $('#scroll-up').toTop();
|
|
|
+ }
|
|
|
|
|
|
- // select2复选框事件绑定
|
|
|
- if ($.fn.select2 !== undefined) {
|
|
|
+ // select2复选框事件绑定
|
|
|
+ if ($.fn.select2 !== undefined) {
|
|
|
$.fn.select2.defaults.set( "theme", "bootstrap" );
|
|
|
- $("select.form-control:not(.noselect2)").each(function () {
|
|
|
- $(this).select2().on("change", function () {
|
|
|
- $(this).valid();
|
|
|
- })
|
|
|
- })
|
|
|
- }
|
|
|
+ $("select.form-control:not(.noselect2)").each(function () {
|
|
|
+ $(this).select2().on("change", function () {
|
|
|
+ $(this).valid();
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
- // iCheck单选框及复选框事件绑定
|
|
|
- if ($.fn.iCheck !== undefined) {
|
|
|
- $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
|
|
|
+ // iCheck单选框及复选框事件绑定
|
|
|
+ if ($.fn.iCheck !== undefined) {
|
|
|
+ $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
|
|
|
$(this).iCheck({
|
|
|
checkboxClass: 'icheckbox-blue',
|
|
|
radioClass: 'iradio-blue',
|
|
|
})
|
|
|
})
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- // 气泡弹出框特效(移到元素时)
|
|
|
- $(document).on("mouseenter", '.table [data-toggle="popover"]', function() {
|
|
|
- var _this = this;
|
|
|
- $(this).popover("show");
|
|
|
- $(".popover").on("mouseleave", function() {
|
|
|
- $(_this).popover('hide');
|
|
|
- });
|
|
|
- })
|
|
|
+ // 气泡弹出框特效(移到元素时)
|
|
|
+ $(document).on("mouseenter", '.table [data-toggle="popover"]', function() {
|
|
|
+ var _this = this;
|
|
|
+ $(this).popover("show");
|
|
|
+ $(".popover").on("mouseleave", function() {
|
|
|
+ $(_this).popover('hide');
|
|
|
+ });
|
|
|
+ })
|
|
|
|
|
|
- // 气泡弹出框特效(离开元素时)
|
|
|
- $(document).on("mouseleave", '.table [data-toggle="popover"]', function() {
|
|
|
- var _this = this;
|
|
|
- setTimeout(function() {
|
|
|
- if (!$(".popover:hover").length) $(_this).popover("hide");
|
|
|
- }, 100);
|
|
|
- });
|
|
|
+ // 气泡弹出框特效(离开元素时)
|
|
|
+ $(document).on("mouseleave", '.table [data-toggle="popover"]', function() {
|
|
|
+ var _this = this;
|
|
|
+ setTimeout(function() {
|
|
|
+ if (!$(".popover:hover").length) $(_this).popover("hide");
|
|
|
+ }, 100);
|
|
|
+ });
|
|
|
|
|
|
- // 取消回车自动提交表单
|
|
|
- $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) {
|
|
|
+ // 取消回车自动提交表单
|
|
|
+ $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) {
|
|
|
if (event.keyCode == 13) {
|
|
|
event.preventDefault();
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- // laydate 时间控件绑定
|
|
|
- if ($(".select-time").length > 0) {
|
|
|
- layui.use('laydate', function() {
|
|
|
- var laydate = layui.laydate;
|
|
|
- var startDate = laydate.render({
|
|
|
- elem: '#startTime',
|
|
|
- max: $('#endTime').val(),
|
|
|
- theme: 'molv',
|
|
|
- trigger: 'click',
|
|
|
- done: function(value, date) {
|
|
|
- // 结束时间大于开始时间
|
|
|
- if (value !== '') {
|
|
|
- endDate.config.min.year = date.year;
|
|
|
- endDate.config.min.month = date.month - 1;
|
|
|
- endDate.config.min.date = date.date;
|
|
|
- } else {
|
|
|
- endDate.config.min.year = '';
|
|
|
- endDate.config.min.month = '';
|
|
|
- endDate.config.min.date = '';
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- var endDate = laydate.render({
|
|
|
- elem: '#endTime',
|
|
|
- min: $('#startTime').val(),
|
|
|
- theme: 'molv',
|
|
|
- trigger: 'click',
|
|
|
- done: function(value, date) {
|
|
|
- // 开始时间小于结束时间
|
|
|
- if (value !== '') {
|
|
|
- startDate.config.max.year = date.year;
|
|
|
- startDate.config.max.month = date.month - 1;
|
|
|
- startDate.config.max.date = date.date;
|
|
|
- } else {
|
|
|
- startDate.config.max.year = '2099';
|
|
|
- startDate.config.max.month = '12';
|
|
|
- startDate.config.max.date = '31';
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- });
|
|
|
- }
|
|
|
+ // laydate 时间控件绑定
|
|
|
+ if ($(".select-time").length > 0) {
|
|
|
+ layui.use('laydate', function() {
|
|
|
+ var laydate = layui.laydate;
|
|
|
+ var startDate = laydate.render({
|
|
|
+ elem: '#startTime',
|
|
|
+ max: $('#endTime').val(),
|
|
|
+ theme: 'molv',
|
|
|
+ trigger: 'click',
|
|
|
+ done: function(value, date) {
|
|
|
+ // 结束时间大于开始时间
|
|
|
+ if (value !== '') {
|
|
|
+ endDate.config.min.year = date.year;
|
|
|
+ endDate.config.min.month = date.month - 1;
|
|
|
+ endDate.config.min.date = date.date;
|
|
|
+ } else {
|
|
|
+ endDate.config.min.year = '';
|
|
|
+ endDate.config.min.month = '';
|
|
|
+ endDate.config.min.date = '';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ var endDate = laydate.render({
|
|
|
+ elem: '#endTime',
|
|
|
+ min: $('#startTime').val(),
|
|
|
+ theme: 'molv',
|
|
|
+ trigger: 'click',
|
|
|
+ done: function(value, date) {
|
|
|
+ // 开始时间小于结束时间
|
|
|
+ if (value !== '') {
|
|
|
+ startDate.config.max.year = date.year;
|
|
|
+ startDate.config.max.month = date.month - 1;
|
|
|
+ startDate.config.max.date = date.date;
|
|
|
+ } else {
|
|
|
+ startDate.config.max.year = '2099';
|
|
|
+ startDate.config.max.month = '12';
|
|
|
+ startDate.config.max.date = '31';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- // laydate time-input 时间控件绑定
|
|
|
- if ($(".time-input").length > 0) {
|
|
|
- layui.use('laydate', function () {
|
|
|
- var com = layui.laydate;
|
|
|
- $(".time-input").each(function (index, item) {
|
|
|
- var time = $(item);
|
|
|
- // 控制控件外观
|
|
|
- var type = time.attr("data-type") || 'date';
|
|
|
- // 控制回显格式
|
|
|
- var format = time.attr("data-format") || 'yyyy-MM-dd';
|
|
|
- // 控制日期控件按钮
|
|
|
- var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
|
|
|
- // 日期控件选择完成后回调处理
|
|
|
- var callback = time.attr("data-callback") || {};
|
|
|
- if (buttons) {
|
|
|
- if (buttons.indexOf("|") > 0) {
|
|
|
- var btnArr = buttons.split("|"), btnLen = btnArr.length;
|
|
|
- for (var j = 0; j < btnLen; j++) {
|
|
|
- if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) {
|
|
|
- newBtnArr.push(btnArr[j]);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- if ("clear" === buttons || "now" === buttons || "confirm" === buttons) {
|
|
|
- newBtnArr.push(buttons);
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- newBtnArr = ['clear', 'now', 'confirm'];
|
|
|
- }
|
|
|
- com.render({
|
|
|
- elem: item,
|
|
|
- theme: 'molv',
|
|
|
- trigger: 'click',
|
|
|
- type: type,
|
|
|
- format: format,
|
|
|
- btns: newBtnArr,
|
|
|
- done: function (value, data) {
|
|
|
- if (typeof window[callback] != 'undefined'
|
|
|
- && window[callback] instanceof Function) {
|
|
|
- window[callback](value, data);
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- });
|
|
|
- });
|
|
|
- }
|
|
|
+ // laydate time-input 时间控件绑定
|
|
|
+ if ($(".time-input").length > 0) {
|
|
|
+ layui.use('laydate', function () {
|
|
|
+ var com = layui.laydate;
|
|
|
+ $(".time-input").each(function (index, item) {
|
|
|
+ var time = $(item);
|
|
|
+ // 控制控件外观
|
|
|
+ var type = time.attr("data-type") || 'date';
|
|
|
+ // 控制回显格式
|
|
|
+ var format = time.attr("data-format") || 'yyyy-MM-dd';
|
|
|
+ // 控制日期控件按钮
|
|
|
+ var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
|
|
|
+ // 日期控件选择完成后回调处理
|
|
|
+ var callback = time.attr("data-callback") || {};
|
|
|
+ if (buttons) {
|
|
|
+ if (buttons.indexOf("|") > 0) {
|
|
|
+ var btnArr = buttons.split("|"), btnLen = btnArr.length;
|
|
|
+ for (var j = 0; j < btnLen; j++) {
|
|
|
+ if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) {
|
|
|
+ newBtnArr.push(btnArr[j]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if ("clear" === buttons || "now" === buttons || "confirm" === buttons) {
|
|
|
+ newBtnArr.push(buttons);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ newBtnArr = ['clear', 'now', 'confirm'];
|
|
|
+ }
|
|
|
+ com.render({
|
|
|
+ elem: item,
|
|
|
+ theme: 'molv',
|
|
|
+ trigger: 'click',
|
|
|
+ type: type,
|
|
|
+ format: format,
|
|
|
+ btns: newBtnArr,
|
|
|
+ done: function (value, data) {
|
|
|
+ if (typeof window[callback] != 'undefined'
|
|
|
+ && window[callback] instanceof Function) {
|
|
|
+ window[callback](value, data);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- // tree 关键字搜索绑定
|
|
|
- if ($("#keyword").length > 0) {
|
|
|
- $("#keyword").bind("focus", function focusKey(e) {
|
|
|
- if ($("#keyword").hasClass("empty")) {
|
|
|
- $("#keyword").removeClass("empty");
|
|
|
- }
|
|
|
- }).bind("blur", function blurKey(e) {
|
|
|
- if ($("#keyword").val() === "") {
|
|
|
- $("#keyword").addClass("empty");
|
|
|
- }
|
|
|
- $.tree.searchNode(e);
|
|
|
- }).bind("input propertychange", $.tree.searchNode);
|
|
|
- }
|
|
|
+ // tree 关键字搜索绑定
|
|
|
+ if ($("#keyword").length > 0) {
|
|
|
+ $("#keyword").bind("focus", function focusKey(e) {
|
|
|
+ if ($("#keyword").hasClass("empty")) {
|
|
|
+ $("#keyword").removeClass("empty");
|
|
|
+ }
|
|
|
+ }).bind("blur", function blurKey(e) {
|
|
|
+ if ($("#keyword").val() === "") {
|
|
|
+ $("#keyword").addClass("empty");
|
|
|
+ }
|
|
|
+ $.tree.searchNode(e);
|
|
|
+ }).bind("input propertychange", $.tree.searchNode);
|
|
|
+ }
|
|
|
|
|
|
- // tree表格树 展开/折叠
|
|
|
- var expandFlag;
|
|
|
- $("#expandAllBtn").click(function() {
|
|
|
- var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll;
|
|
|
- expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag;
|
|
|
- if (!expandFlag) {
|
|
|
- $.bttTable.bootstrapTreeTable('expandAll');
|
|
|
- } else {
|
|
|
- $.bttTable.bootstrapTreeTable('collapseAll');
|
|
|
- }
|
|
|
- expandFlag = expandFlag ? false: true;
|
|
|
- })
|
|
|
+ // tree表格树 展开/折叠
|
|
|
+ var expandFlag;
|
|
|
+ $("#expandAllBtn").click(function() {
|
|
|
+ var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll;
|
|
|
+ expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag;
|
|
|
+ if (!expandFlag) {
|
|
|
+ $.bttTable.bootstrapTreeTable('expandAll');
|
|
|
+ } else {
|
|
|
+ $.bttTable.bootstrapTreeTable('collapseAll');
|
|
|
+ }
|
|
|
+ expandFlag = expandFlag ? false: true;
|
|
|
+ })
|
|
|
|
|
|
- // 按下ESC按钮关闭弹层
|
|
|
- $('body', document).on('keyup', function(e) {
|
|
|
- if (e.which === 27) {
|
|
|
- $.modal.closeAll();
|
|
|
- }
|
|
|
- });
|
|
|
+ // 按下ESC按钮关闭弹层
|
|
|
+ $('body', document).on('keyup', function(e) {
|
|
|
+ if (e.which === 27) {
|
|
|
+ $.modal.closeAll();
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
|
|
|
(function ($) {
|
|
@@ -233,8 +233,8 @@ $(function() {
|
|
|
/** 刷新选项卡 */
|
|
|
var refreshItem = function(){
|
|
|
var topWindow = $(window.parent.document);
|
|
|
- var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
|
|
|
- var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow);
|
|
|
+ var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
|
|
|
+ var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow);
|
|
|
var url = target.attr('src');
|
|
|
target.attr('src', url).ready();
|
|
|
}
|
|
@@ -243,29 +243,29 @@ var refreshItem = function(){
|
|
|
var closeItem = function(dataId){
|
|
|
var topWindow = $(window.parent.document);
|
|
|
if($.common.isNotEmpty(dataId)){
|
|
|
- window.parent.$.modal.closeLoading();
|
|
|
- // 根据dataId关闭指定选项卡
|
|
|
- $('.menuTab[data-id="' + dataId + '"]', topWindow).remove();
|
|
|
- // 移除相应tab对应的内容区
|
|
|
- $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove();
|
|
|
- return;
|
|
|
+ window.parent.$.modal.closeLoading();
|
|
|
+ // 根据dataId关闭指定选项卡
|
|
|
+ $('.menuTab[data-id="' + dataId + '"]', topWindow).remove();
|
|
|
+ // 移除相应tab对应的内容区
|
|
|
+ $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove();
|
|
|
+ return;
|
|
|
}
|
|
|
var panelUrl = window.frameElement.getAttribute('data-panel');
|
|
|
$('.page-tabs-content .active i', topWindow).click();
|
|
|
if($.common.isNotEmpty(panelUrl)){
|
|
|
- $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active');
|
|
|
- $('.mainContent .RuoYi_iframe', topWindow).each(function() {
|
|
|
- if ($(this).data('id') == panelUrl) {
|
|
|
- $(this).show().siblings('.RuoYi_iframe').hide();
|
|
|
- return false;
|
|
|
+ $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active');
|
|
|
+ $('.mainContent .RuoYi_iframe', topWindow).each(function() {
|
|
|
+ if ($(this).data('id') == panelUrl) {
|
|
|
+ $(this).show().siblings('.RuoYi_iframe').hide();
|
|
|
+ return false;
|
|
|
}
|
|
|
- });
|
|
|
- }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/** 创建选项卡 */
|
|
|
function createMenuItem(dataUrl, menuName) {
|
|
|
- var panelUrl = window.frameElement.getAttribute('data-id');
|
|
|
+ var panelUrl = window.frameElement.getAttribute('data-id');
|
|
|
dataIndex = $.common.random(1, 100),
|
|
|
flag = true;
|
|
|
if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
|
|
@@ -300,7 +300,7 @@ function createMenuItem(dataUrl, menuName) {
|
|
|
|
|
|
window.parent.$.modal.loading("数据加载中,请稍后...");
|
|
|
$('.mainContent iframe:visible', topWindow).load(function () {
|
|
|
- window.parent.$.modal.closeLoading();
|
|
|
+ window.parent.$.modal.closeLoading();
|
|
|
});
|
|
|
|
|
|
// 添加选项卡
|
|
@@ -312,7 +312,7 @@ function createMenuItem(dataUrl, menuName) {
|
|
|
|
|
|
// 滚动到指定选项卡
|
|
|
function scrollToTab(element) {
|
|
|
- var topWindow = $(window.parent.document);
|
|
|
+ var topWindow = $(window.parent.document);
|
|
|
var marginLeftVal = calSumWidth($(element).prevAll()),
|
|
|
marginRightVal = calSumWidth($(element).nextAll());
|
|
|
// 可视区域非tab宽度
|
|
@@ -349,28 +349,28 @@ function calSumWidth(elements) {
|
|
|
|
|
|
/** 密码规则范围验证 */
|
|
|
function checkpwd(chrtype, password) {
|
|
|
- if (chrtype == 1) {
|
|
|
- if(!$.common.numValid(password)){
|
|
|
- $.modal.alertWarning("密码只能为0-9数字");
|
|
|
- return false;
|
|
|
- }
|
|
|
- } else if (chrtype == 2) {
|
|
|
- if(!$.common.enValid(password)){
|
|
|
- $.modal.alertWarning("密码只能为a-z和A-Z字母");
|
|
|
- return false;
|
|
|
- }
|
|
|
- } else if (chrtype == 3) {
|
|
|
- if(!$.common.enNumValid(password)){
|
|
|
- $.modal.alertWarning("密码必须包含字母以及数字");
|
|
|
- return false;
|
|
|
- }
|
|
|
- } else if (chrtype == 4) {
|
|
|
- if(!$.common.charValid(password)){
|
|
|
- $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号<font color='red'>~!@#$%^&*()-=_+</font>");
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
- return true;
|
|
|
+ if (chrtype == 1) {
|
|
|
+ if(!$.common.numValid(password)){
|
|
|
+ $.modal.alertWarning("密码只能为0-9数字");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ } else if (chrtype == 2) {
|
|
|
+ if(!$.common.enValid(password)){
|
|
|
+ $.modal.alertWarning("密码只能为a-z和A-Z字母");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ } else if (chrtype == 3) {
|
|
|
+ if(!$.common.enNumValid(password)){
|
|
|
+ $.modal.alertWarning("密码必须包含字母以及数字");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ } else if (chrtype == 4) {
|
|
|
+ if(!$.common.charValid(password)){
|
|
|
+ $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号<font color='red'>~!@#$%^&*()-=_+</font>");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
// 日志打印封装处理
|
|
@@ -411,21 +411,21 @@ var sub = {
|
|
|
var count = $("#" + table.options.id).bootstrapTable('getData').length;
|
|
|
var params = new Array();
|
|
|
for (var dataIndex = 0; dataIndex <= count; dataIndex++) {
|
|
|
- var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
|
|
|
- var obj = new Object();
|
|
|
- for (var i = 0; i < columns.length; i++) {
|
|
|
- var inputValue = $(columns[i]).find('input');
|
|
|
- var selectValue = $(columns[i]).find('select');
|
|
|
- var key = table.options.columns[i].field;
|
|
|
- if ($.common.isNotEmpty(inputValue.val())) {
|
|
|
- obj[key] = inputValue.val();
|
|
|
- } else if ($.common.isNotEmpty(selectValue.val())) {
|
|
|
- obj[key] = selectValue.val();
|
|
|
- } else {
|
|
|
- obj[key] = "";
|
|
|
- }
|
|
|
- }
|
|
|
- params.push({ index: dataIndex, row: obj });
|
|
|
+ var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
|
|
|
+ var obj = new Object();
|
|
|
+ for (var i = 0; i < columns.length; i++) {
|
|
|
+ var inputValue = $(columns[i]).find('input');
|
|
|
+ var selectValue = $(columns[i]).find('select');
|
|
|
+ var key = table.options.columns[i].field;
|
|
|
+ if ($.common.isNotEmpty(inputValue.val())) {
|
|
|
+ obj[key] = inputValue.val();
|
|
|
+ } else if ($.common.isNotEmpty(selectValue.val())) {
|
|
|
+ obj[key] = selectValue.val();
|
|
|
+ } else {
|
|
|
+ obj[key] = "";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ params.push({ index: dataIndex, row: obj });
|
|
|
}
|
|
|
$("#" + table.options.id).bootstrapTable("updateRow", params);
|
|
|
},
|
|
@@ -445,12 +445,12 @@ var sub = {
|
|
|
$.ajaxSetup({
|
|
|
complete: function(XMLHttpRequest, textStatus) {
|
|
|
if (textStatus == 'timeout') {
|
|
|
- $.modal.alertWarning("服务器超时,请稍后再试!");
|
|
|
- $.modal.enable();
|
|
|
+ $.modal.alertWarning("服务器超时,请稍后再试!");
|
|
|
+ $.modal.enable();
|
|
|
$.modal.closeLoading();
|
|
|
} else if (textStatus == "parsererror" || textStatus == "error") {
|
|
|
- $.modal.alertWarning("服务器错误,请联系管理员!");
|
|
|
- $.modal.enable();
|
|
|
+ $.modal.alertWarning("服务器错误,请联系管理员!");
|
|
|
+ $.modal.enable();
|
|
|
$.modal.closeLoading();
|
|
|
}
|
|
|
}
|