From e1749547c76a5d8bae94e47d38d4d75b481610c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 09 九月 2021 10:51:15 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/locDetl/locDetl.html |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 3c9366f..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 {
@@ -33,11 +32,14 @@
             padding: 30px 30px 10px 0px;
             margin-left: 0px;
         }
+        .layui-form.layui-border-box.layui-table-view {
+            height: 100%;
+        }
     </style>
 </head>
 <body>
 
-<div class="layui-fluid" style="padding-bottom: 0;">
+<div class="layui-fluid">
     <!-- 宸� -->
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md3">
@@ -49,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>
@@ -66,9 +68,9 @@
                     <!-- 琛ㄦ牸宸ュ叿鏍�2 -->
                     <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅缂栧彿:</label>
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅:</label>
                             <div class="layui-input-inline">
-                                <input name="loc_no" class="layui-input" placeholder="杈撳叆璐т綅缂栧彿"/>
+                                <input name="loc_no" class="layui-input" placeholder="杈撳叆璐т綅"/>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -87,6 +89,9 @@
                             <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                                 <i class="layui-icon">&#xe615;</i>鎼滅储
                             </button>
+                            <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                                <i class="layui-icon">&#xe666;</i>閲嶇疆
+                            </button>
                         </div>
                     </div>
                     <table class="layui-hide" id="locDetl" lay-filter="locDetl"></table>
@@ -98,15 +103,17 @@
 
 <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" 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>
-
+<script type="text/html" id="locNoTpl">
+    <span name="locNo" class="layui-badge layui-badge-gray">{{d.locNo}}</span>
+</script>
 <script type="text/html" id="operate">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
-    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!--    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -114,9 +121,8 @@
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/locDetl/locDetl.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/nodeTree.js" charset="utf-8"></script>
-
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<script type="text/javascript" src="../../static/js/tagTree.js" charset="utf-8"></script>
+<!--<script type="text/javascript" src="../../static/js/nodeTree.js" charset="utf-8"></script>-->
 
 </body>
 </html>

--
Gitblit v1.9.1