From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
index 4427e68..5ffd00f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js
@@ -14,6 +14,7 @@
 TCompetition.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
+        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
         {title: '所在省', field: 'province', visible: true, align: 'center', valign: 'middle',width:'8%',
         },
         {title: '所在市', field: 'city', visible: true, align: 'center', valign: 'middle'},
@@ -25,7 +26,7 @@
         },
         {title: '结束时间', field: 'endTime', visible: true, align: 'center', valign: 'middle',width:'5%',
         },
-        {title: '最大人数-已报名人数', field: 'applicantsNumber', visible: true, align: 'center', valign: 'middle',width:'8%',
+        {title: '最大人数-已报名人数', field: 'count', visible: true, align: 'center', valign: 'middle',width:'8%',
         },
         {title: '报名条件', field: 'registerCondition', visible: true, align: 'center', valign: 'middle',width:'8%',
             formatter:function (data) {
@@ -130,6 +131,7 @@
         this.layerIndex = index;
     }
 };
+
 TCompetition.user = function () {
     if (this.check()) {
         var index = layer.open({
@@ -151,12 +153,12 @@
     if (this.check()) {
         var nickname = TCompetition.seItem.carLicensePlate;
         if (nickname == "" || nickname == null || nickname == undefined){
-                nickname = "该车辆";
+                nickname = "该赛事";
         }else{
             nickname = "【"+nickname+"】";
         }
         swal({
-           title: language==1?"您是否确认删除" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
+           title: language==1?"您是否确认取消" + nickname + "?":(language==2?"Are you sure to delete the" + nickname + "?":"Apakah Anda pasti akan menghapus" + nickname + "?"),
             text: language==1?"请谨慎操作!":(language==2?' Please operate with caution!':'Harap beroperasi dengan hati -hati!'),
             type: "warning",
             showCancelButton: true,

--
Gitblit v1.7.1