From 8be5665468d30cffdc1d89f841240c9f9274def2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 四月 2021 10:20:22 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locDetl/locDetl.js |    2 +-
 src/main/webapp/views/locDetl/locDetl.html   |    9 ++++-----
 src/main/webapp/static/js/mat/mat.js         |    5 +----
 src/main/webapp/views/mat/mat.html           |   19 +++++++++----------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index a6e87f7..614fbbb 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -14,9 +14,9 @@
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
+        height: 'full-105',
         cols: [[
             {type: 'checkbox'}
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 8f563ab..a855ef9 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -52,14 +52,11 @@
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
-        height: 'full-100',
+        height: 'full-105',
         cols: [[
             {type: 'checkbox'}
-//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-//             ,{field: 'id', align: 'center',title: 'ID'}
 //             ,{field: 'uuid', align: 'center',title: '缂栧彿'}
 //             ,{field: 'nodeId$', align: 'center',title: '鎵�灞炲尯鍩�',event: 'nodeId', style: 'cursor:pointer'}
             ,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index f385353..26320d7 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -8,7 +8,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-    <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <link rel="stylesheet" href="../../static/css/tree.css" media="all">
     <style>
         body {
@@ -40,7 +39,7 @@
 </head>
 <body>
 
-<div class="layui-fluid" style="padding-bottom: 0;margin-bottom: 30px">
+<div class="layui-fluid">
     <!-- 宸� -->
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md3">
@@ -52,7 +51,7 @@
                             <input id="condition" onkeyup="findData(this)" type="text" class="layui-input" placeholder="璇疯緭鍏ュ叧閿瓧" autocomplete="off">
                         </div>
                         <div class="layui-inline">
-                            <button class="layui-btn icon-btn" id="treeReset">
+                            <button class="layui-btn icon-btn  layui-btn-sm" id="treeReset">
                                 <i class="layui-icon layui-icon-close"></i>
                             </button>
                         </div>
@@ -105,8 +104,8 @@
 <script type="text/html" id="toolbar">
     <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-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>
     </div>
 </script>
 <script type="text/html" id="locNoTpl">
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f254338..059175d 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../static/css/admin.css" media="all">
     <link rel="stylesheet" href="../../static/css/cool.css" media="all">
-    <link rel="stylesheet" href="../../static/css/common.css" media="all">
     <link rel="stylesheet" href="../../static/css/tree.css" media="all">
     <style>
         body {
@@ -38,12 +37,12 @@
             height: 100%;
         }
 
+        .admin-form {
+            padding: 25px 30px 0 0 !important;
+            margin: 0 !important;
+        }
 
         /* ------------------------- 鎵撳嵃琛ㄦ牸 -----------------------  */
-        .layui-btn-danger {
-            background-color: #eeda7c;
-            color: #24292e;
-        }
         .template-preview {
             height: 200px;
             display: inline-block;
@@ -58,7 +57,7 @@
 </head>
 <body>
 
-<div class="layui-fluid" style="padding-bottom: 0;margin-bottom: 30px">
+<div class="layui-fluid">
     <!-- 宸� -->
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md3">
@@ -70,7 +69,7 @@
                             <input id="condition" onkeyup="findData(this)" type="text" class="layui-input" placeholder="璇疯緭鍏ュ叧閿瓧" autocomplete="off">
                         </div>
                         <div class="layui-inline">
-                            <button class="layui-btn icon-btn" id="treeReset">
+                            <button class="layui-btn icon-btn layui-btn-sm" id="treeReset">
                                 <i class="layui-icon layui-icon-close"></i>
                             </button>
                         </div>
@@ -121,9 +120,9 @@
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
-        <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-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">瀵煎嚭</button>
     </div>
 </script>
 

--
Gitblit v1.9.1