From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

---
 src/main/webapp/views/locOwner/locOwner.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/locOwner/locOwner.html b/src/main/webapp/views/locOwner/locOwner.html
index 62cd683..66fd35c 100644
--- a/src/main/webapp/views/locOwner/locOwner.html
+++ b/src/main/webapp/views/locOwner/locOwner.html
@@ -43,7 +43,9 @@
         <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
 
         <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
-        <div class="dropdown-menu" style="float: right">
+        <button style="float: right" class="layui-btn layui-btn-sm layui-btn-checked " id="btn-exportMoudle" onclick="excelMouldDownload()" >妯℃澘涓嬭浇</button>
+        <button style="float: right" class="layui-btn layui-btn-sm layui-btn-checked " id="btn-import" onclick="importExcel()" >瀵煎叆excel</button>
+        <div class="dropdown-menu" style="float: right;display: none">
             <button id="syncData" class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
             <ul class="dropdown-menu-nav dark">
                 <div class="dropdown-anchor"></div>

--
Gitblit v1.9.1