From 564f23ad536b52f61b27f4a06f097f4a9ad4841e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 10:31:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/report/viewWorkOut.html      |    2 +-
 src/main/webapp/static/js/operateLog/operateLog.js |    2 +-
 src/main/webapp/views/operateLog/operateLog.html   |    2 +-
 src/main/webapp/views/report/viewStockUse.html     |    2 +-
 src/main/webapp/views/report/viewInOut.html        |    2 +-
 src/main/webapp/views/report/viewWorkIn.html       |    2 +-
 src/main/webapp/views/report/viewStayTime.html     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index f0c9e68..0907458 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -22,7 +22,7 @@
             ,{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
             ,{field: 'action', align: 'center',title: '璁块棶鍦板潃'}
             ,{field: 'userId$', align: 'center',title: '鐢ㄦ埛',event: 'userId'}
-            ,{field: 'ip', edit:'text', align: 'center',title: '瀹㈡埛绔疘P'}
+            ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
             ,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
             ,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
             ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 9c4a0f4..647c990 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -46,7 +46,7 @@
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
         <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
-        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
     </div>
 </script>
 
diff --git a/src/main/webapp/views/report/viewInOut.html b/src/main/webapp/views/report/viewInOut.html
index 1605823..440e00d 100644
--- a/src/main/webapp/views/report/viewInOut.html
+++ b/src/main/webapp/views/report/viewInOut.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         #btn-export {
-            float:initial !important;
+            margin-top: 10px;
         }
     </style>
 </head>
diff --git a/src/main/webapp/views/report/viewStayTime.html b/src/main/webapp/views/report/viewStayTime.html
index 2551499..aefa922 100644
--- a/src/main/webapp/views/report/viewStayTime.html
+++ b/src/main/webapp/views/report/viewStayTime.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         #btn-export {
-            float:initial !important;
+            margin-top: 10px;
         }
     </style>
 </head>
diff --git a/src/main/webapp/views/report/viewStockUse.html b/src/main/webapp/views/report/viewStockUse.html
index 8117f89..34825c2 100644
--- a/src/main/webapp/views/report/viewStockUse.html
+++ b/src/main/webapp/views/report/viewStockUse.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         #btn-export {
-            float:initial !important;
+            margin-top: 10px;
         }
     </style>
 </head>
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 5c9b295..ae6e257 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         #btn-export {
-            float:initial !important;
+            margin-top: 10px;
         }
     </style>
 </head>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 3732e2b..48dfd47 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <style>
         #btn-export {
-            float:initial !important;
+            margin-top: 10px;
         }
     </style>
 </head>

--
Gitblit v1.9.1