From aa77240aba2a41a9a653f6400ed1ff54310f92d4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 13:03:31 +0800
Subject: [PATCH] 字典

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs |   66 ++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 6de94da..d2ae726 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -34,6 +34,7 @@
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
            {
@@ -54,7 +55,7 @@
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -95,7 +96,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+              var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -303,7 +304,7 @@
                     {
                         gcMain1.DataSource = dt;
                         gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
                         UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -385,7 +386,7 @@
         /// <param name="e"></param>
         private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
         {
-            if (e.Page.Name == "tabMxPage3")
+            if (e.Page.Name == "tabMxPage2")
             {
                 getFileList();
             }
@@ -412,9 +413,9 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMx3.BindingContext = new BindingContext();
-                    gcMx3.DataSource = dt;
-                    gcMx3.ForceInitialize();
+                    gcMx4.BindingContext = new BindingContext();
+                    gcMx4.DataSource = dt;
+                    gcMx4.ForceInitialize();
                 }
                 else
                 {
@@ -439,27 +440,47 @@
             };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
-                var dd = UtilityHelper.ReturnToList(strReturn);
-                var dt = dd.rtnData;
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+                JObject _job = JObject.Parse(strJson);
+                JArray array = new JArray();
+                foreach (var a in _job["rtnData"]["list"])
+                {
+                    array.Add(a);
+                }
+                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                 gcMx2.BindingContext = new BindingContext();
                 gcMx2.DataSource = dt;
                 gcMx2.ForceInitialize();
                 gvMx2.BestFitColumns();
+                JArray array1 = new JArray();
+                foreach (var a in _job["rtnData"]["list2"])
+                {
+                    array1.Add(a);
+                }
+                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                gcMx4.BindingContext = new BindingContext();
+                gcMx4.DataSource = dt1;
+                gcMx4.ForceInitialize();
+                gvMx4.BestFitColumns();
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
-                var dr = gvMx3.GetDataRow(rowhandle);
+                var dr = gvMx4.GetDataRow(rowhandle);
                 var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
@@ -471,7 +492,7 @@
                     strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
                         JsonConvert.SerializeObject(lst));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
+                    if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
@@ -480,16 +501,21 @@
                 }
             }
         }
+        /// <summary>
+        /// 娴忚
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
                 try
                 {
-                    var dr = gvMx3.GetDataRow(rowhandle);
+                    var dr = gvMx4.GetDataRow(rowhandle);
                     var urlPath = dr["urlPath"].ToString();
                     Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
                     frm.ShowDialog();
@@ -500,17 +526,21 @@
                 }
             }
         }
-
+        /// <summary>
+        /// 涓嬭浇
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            var rowhandle = gvMx3.FocusedRowHandle;
+            var rowhandle = gvMx4.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
             if (e.Button.Index == 0)
             {
                 try
                 {
-                    var dr = gvMx3.GetDataRow(rowhandle);
+                    var dr = gvMx4.GetDataRow(rowhandle);
                     var urlPath = dr["urlPath"].ToString();
                     using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
                     {

--
Gitblit v1.9.3