From c3417792d9f3030d6c442170b368f5800dff1e3b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 4 Aug 2019 11:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/static/ruoyi/css/ry-ui.css | 2 +-
.../resources/templates/demo/modal/form.html | 2 +-
.../resources/templates/system/user/add.html | 2 +-
.../resources/templates/system/user/edit.html | 2 +-
.../resources/templates/system/user/user.html | 26 +++++++++----------
5 files changed, 16 insertions(+), 18 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 291af5fa..125186b9 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
@@ -929,7 +929,7 @@ label {
padding-bottom:5px
}
-.form-content {
+.main-content {
background-color: #ffffff;
color: inherit;
padding: 10px 15px 15px 15px;
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html b/ruoyi-admin/src/main/resources/templates/demo/modal/form.html
index ae0ab6ac..ec294fb9 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/modal/form.html
@@ -4,7 +4,7 @@
<th:block th:include="include :: header('新增用户')" />
</head>
<body>
- <div class="form-content">
+ <div class="main-content">
<form id="form-user-add" class="form-horizontal">
<div class="row">
<div class="col-sm-6">
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 6d270cf3..0d5e9771 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -5,7 +5,7 @@
<th:block th:include="include :: select2-css" />
</head>
<body>
- <div class="form-content">
+ <div class="main-content">
<form id="form-user-add" class="form-horizontal">
<input name="deptId" type="hidden" id="treeId"/>
<h4 class="form-header h4">基本信息</h4>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index e10e45a7..d7a0c31b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -5,7 +5,7 @@
<th:block th:include="include :: select2-css" />
</head>
<body>
- <div class="form-content">
+ <div class="main-content">
<form class="form-horizontal" id="form-user-edit" th:object="${user}">
<input name="userId" type="hidden" th:field="*{userId}" />
<input name="deptId" type="hidden" th:field="*{deptId}" id="treeId"/>
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 ccd2df75..b261e35a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -7,23 +7,21 @@
</head>
<body class="gray-bg">
<div class="ui-layout-west">
- <div class="main-content">
- <div class="box box-main">
- <div class="box-header">
- <div class="box-title">
- <i class="fa icon-grid"></i> 组织机构
- </div>
- <div class="box-tools pull-right">
- <a type="button" class="btn btn-box-tool menuItem" href="#" onclick="dept()" title="管理部门"><i class="fa fa-edit"></i></a>
- <button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
- <button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
- <button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新部门"><i class="fa fa-refresh"></i></button>
- </div>
+ <div class="box box-main">
+ <div class="box-header">
+ <div class="box-title">
+ <i class="fa icon-grid"></i> 组织机构
</div>
- <div class="ui-layout-content">
- <div id="tree" class="ztree"></div>
+ <div class="box-tools pull-right">
+ <a type="button" class="btn btn-box-tool" href="#" onclick="dept()" title="管理部门"><i class="fa fa-edit"></i></a>
+ <button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
+ <button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
+ <button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新部门"><i class="fa fa-refresh"></i></button>
</div>
</div>
+ <div class="ui-layout-content">
+ <div id="tree" class="ztree"></div>
+ </div>
</div>
</div>