Explorar o código

优化一些小细节

RuoYi %!s(int64=3) %!d(string=hai) anos
pai
achega
1878b10daa

+ 0 - 1
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-select/bootstrap-select.css

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

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/reorder-columns/jquery.dragtable.js


+ 0 - 1
ruoyi-admin/src/main/resources/static/ajax/libs/jasny/jasny-bootstrap.css

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

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ruoyi-admin/src/main/resources/static/css/bootstrap.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ruoyi-admin/src/main/resources/static/css/jquery.contextMenu.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ruoyi-admin/src/main/resources/static/js/plugins/slimscroll/jquery.slimscroll.min.js


+ 1 - 2
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

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

+ 0 - 7
ruoyi-admin/src/main/resources/templates/system/role/authUser.html

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

+ 0 - 7
ruoyi-admin/src/main/resources/templates/system/role/selectUser.html

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

+ 14 - 14
ruoyi-quartz/src/main/resources/templates/monitor/job/cron.html

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

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio