From 7ed6489395475fc41d33914dfcc940b75ff65101 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 18 五月 2023 16:35:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html index 0d33e83..786a2b0 100644 --- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html +++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html @@ -139,8 +139,12 @@ </select> </div> <div class="initialLevel col-sm-2 control-label form-group" > - <#button name="查询" icon="fa-search" clickFun="getData()"/> - <#button name="重置" icon="fa-trash" clickFun="reset()" space="true"/> + <button type="button" class="btn btn-primary" onclick="getData()" style="height: 33px"> + <i class="fa fa-search"></i> 查询 + </button> + <button type="button" class="btn btn-primary button-margin" onclick="reset()" style="height: 33px"> + <i class="fa fa-trash"></i> 重置 + </button> </div> </div> <div class="col-sm-12" > @@ -174,8 +178,12 @@ </select> </div> <div class="initialLevel col-sm-2 control-label form-group" > - <#button name="查询" icon="fa-search" clickFun="getDataOrder()"/> - <#button name="重置" icon="fa-trash" clickFun="resetOrder()" space="true"/> + <button type="button" class="btn btn-primary " onclick="getDataOrder()" style="height: 33px"> + <i class="fa fa-search"></i> 查询 + </button> + <button type="button" class="btn btn-primary button-margin" onclick="resetOrder()" style="height: 33px"> + <i class="fa fa-trash"></i> 重置 + </button> </div> </div> <div class="col-sm-10" > -- Gitblit v1.7.1