From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
index e55ffcd..a9d76f2 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -26,35 +26,24 @@
<#button name="查询" icon="fa-search" clickFun="TDriver.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
</div>
- <div class="col-sm-12">
- @if(shiro.hasPermission("/tDriver/auditPage")){
- <#button name="立即审核" icon="fa-edit" clickFun="TDriver.auditPage()"/>
- @}
- @if(shiro.hasPermission("/tDriver/export")){
- <#button name="导出" icon="" clickFun="TDriver.export()"/>
- @}
- @if(shiro.hasPermission("/tDriver/tDriver_exception")){
- <#button name="异常" icon="" clickFun="TDriverException.tDriverException()"/>
- @}
- @if(shiro.hasPermission("/tDriver/rechargeBalancePage")){
- <#button name="充值" icon="fa-edit" clickFun="TDriver.rechargeBalancePage()"/>
- @}
- @if(shiro.hasPermission("/tDriver/add")){
- <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/>
- @}
- </div>
</div>
- <!--<div class="hidden-xs" id="TDriverTableToolbar" role="group">
+ <div class="hidden-xs" id="TDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/auditPage")){
+ <#button name="立即审核" icon="fa-edit" clickFun="TDriver.auditPage()"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/export")){
+ <#button name="导出" icon="" clickFun="TDriver.export()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/tDriver_exception")){
+ <#button name="异常" icon="" clickFun="TDriverException.tDriverException()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/rechargeBalancePage")){
+ <#button name="充值" icon="fa-edit" clickFun="TDriver.rechargeBalancePage()" space="true"/>
+ @}
@if(shiro.hasPermission("/tDriver/add")){
- <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()"/>
+ <#button name="添加" icon="fa-plus" clickFun="TDriver.openAddTDriver()" space="true"/>
@}
- @if(shiro.hasPermission("/tDriver/update")){
- <#button name="修改" icon="fa-edit" clickFun="TDriver.openTDriverDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/tDriver/delete")){
- <#button name="删除" icon="fa-remove" clickFun="TDriver.delete()" space="true"/>
- @}
- </div>-->
+ </div>
<#table id="TDriverTable"/>
</div>
</div>
--
Gitblit v1.7.1