diff --git a/src/main/resources/static/ruoyi/css/ry-ui.css b/src/main/resources/static/ruoyi/css/ry-ui.css
index 1b74afd7..fec1de99 100644
--- a/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -335,8 +335,13 @@ label {
}
}
+@media ( min-width : 768px) {
+ .select-list li {
+ float: left;
+ }
+}
+
.select-list li {
- float: left;
color: #333;
margin: 5px 15px 5px 0px;
}
diff --git a/src/main/resources/static/ruoyi/js/ry-ui.js b/src/main/resources/static/ruoyi/js/ry-ui.js
index 99af28bf..90db6beb 100644
--- a/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -304,8 +304,16 @@
shade: 0.3,
title: title,
content: url,
+ btn: ['确定', '关闭'],
// 弹层外区域关闭
- shadeClose: true
+ shadeClose: true,
+ yes: function(index, layero) {
+ var iframeWin = layero.find('iframe')[0];
+ iframeWin.contentWindow.submitHandler();
+ },
+ cancel: function(index) {
+ return true;
+ }
});
},
// 弹出层指定参数选项
@@ -401,8 +409,23 @@
},
// 详细信息
detail: function(id) {
- var url = $.common.isEmpty(id) ? $.table._option.detailUrl : $.table._option.detailUrl.replace("{id}", id);
- $.modal.open($.table._option.modalName + "详细", url);
+ var _url = $.common.isEmpty(id) ? $.table._option.detailUrl : $.table._option.detailUrl.replace("{id}", id);
+ layer.open({
+ type: 2,
+ area: ['800px', ($(window).height() - 50) + 'px'],
+ fix: false,
+ //不固定
+ maxmin: true,
+ shade: 0.3,
+ title: $.table._option.modalName + "详细",
+ content: _url,
+ btn: [' 关闭'],
+ // 弹层外区域关闭
+ shadeClose: true,
+ cancel: function(index) {
+ return true;
+ }
+ });
},
// 删除信息
remove: function(id) {
@@ -494,6 +517,13 @@
return true;
}
return false;
+ },
+ // 表单验证
+ form: function (id) {
+ if ($.common.isEmpty(id)) {
+ return false;
+ }
+ return $(id).validate().form();
}
},
// 树插件封装处理
diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html
index beacb3c0..1411ee77 100644
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@@ -58,12 +58,6 @@
-
@@ -86,6 +80,12 @@
$.operate.save(prefix + "/add", $('#form-job-add').serialize());
}
});
+
+ function submitHandler() {
+ if ($.validate.form("#form-job-add")) {
+ $.operate.save(prefix + "/add", $('#form-job-add').serialize());
+ }
+ }