From 685ccf5844d23a0d64da78cb2a9eb71c2cca9b8e Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 11 七月 2022 23:00:48 +0800
Subject: [PATCH] 账号列表调整
---
web/Lib/Dao.dll | 0
web/Lib/Common.pdb | 0
web/Lib/Common.dll | 0
web/web/GwSp.aspx | 12 +++++++-----
web/.vs/Web/v16/.suo | 0
web/Lib/Model.dll | 0
web/Lib/Model.pdb | 0
web/web/GwSp.ashx | 14 ++++++++------
web/Lib/Dao.pdb | 0
9 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 45155c2..3e41c46 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Lib/Common.dll b/web/Lib/Common.dll
index 5436683..36167d1 100644
--- a/web/Lib/Common.dll
+++ b/web/Lib/Common.dll
Binary files differ
diff --git a/web/Lib/Common.pdb b/web/Lib/Common.pdb
index ccf4cfe..b543520 100644
--- a/web/Lib/Common.pdb
+++ b/web/Lib/Common.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 34b7bf3..20e0c1e 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index d0ec330..18ac19b 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Lib/Model.dll b/web/Lib/Model.dll
index 1892179..946da12 100644
--- a/web/Lib/Model.dll
+++ b/web/Lib/Model.dll
Binary files differ
diff --git a/web/Lib/Model.pdb b/web/Lib/Model.pdb
index f0f6de5..badf488 100644
--- a/web/Lib/Model.pdb
+++ b/web/Lib/Model.pdb
Binary files differ
diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index 35395b4..e38ab31 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(),
diff --git a/web/web/GwSp.aspx b/web/web/GwSp.aspx
index 3b3d847..3e4bd30 100644
--- a/web/web/GwSp.aspx
+++ b/web/web/GwSp.aspx
@@ -470,15 +470,15 @@
<div class="form-group">
<div class="input-group m-b">
<input type="button" value="鏌ヨ" class="btn btn-primary action-query" />
- <input class="btn btn-warning action-create" value="鍒涘缓鏂拌处鍙�" type="button" />
+ <input class="btn btn-warning action-create" value="鍒涘缓鏂拌处鍙�" type="button" />
+ <input type="button" value="鎵归噺淇敼閫氶亾" class="btn btn-danger action-modal-op" />
+ <input type="button" class="btn btn-info action-export" value="瀵煎嚭鏁版嵁" />
</div>
</div>
</div>
</div>
</form>
<div class="table-responsive">
- <input type="button" value="鎵归噺淇敼閫氶亾" class="btn btn-danger action-modal-op" />
- <input type="button" class="btn btn-info action-export" value="瀵煎嚭鏁版嵁" />
<table class="table table-striped table-bordered table-hover" id="gwspTable">
<thead>
<tr class="header">
@@ -503,9 +503,11 @@
<th>
閫氶亾
</th>
+ <!--
<th>
澶辫触琛ュ彂
</th>
+ -->
<th>
浠樿垂鏂瑰紡
</th>
@@ -520,13 +522,13 @@
//鏉℃暟/浣欓/浠樿垂鏂瑰紡/鍗曚环/鍛婅
鍓╀綑鎬绘潯鏁�/鍩烘湰鏉℃暟/璧犻�佹潯鏁�/浠樿垂鏂瑰紡/鍗曚环/鍛婅
</th>
- -->
<th>
璐﹀彿閰嶇疆灞炴��
</th>
<th>
鎵╁睍鍙�
</th>
+ -->
<th>
瀹㈡埛IP
</th>
@@ -536,7 +538,7 @@
<th>
婵�娲绘椂闂�
</th>
- <th colspan="4">
+ <th class="text-center" width="150px">
鎿嶄綔
</th>
</tr>
--
Gitblit v1.9.1