优化一些小细节

master
RuoYi 2021-08-31 18:38:21 +08:00
parent 50d200d5c8
commit 1878b10daa
10 changed files with 16 additions and 36 deletions

View File

@ -457,4 +457,3 @@ select.selectpicker {
width: 100%; width: 100%;
float: none; float: none;
} }
/*# sourceMappingURL=bootstrap-select.css.map */

View File

@ -618,4 +618,3 @@
.input-group-addon:not(:first-child) { .input-group-addon:not(:first-child) {
border-left: 0; border-left: 0;
} }
/*# sourceMappingURL=jasny-bootstrap.css.map */

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -388,8 +388,7 @@ var table = {
}, },
// 下载模板 // 下载模板
importTemplate: function() { importTemplate: function() {
table.set(); $.get(activeWindow().table.options.importTemplateUrl, function(result) {
$.get(table.options.importTemplateUrl, function(result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) { } else if (result.code == web_status.WARNING) {

View File

@ -52,16 +52,9 @@
$(function() { $(function() {
var options = { var options = {
url: prefix + "/allocatedList", url: prefix + "/allocatedList",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
importUrl: prefix + "/importData",
importTemplateUrl: prefix + "/importTemplate",
queryParams: queryParams, queryParams: queryParams,
sortName: "createTime", sortName: "createTime",
sortOrder: "desc", sortOrder: "desc",
modalName: "用户",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },

View File

@ -40,16 +40,9 @@
$(function() { $(function() {
var options = { var options = {
url: prefix + "/unallocatedList", url: prefix + "/unallocatedList",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
importUrl: prefix + "/importData",
importTemplateUrl: prefix + "/importTemplate",
queryParams: queryParams, queryParams: queryParams,
sortName: "createTime", sortName: "createTime",
sortOrder: "desc", sortOrder: "desc",
modalName: "用户",
showSearch: false, showSearch: false,
showRefresh: false, showRefresh: false,
showToggle: false, showToggle: false,

View File

@ -54,6 +54,10 @@
<label> <label>
<input type="radio" id="sec_assign" name="rdoSecond">指定 <input type="radio" id="sec_assign" name="rdoSecond">指定
<div class="checkbox"> <div class="checkbox">
<div class="checkbox-primary">
<input type="checkbox" id="zdSecond0" name="zd_second" value="0">
<label for="zdSecond0">0</label>
</div>
<div class="checkbox-primary"> <div class="checkbox-primary">
<input type="checkbox" id="zdSecond1" name="zd_second" value="1"> <input type="checkbox" id="zdSecond1" name="zd_second" value="1">
<label for="zdSecond1">1</label> <label for="zdSecond1">1</label>
@ -290,10 +294,6 @@
<input type="checkbox" id="zdSecond59" name="zd_second" value="59"> <input type="checkbox" id="zdSecond59" name="zd_second" value="59">
<label for="zdSecond59">59</label> <label for="zdSecond59">59</label>
</div> </div>
<div class="checkbox-primary">
<input type="checkbox" id="zdSecond60" name="zd_second" value="60">
<label for="zdSecond60">60</label>
</div>
</div> </div>
</label> </label>
</div> </div>
@ -332,6 +332,10 @@
<label> <label>
<input type="radio" id="min_assign" name="rdoMinute">指定 <input type="radio" id="min_assign" name="rdoMinute">指定
<div class="checkbox"> <div class="checkbox">
<div class="checkbox-primary">
<input type="checkbox" id="zdMinute0" name="zd_minute" value="0">
<label for="zdMinute0">0</label>
</div>
<div class="checkbox-primary"> <div class="checkbox-primary">
<input type="checkbox" id="zdMinute1" name="zd_minute" value="1"> <input type="checkbox" id="zdMinute1" name="zd_minute" value="1">
<label for="zdMinute1">1</label> <label for="zdMinute1">1</label>
@ -568,10 +572,6 @@
<input type="checkbox" id="zdMinute59" name="zd_minute" value="59"> <input type="checkbox" id="zdMinute59" name="zd_minute" value="59">
<label for="zdMinute59">59</label> <label for="zdMinute59">59</label>
</div> </div>
<div class="checkbox-primary">
<input type="checkbox" id="zdMinute60" name="zd_minute" value="60">
<label for="zdMinute60">60</label>
</div>
</div> </div>
</label> </label>
</div> </div>
@ -611,6 +611,10 @@
<input type="radio" id="hour_assign" name="rdoMinute">指定 <input type="radio" id="hour_assign" name="rdoMinute">指定
<div class="checkbox"> <div class="checkbox">
<label>AM:</label> <label>AM:</label>
<div class="checkbox-primary">
<input type="checkbox" id="zdHour0" name="zd_hour" value="0">
<label for="zdHour0">0</label>
</div>
<div class="checkbox-primary"> <div class="checkbox-primary">
<input type="checkbox" id="zdHour1" name="zd_hour" value="1"> <input type="checkbox" id="zdHour1" name="zd_hour" value="1">
<label for="zdHour1">1</label> <label for="zdHour1">1</label>
@ -655,12 +659,12 @@
<input type="checkbox" id="zdHour11" name="zd_hour" value="11"> <input type="checkbox" id="zdHour11" name="zd_hour" value="11">
<label for="zdHour11">11</label> <label for="zdHour11">11</label>
</div> </div>
<br>
<label>PM:</label>
<div class="checkbox-primary"> <div class="checkbox-primary">
<input type="checkbox" id="zdHour12" name="zd_hour" value="12"> <input type="checkbox" id="zdHour12" name="zd_hour" value="12">
<label for="zdHour12">12</label> <label for="zdHour12">12</label>
</div> </div>
<br>
<label>PM:</label>
<div class="checkbox-primary"> <div class="checkbox-primary">
<input type="checkbox" id="zdHour13" name="zd_hour" value="13"> <input type="checkbox" id="zdHour13" name="zd_hour" value="13">
<label for="zdHour13">13</label> <label for="zdHour13">13</label>
@ -705,10 +709,6 @@
<input type="checkbox" id="zdHour23" name="zd_hour" value="23"> <input type="checkbox" id="zdHour23" name="zd_hour" value="23">
<label for="zdHour23">23</label> <label for="zdHour23">23</label>
</div> </div>
<div class="checkbox-primary">
<input type="checkbox" id="zdHour24" name="zd_hour" value="24">
<label for="zdHour24">24</label>
</div>
</div> </div>
</label> </label>
</div> </div>