From b554c468253ab1ccaa657bdd3d18421ae987e638 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 28 Feb 2019 20:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=87=AA=E9=80=82?=
=?UTF-8?q?=E5=BA=94=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/static/ruoyi/css/ry-ui.css | 9 +++++++++
.../src/main/resources/templates/monitor/job/job.html | 2 +-
.../src/main/resources/templates/monitor/job/jobLog.html | 2 +-
.../templates/monitor/logininfor/logininfor.html | 2 +-
.../main/resources/templates/monitor/online/online.html | 2 +-
.../resources/templates/monitor/operlog/operlog.html | 2 +-
.../main/resources/templates/system/config/config.html | 2 +-
.../src/main/resources/templates/system/dept/dept.html | 2 +-
.../main/resources/templates/system/dict/data/data.html | 2 +-
.../main/resources/templates/system/dict/type/type.html | 2 +-
.../src/main/resources/templates/system/menu/menu.html | 2 +-
.../main/resources/templates/system/notice/notice.html | 2 +-
.../src/main/resources/templates/system/post/post.html | 2 +-
.../src/main/resources/templates/system/role/role.html | 2 +-
.../src/main/resources/templates/system/user/user.html | 2 +-
.../src/main/resources/templates/tool/gen/gen.html | 2 +-
16 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index 22b72257..6a65970b 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -442,6 +442,15 @@ label {
float: left;
}
+@media (max-width:767px) {
+ .select-time label,.select-time span,.select-time input {
+ float: none;
+ }
+ .select-list .select-time input {
+ width: 200px;
+ }
+}
+
.select-time label {
margin-top: 5px;
}
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/job.html b/ruoyi-admin/src/main/resources/templates/monitor/job/job.html
index 39615b69..9194ad41 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/job/job.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/job/job.html
@@ -32,7 +32,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="monitor:job:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
index 7d192af4..269c5691 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/job/jobLog.html
@@ -38,7 +38,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:job:remove">
<i class="fa fa-remove"></i> 删除
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
index 57f75499..4e822aac 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -38,7 +38,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:logininfor:remove">
<i class="fa fa-remove"></i> 删除
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
index 9af006f0..3143b1b7 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
@@ -26,7 +26,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-danger btn-del disabled" onclick="javascript:batchForceLogout()" shiro:hasPermission="monitor:online:batchForceLogout">
<i class="fa fa-sign-out"></i> 强退
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
index da1fb76d..589d35b0 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
@@ -38,7 +38,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-danger btn-del disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:operlog:remove">
<i class="fa fa-remove"></i> 删除
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/config.html b/ruoyi-admin/src/main/resources/templates/system/config/config.html
index ad8d0454..88f9fe35 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/config.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/config.html
@@ -37,7 +37,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:config:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
index 34caa514..cd8a5ae8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
@@ -28,7 +28,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
index 063106ec..dc70b797 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
@@ -34,7 +34,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="add()" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
index 20fdf6c5..2d4bf853 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
@@ -38,7 +38,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:dict:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
index 753aa330..786cc7b6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
+++ b/ruoyi-admin/src/main/resources/templates/system/menu/menu.html
@@ -28,7 +28,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add(0)" shiro:hasPermission="system:menu:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
index d1d3ff66..462317ee 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
@@ -31,7 +31,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="system:notice:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/post.html b/ruoyi-admin/src/main/resources/templates/system/post/post.html
index 2d0ce939..19ec581d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/post/post.html
+++ b/ruoyi-admin/src/main/resources/templates/system/post/post.html
@@ -32,7 +32,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html
index 8c77ccea..bcae85c4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -38,7 +38,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index ecf07ac2..74e88d7e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -63,7 +63,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="system:user:add">
<i class="fa fa-plus"></i> 新增
</a>
diff --git a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html b/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html
index 4c33c4d3..79c2fd99 100644
--- a/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html
+++ b/ruoyi-admin/src/main/resources/templates/tool/gen/gen.html
@@ -31,7 +31,7 @@
</form>
</div>
- <div class="btn-group-sm hidden-xs" id="toolbar" role="group">
+ <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
<i class="fa fa-download"></i> 批量生成
</a>