From a3022b7241480fd71dae97443d98f12e313056be Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 26 十月 2022 17:22:30 +0800
Subject: [PATCH] 修复24-25日反馈的bug
---
web/web/GwSp.ashx | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 35395b4..1ebd2ed 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -350,7 +350,7 @@
str1 += "<td rowspan=\"1\"><span class='label label-success'>閫氶亾缁�</span>";
str1 += string.Format("<div>绉诲姩锛歿0}</div><div>鐢典俊锛歿1}</div><div>鑱旈�氾細{2}</div>", (object)this.GetGroupName(gwSp.CMGroupID), (object)this.GetGroupName(gwSp.CTGroupID), (object)this.GetGroupName(gwSp.CUGroupID));
}
-
+ /**
if (gwSp.RESEND_STATUS == 1)
{
str1 += "<td rowspan=\"1\"><span class='label label-success'>鍚敤澶辫触琛ュ彂</span>";
@@ -360,7 +360,7 @@
else
{
str1 += "<td rowspan=\"1\"><span class='label label-danger'>鍋滅敤澶辫触琛ュ彂</span>";
- }
+ }**/
string str2 = gwSp.ChargerTypeText ;
@@ -375,6 +375,7 @@
if (gwSp.BalanceThreshold > 0 && !string.IsNullOrEmpty(gwSp.AlarmMobile))
str1 = str1 + (object)"<div class=\"text-danger\">" + (object)(gwSp.BalanceThreshold / 1000) + "鍏�(" + gwSp.AlarmMobile + ")</div>";
str1 += "</td>";
+ /**
str1 = str1 + "<td>" + this.GetDiverterName(gwSp.DiverterID);
str1 = str1 + "<div class=\"text-muted\">" + this.GetStratedyName(gwSp.StrategyID) + "</div>";
str1 = str1 + "<div class=\"text-muted\"><font color=\"red\">" + this.GwSPAuditingName(gwSp.AuditingMode) + "</font></div>";
@@ -383,16 +384,17 @@
str1 = str1 + "<td>" + gwSp.AccessCode;
str1 = str1 + "<div class=\"text-muted\">" + (gwSp.ExtnoExtensionMode == 1 ? "绂佹瀹㈡埛鎵╁睍" : "鍏佽瀹㈡埛鎵╁睍") + "</div>";
str1 = str1 + "<div>" + (gwSp.AccessCodeMode == 1 ? "閫氶亾鐩磋繛妯″紡" : "铏氭嫙鎺ュ叆妯″紡") + "</div></td>";
+ **/
str1 = str1 + "<td>" + this.FormatIpHtml(gwSp.ClientIp) + "</td>";
// str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status);
str1 = str1 + "<td>" + this.GetStatusText(gwSp.Status, gwSp.SpID);
str1 += "</td>";
str1 += "<td>" + gwSp.CreateTime + "</td>";
- str1 += "<td rowspan=\"1\" class=\"text-right\">";
+ str1 += "<td rowspan=\"1\" class=\"text-center\">";
if (context.HasRight("3023"))
- str1 += string.Format(" <a class=\"btn-block btn btn-primary btn-xs action-modal-edit\" data-id=\"{0}\"><i class=\"fa fa-edit\"></i> 缂栬緫</a>", (object)gwSp.SpID);
+ str1 += string.Format(" <a class=\"btn btn-primary btn-xs action-modal-edit\" data-id=\"{0}\"><i class=\"fa fa-edit\"></i> 缂栬緫</a>", (object)gwSp.SpID);
//str1 += string.Format(" <a class=\"btn-block btn btn-success btn-xs action-create-summary\" data-id=\"{0}\">璐﹀彿鎽樿</a>", (object)gwSp.SpID);
- str1 = gwSp.Status != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"0\" class=\"action-updateStatus btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) gwSp.SpID ) : str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"1\" class=\"action-updateStatus btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) gwSp.SpID );
+ str1 = gwSp.Status != 0 ? str1 + string.Format(" <a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"0\" class=\"action-updateStatus btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a><br> ", (object) gwSp.SpID ) : str1 + string.Format("<a href=\"javascript:;\" data-spid=\"{0}\" data-status=\"1\" class=\"action-updateStatus btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a><br> ", (object) gwSp.SpID );
if (context.HasRight("3021"))
str1 += string.Format(" <a class=\"btn btn-xs btn-success action-modal-charge\" data-id=\"{0}\"><i class=\"fa fa-cny\"></i> 鍏呭��</a>", (object)gwSp.SpID);
if (context.HasRight("3022"))
@@ -405,7 +407,7 @@
}
}
else
- str1 += "<tr><td colspan=\"17\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"14\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, (object)new
{
Table = str1.ToString(),
@@ -795,8 +797,8 @@
}
string string2 = context.GetString("patternContent");
- if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
- throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛�");
+ if (!Regex.IsMatch(o.SpID, "^[0-9a-zA-Z]{6}$"))
+ throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楀拰瀛楁瘝");
if (!string.IsNullOrEmpty(o.AccessCode) && !Regex.IsMatch(o.AccessCode, "^[0-9]*$"))
throw new Exception("鎵╁睍鍙峰繀椤讳负鏁板瓧");
if (string.IsNullOrEmpty(o.ClientID))
--
Gitblit v1.9.1