From e16d566df68082e69654fc6858f3cb5d462450f1 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 23 五月 2022 01:09:39 +0800
Subject: [PATCH] 日志文件合并处理
---
web/web/GwProduct.ashx | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 19 deletions(-)
diff --git a/web/web/GwProduct.ashx b/web/web/GwProduct.ashx
index ce6f82d..261a614 100644
--- a/web/web/GwProduct.ashx
+++ b/web/web/GwProduct.ashx
@@ -35,7 +35,9 @@
case "add":
return this.Add(context); //娣诲姞
case "list":
- return this.List(context); //鏌ヨ
+ return this.List(context); //浜у搧鏌ヨ
+ case "productClassesList":
+ return this.ProductClassesList(context); //浜у搧鏌ヨ
case "get":
return this.Get(context); //鑾峰彇璁板綍淇℃伅
case "updateStatus":
@@ -68,17 +70,21 @@
int num = 0;
foreach (GwProduct bean in list)
{
+
++num;
- str1 = str1 + (object) "<tr><td>" + "<img src=\"../static/images/productIcon/" + (object) bean.Icon + "\" >";
- str1 = str1 + "</td><td>" + bean.Name + "</td>";
- str1 = string.Concat(new object[4]
+ //str1 = str1 + (object) "<tr><td>" + "<img src=\"../static/images/productIcon/" + (object) bean.Icon + "\" >";
+ if (bean.Classes == 1 && !string.IsNullOrEmpty(bean.Icon))
{
- str1,
- "<td>",
- bean.Instructions,
- "</td>"
- });
- str1 = str1 + "<td>" + (object)this.ClassesToName(bean.Classes) + "</td>";
+ str1 += "<tr><td>" + "<img src=\"../static/images/productIcon/" + (object)bean.Icon + "\" >" + "</td>";
+ }
+ else
+ {
+ str1 += "<tr><td>" + (object)bean.Icon + "</td>";
+ }
+
+ str1 = str1 + "<td>" + ProductToName(bean.ParentId) + "</td>";
+ str1 += "<td>" + bean.Name + "</td>";
+ //str1 = str1 + "<td>" + (object)this.ClassesToName(bean.Classes) + "</td>";
if (bean.RouterType == 1)
{
str1 += "<td rowspan=\"1\"><div class=\"btn btn-primary btn-xs\">鐐硅矾鐢�</div>";
@@ -93,16 +99,16 @@
{
str1 += "<td rowspan=\"1\"></td>";
}
- str1 = str1 + "<td>" + ProductToName(bean.ParentId) + "</td>";
str1 = str1 + "<td>" + IsDefaultToName(bean.IsDefault) + "</td>";
str1 = str1 + "<td>" + IsEnableToName(bean.IsEnable) + "</td>";
- str1 = string.Concat(new object[4]
- {
- str1,
- "<td>",
- bean.Sort,
- "</td>"
- });
+ /**
+ str1 = string.Concat(new object[4]
+ {
+ str1,
+ "<td>",
+ bean.Sort,
+ "</td>"
+ });**/
str1 = string.Concat(new object[4]
{
str1,
@@ -113,6 +119,13 @@
str1 += string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
+ str1 = string.Concat(new object[4]
+ {
+ str1,
+ "<td>",
+ bean.Instructions,
+ "</td>"
+ });
str1 += "<td class=\"text-right\">";
str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.Id );
str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.Id);
@@ -122,7 +135,57 @@
}
}
else
- str1 += "<tr><td colspan=\"13\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+ str1 += "<tr><td colspan=\"11\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
+
+ return new JsonPageResult(true, new
+ {
+ Table = str1.ToString(),
+ TotalCount = recordCount
+ });
+ }
+
+
+
+ //鍔犺浇浜у搧鍒嗙被淇℃伅
+ private JsonPageResult ProductClassesList(PageContext<SysUser> context)
+ {
+ //Console.WriteLine("List.............[" + context.GetInt("name") + "][" + context.GetInt("classes") + "]");
+ int classes = context.GetInt("classes");
+ string name = context.GetString("name");
+
+ int recordCount = 0;
+ int pageSize = context.GetInt("pageSize", 50);
+ int pageIndex = context.GetInt("pageIndex", 1);
+
+ List<GwProduct> list = _Dao.LoadInfoList(classes, name, pageSize, pageIndex, out recordCount);
+
+ string str1 = "";
+ if (list != null && list.Count > 0)
+ {
+
+ int num = 0;
+ foreach (GwProduct bean in list)
+ {
+
+ ++num;
+
+ str1 += "<tr>";
+ str1 += "<td>" + bean.Name + "</td>";
+ str1 += "<td>" + ProductToName(bean.ParentId) + "</td>";
+ str1 = str1 + "<td>" + IsEnableToName(bean.IsEnable) + "</td>";
+ str1 = str1 + "<td>" + bean.CreateTime + "</td>";
+ str1 = str1 + "<td>" + bean.Remark + "</td>";
+
+ str1 += "<td class=\"text-right\">";
+ str1 = bean.IsEnable != 0 ? str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"0\" class=\"action-update-status btn btn-primary btn-xs\"><i class=\"fa fa-toggle-off\"></i> 鍋滅敤</a> ", (object) bean.Id ) : str1 + string.Format("<a href=\"javascript:;\" data-id=\"{0}\" data-is_enable=\"1\" class=\"action-update-status btn btn-default btn-xs\"><i class=\"fa fa-toggle-on\"/></i> 鍚敤</a> ", (object) bean.Id );
+ str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-modal-edit btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 缂栬緫</a> ", (object) bean.Id);
+ str1 += string.Format("<a href=\"javascript:;\" data-id=\"{0}\" class=\"action-delete btn btn-default btn-xs\"><i class=\"fa fa-trash\"></i> 鍒犻櫎</a> ", (object) bean.Id);
+ str1 += "</td>";
+ str1 += "</tr>";
+ }
+ }
+ else
+ str1 += "<tr><td colspan=\"11\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>";
return new JsonPageResult(true, new
{
--
Gitblit v1.9.1