From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
index 3ec4e13..7ee5659 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetitionUser.js
@@ -17,7 +17,11 @@
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',width:'8%',
},
- {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle'},
+ {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
+ formatter:function (data) {
+ return {1:"男",2:"女"}[data]
+ }
+ },
{title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle',width:'8%',
},
{title: '身份证号', field: 'idCard', visible: true, align: 'center', valign: 'middle',width:'8%',
@@ -327,14 +331,11 @@
* 导出车辆操作
*/
TCompetition.ouTCompetition = function () {
- var operation = function() {
- window.location.href = Feng.ctxPath + "/TCompetition/ouTCompetition";
- };
- if(language==1){
- Feng.confirm("是否确认导出车辆信息?", operation);
- }else if(language==2){
- Feng.confirm("Are you sure to export vehicle information?", operation);
- }else {
- Feng.confirm("Apakah Anda pasti akan mengekspor informasi kendaraan?", operation);
- }
-}
\ No newline at end of file
+ var state=$("#state").val()
+ var id=$("#id").val()
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/export", function(data){
+ });
+ ajax.set("state",state);
+ ajax.set("id",id);
+ ajax.start();
+};
--
Gitblit v1.7.1