From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition.js | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 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 709e2a8..059ce55 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
@@ -165,32 +165,19 @@
nickname = "【"+nickname+"】";
}
swal({
- 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!'),
+ title: "您是否确认取消" + nickname + "?",
+ text: "请谨慎操作！",
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
- confirmButtonText: language==1?"删除":(language==2?'Delete':'Hapus'),
+ confirmButtonText: "确定",
closeOnConfirm: true
}, function () {
- var ajax = new $ax(Feng.ctxPath + "/TCompetition/delete", function (data) {
- if(language==1){
- swal("删除成功", "您已经成功删除了" + nickname + "。", "success");
- }else if(language==2){
- swal("Delete succeeded!", "You have successfully deleted it" + nickname + "。", "success");
- }else {
- swal("Hapus berhasil!", "Anda berhasil menghapus" + nickname + "。", "success");
- }
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/cancel", function (data) {
+ swal("取消成功", "您已经成功取消了" + nickname + "。", "success");
TCompetition.table.refresh();
}, function (data) {
- if(language==1){
- swal("删除失败", data.responseJSON.message + "！", "warning");
- }else if(language==2){
- swal("Failed to delete", data.responseJSON.message + "！", "warning");
- }else {
- swal("Hapus Gagal", data.responseJSON.message + "！", "warning");
- }
-
+ swal("取消失败", data.responseJSON.message + "！", "warning");
});
ajax.set("TCompetitionId",TCompetition.seItem.id);
ajax.start();
--
Gitblit v1.7.1