From e475f3bf1810151b739d7256f5fbfd286ae9fe0e Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Wed, 20 Jan 2021 15:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90config=E3=80=91=E3=80=90file=E3=80=91?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/modular/sysConfig/sysConfig.js     |  4 +-
 .../assets/modular/system/notice/notice.js    |  2 +
 .../webapp/assets/modular/system/user/user.js |  2 +
 .../modular/sysConfig/sysConfig_add.html      | 10 ++---
 .../modular/sysConfig/sysConfig_edit.html     | 10 ++---
 .../system/fileInfo/file_info_details.html    | 42 +++++++++----------
 6 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/main/webapp/assets/modular/sysConfig/sysConfig.js b/src/main/webapp/assets/modular/sysConfig/sysConfig.js
index d8a6cd8a..5a3086bd 100644
--- a/src/main/webapp/assets/modular/sysConfig/sysConfig.js
+++ b/src/main/webapp/assets/modular/sysConfig/sysConfig.js
@@ -44,7 +44,7 @@ layui.use(['table', 'func', 'HttpRequest'], function () {
      */
     SysConfig.openAddDlg = function () {
         func.open({
-            height: 800,
+            height: 680,
             title: '添加系统配置',
             content: Feng.ctxPath + '/view/config/addView',
             tableId: SysConfig.tableId
@@ -70,7 +70,7 @@ layui.use(['table', 'func', 'HttpRequest'], function () {
      */
     SysConfig.openEditDlg = function (data) {
         func.open({
-            height: 800,
+            height: 680,
             title: '修改系统配置',
             content: Feng.ctxPath + '/view/config/editView?configId=' + data.configId,
             tableId: SysConfig.tableId
diff --git a/src/main/webapp/assets/modular/system/notice/notice.js b/src/main/webapp/assets/modular/system/notice/notice.js
index 031ac081..a7df4b35 100644
--- a/src/main/webapp/assets/modular/system/notice/notice.js
+++ b/src/main/webapp/assets/modular/system/notice/notice.js
@@ -45,6 +45,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func'], function (
      */
     Notice.openAddNotice = function () {
         func.open({
+            height: 680,
             title: '添加通知',
             content: Feng.ctxPath + '/view/notice/add',
             tableId: Notice.tableId
@@ -58,6 +59,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func'], function (
      */
     Notice.onEditNotice = function (data) {
         func.open({
+            height: 680,
             title: '修改通知',
             content: Feng.ctxPath + "/view/notice/edit?noticeId=" + data.noticeId,
             tableId: Notice.tableId
diff --git a/src/main/webapp/assets/modular/system/user/user.js b/src/main/webapp/assets/modular/system/user/user.js
index 6a693935..56999a5e 100644
--- a/src/main/webapp/assets/modular/system/user/user.js
+++ b/src/main/webapp/assets/modular/system/user/user.js
@@ -65,6 +65,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest',
     // 添加按钮
     MgrUser.openAddUser = function () {
         func.open({
+            height: 680,
             title: '添加用户',
             content: Feng.ctxPath + '/view/user/addView',
             tableId: MgrUser.tableId
@@ -74,6 +75,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest',
     // 修改按钮
     MgrUser.onEditUser = function (data) {
         func.open({
+            height: 680,
             title: '修改用户',
             content: Feng.ctxPath + '/view/user/editView?userId=' + data.userId,
             tableId: MgrUser.tableId
diff --git a/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html b/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html
index ffa84f97..2b4f14f0 100644
--- a/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html
+++ b/src/main/webapp/pages/modular/sysConfig/sysConfig_add.html
@@ -51,14 +51,12 @@
                         <input id="remark" name="remark" placeholder="请输入备注" type="text" autocomplete="off" class="layui-input"/>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <div class="layui-input-block">
-                        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-                        <button class="layui-btn layui-btn-primary" ew-event="closeDialog"> 取消 </button>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
+    <div class="form-group-bottom text-center">
+        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
+        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
+    </div>
 </form>
 @}
\ No newline at end of file
diff --git a/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html b/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html
index ed5df831..fe95d9b2 100644
--- a/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html
+++ b/src/main/webapp/pages/modular/sysConfig/sysConfig_edit.html
@@ -52,15 +52,13 @@
                         <input id="remark" name="remark" placeholder="请输入备注" type="text" autocomplete="off" class="layui-input"/>
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <div class="layui-input-block">
-                        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-                        <button class="layui-btn layui-btn-primary" ew-event="closeDialog"> 取消 </button>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
+    <div class="form-group-bottom text-center">
+        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
+        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
+    </div>
 </form>
 
 @}
\ No newline at end of file
diff --git a/src/main/webapp/pages/modular/system/fileInfo/file_info_details.html b/src/main/webapp/pages/modular/system/fileInfo/file_info_details.html
index f723476a..0b6b37ea 100644
--- a/src/main/webapp/pages/modular/system/fileInfo/file_info_details.html
+++ b/src/main/webapp/pages/modular/system/fileInfo/file_info_details.html
@@ -3,12 +3,12 @@
 <form class="layui-form" id="fileInfoForm" lay-filter="fileInfoForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
-            <div class="layui-card-body" style="padding: 10px 20%">
+            <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
+                    <input name="logId" type="hidden"/>
 
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">文件存储位置</label>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">存储位置</label>
                         <div class="layui-input-block">
                             <select name="fileLocation" disabled="disabled">
                                 <option value="">存储位置</option>
@@ -19,54 +19,52 @@
                             </select>
                         </div>
                     </div>
-
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">文件仓库</label>
                         <div class="layui-input-block">
-                            <input name="fileBucket" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="fileBucket" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
-
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">文件名称</label>
                         <div class="layui-input-block">
-                            <input name="fileOriginName" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="fileOriginName" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
-                    <div class="layui-inline layui-col-md12">
-                        <label class="layui-form-label">是否为机密文件</label>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">机密文件</label>
                         <div class="layui-input-block">
-                            <input name="secretFlag" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="secretFlag" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
 
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">文件后缀</label>
                         <div class="layui-input-block">
-                            <input name="fileSuffix" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="fileSuffix" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">文件大小</label>
                         <div class="layui-input-block">
-                            <input name="fileSizeKb" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="fileSizeKb" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">唯一标识</label>
                         <div class="layui-input-block">
-                            <input name="fileObjectName" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="fileObjectName" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
-                    <div class="layui-inline layui-col-md12">
+                    <div class="layui-form-item">
                         <label class="layui-form-label">存储路径</label>
                         <div class="layui-input-block">
-                            <input name="filePath" type="text" class="layui-input layui-disabled" autocomplete="off" />
+                            <input name="filePath" type="text" class="layui-input" autocomplete="off" />
                         </div>
                     </div>
 
@@ -76,7 +74,7 @@
     </div>
     <div class="form-group-bottom text-center">
 <!--        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>-->
-        <button id="cancel" type="button" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
+        <button id="cancel" type="button" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;关闭&emsp;</button>
     </div>
 </form>