From fe09fca3e77be09fed738a975ff9c5a508c2dd0d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 08:31:56 +0800
Subject: [PATCH] 检验

---
 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs |   69 +++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 298ea7c..356cdb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -1,42 +1,34 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.Sys
 {
+
     public partial class SysLog : DevExpress.XtraEditors.XtraForm
     {
+        List<FilterEntity> _filterList = new List<FilterEntity>();
         public SysLog()
         {
             InitializeComponent();
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             getPageList(1, UtilityHelper.GetPageSize());
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            gridView1.IndicatorWidth = 50;
+            gridView1.CustomDrawRowIndicator += (s, e) =>
+            {
+                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+                {
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+                }
+            };
         }
-        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            //// 鑾峰彇GridView缁勪欢
-            //GridView view = sender as GridView;
-            //// 纭繚view涓嶄负null
-            //if (view == null) return;
-            //// 鑾峰彇搴旂敤鐨勭瓫閫夊櫒淇℃伅
-            //string filter = view.ActiveFilterString;
-            //MessageBox.Show(filter);
-            //getPageList(1, UtilityHelper.GetPageSize());
-        }
+     
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -46,7 +38,27 @@
         {
             getPageList(curPage, pageSize);
         }
-
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1, pageBar1.RowsCount);
+        }
         /// <summary>
         /// 鍒锋柊浜嬩欢
         /// </summary>
@@ -54,7 +66,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.ChangeTab(xtraTabControl1, 0);
+            UtilityHelper.JumpToTab(xtraTabControl1, 0);
             getPageList(1, UtilityHelper.GetPageSize());
         }
         /// <summary>
@@ -64,12 +76,17 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage, int pageSize)
         {
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "operationTime", "desc", "", "");
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            foreach (FilterEntity itm in _filterList)
+            {
+                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+            }
+            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME", "desc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
             {
                 string strReturn = UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                 DataTable dt = dd.rtnData.list;
                 gcMain.BindingContext = new BindingContext();
                 gcMain.DataSource = dt;

--
Gitblit v1.9.3