From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html
index 53ad69f..e405654 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity.html
@@ -11,6 +11,12 @@
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
+ <#SelectCon id="pCode" name="所在省" >
+ <option value="">全部</option>
+ @for(obj in list){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </#SelectCon>
</div>
<div class="col-sm-3">
@@ -29,9 +35,9 @@
<div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
<#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
<#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
- <#button name="取消" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
- <#button name="查看详情" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
- <#button name="已报名人员" icon="fa-remove" clickFun="TCompetition.delete()" space="true"/>
+ <#button name="冻结" icon="fa-remove" clickFun="TCompetition.freeze()" space="true"/>
+ <#button name="解冻" icon="fa-remove" clickFun="TCompetition.unfreeze()" space="true"/>
+ <#button name="重置密码" icon="fa-remove" clickFun="TCompetition.reload()" space="true"/>
</div>
<#table id="TCompetitionTable"/>
--
Gitblit v1.7.1