From 2891ae3b191939e9c1f47211e3863f51ed3545a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 11:11:55 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs |   68 ++++++++++------------------------
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs          |    5 +-
 2 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index 38ffea8..5be98a1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.lb_pageStatus = new DevExpress.XtraEditors.LabelControl();
             this.gv_pageStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_pageIdx = new DevExpress.XtraEditors.LabelControl();
@@ -41,8 +41,6 @@
             this.lb_pageGroup = new DevExpress.XtraEditors.LabelControl();
             this.txt_pageGroup = new DevExpress.XtraEditors.TextEdit();
             this.gv_pageGroup = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_icoimg = new DevExpress.XtraEditors.LabelControl();
-            this.txt_icoimg = new DevExpress.XtraEditors.TextEdit();
             this.gv_icoimg = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_path = new DevExpress.XtraEditors.LabelControl();
             this.txt_path = new DevExpress.XtraEditors.TextEdit();
@@ -65,7 +63,6 @@
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_icoimg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -84,7 +81,7 @@
             // 
             this.lb_pageStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_pageStatus.Appearance.Options.UseFont = true;
-            this.lb_pageStatus.Location = new System.Drawing.Point(471, 102);
+            this.lb_pageStatus.Location = new System.Drawing.Point(424, 61);
             this.lb_pageStatus.Name = "lb_pageStatus";
             this.lb_pageStatus.Size = new System.Drawing.Size(34, 21);
             this.lb_pageStatus.TabIndex = 222;
@@ -109,7 +106,7 @@
             // 
             this.lb_pageIdx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_pageIdx.Appearance.Options.UseFont = true;
-            this.lb_pageIdx.Location = new System.Drawing.Point(471, 61);
+            this.lb_pageIdx.Location = new System.Drawing.Point(424, 20);
             this.lb_pageIdx.Name = "lb_pageIdx";
             this.lb_pageIdx.Size = new System.Drawing.Size(34, 21);
             this.lb_pageIdx.TabIndex = 219;
@@ -133,7 +130,7 @@
             // 
             this.lb_pageGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_pageGroup.Appearance.Options.UseFont = true;
-            this.lb_pageGroup.Location = new System.Drawing.Point(471, 20);
+            this.lb_pageGroup.Location = new System.Drawing.Point(95, 103);
             this.lb_pageGroup.Name = "lb_pageGroup";
             this.lb_pageGroup.Size = new System.Drawing.Size(34, 21);
             this.lb_pageGroup.TabIndex = 217;
@@ -141,11 +138,11 @@
             // 
             // txt_pageGroup
             // 
-            this.txt_pageGroup.Location = new System.Drawing.Point(516, 16);
+            this.txt_pageGroup.Location = new System.Drawing.Point(134, 99);
             this.txt_pageGroup.Name = "txt_pageGroup";
             this.txt_pageGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_pageGroup.Properties.Appearance.Options.UseFont = true;
-            this.txt_pageGroup.Size = new System.Drawing.Size(150, 28);
+            this.txt_pageGroup.Size = new System.Drawing.Size(244, 28);
             this.txt_pageGroup.TabIndex = 217;
             // 
             // gv_pageGroup
@@ -161,25 +158,6 @@
             this.gv_pageGroup.Visible = true;
             this.gv_pageGroup.VisibleIndex = 3;
             this.gv_pageGroup.Width = 94;
-            // 
-            // lb_icoimg
-            // 
-            this.lb_icoimg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_icoimg.Appearance.Options.UseFont = true;
-            this.lb_icoimg.Location = new System.Drawing.Point(56, 102);
-            this.lb_icoimg.Name = "lb_icoimg";
-            this.lb_icoimg.Size = new System.Drawing.Size(73, 21);
-            this.lb_icoimg.TabIndex = 216;
-            this.lb_icoimg.Text = "椤甸潰鍥炬爣 ";
-            // 
-            // txt_icoimg
-            // 
-            this.txt_icoimg.Location = new System.Drawing.Point(135, 98);
-            this.txt_icoimg.Name = "txt_icoimg";
-            this.txt_icoimg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_icoimg.Properties.Appearance.Options.UseFont = true;
-            this.txt_icoimg.Size = new System.Drawing.Size(323, 28);
-            this.txt_icoimg.TabIndex = 216;
             // 
             // gv_icoimg
             // 
@@ -211,7 +189,7 @@
             this.txt_path.Name = "txt_path";
             this.txt_path.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_path.Properties.Appearance.Options.UseFont = true;
-            this.txt_path.Size = new System.Drawing.Size(323, 28);
+            this.txt_path.Size = new System.Drawing.Size(244, 28);
             this.txt_path.TabIndex = 213;
             // 
             // gv_path
@@ -244,7 +222,7 @@
             this.txt_pageView.Name = "txt_pageView";
             this.txt_pageView.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_pageView.Properties.Appearance.Options.UseFont = true;
-            this.txt_pageView.Size = new System.Drawing.Size(323, 28);
+            this.txt_pageView.Size = new System.Drawing.Size(244, 28);
             this.txt_pageView.TabIndex = 211;
             // 
             // gv_pageView
@@ -322,10 +300,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.cleartablestyle_16x161;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.cleartablestyle_16x161;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -381,8 +359,6 @@
             this.panel1.Controls.Add(this.lb_pageIdx);
             this.panel1.Controls.Add(this.lb_pageGroup);
             this.panel1.Controls.Add(this.txt_pageGroup);
-            this.panel1.Controls.Add(this.lb_icoimg);
-            this.panel1.Controls.Add(this.txt_icoimg);
             this.panel1.Controls.Add(this.lb_path);
             this.panel1.Controls.Add(this.txt_path);
             this.panel1.Controls.Add(this.lb_pageView);
@@ -390,12 +366,12 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(76, 20);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(744, 291);
+            this.panel1.Size = new System.Drawing.Size(744, 267);
             this.panel1.TabIndex = 1;
             // 
             // txt_pageIdx
             // 
-            this.txt_pageIdx.Location = new System.Drawing.Point(516, 50);
+            this.txt_pageIdx.Location = new System.Drawing.Point(469, 16);
             this.txt_pageIdx.Name = "txt_pageIdx";
             this.txt_pageIdx.Size = new System.Drawing.Size(150, 28);
             this.txt_pageIdx.TabIndex = 224;
@@ -407,7 +383,7 @@
             // 
             // txt_pageStatus
             // 
-            this.txt_pageStatus.Location = new System.Drawing.Point(516, 100);
+            this.txt_pageStatus.Location = new System.Drawing.Point(469, 59);
             this.txt_pageStatus.Name = "txt_pageStatus";
             this.txt_pageStatus.Properties.Caption = "";
             this.txt_pageStatus.Size = new System.Drawing.Size(94, 24);
@@ -415,7 +391,7 @@
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(72, 210);
+            this.labelControl11.Location = new System.Drawing.Point(72, 166);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -426,7 +402,7 @@
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(123, 210);
+            this.lbGuid.Location = new System.Drawing.Point(123, 166);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
@@ -441,7 +417,6 @@
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesSysPageview";
             ((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_icoimg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -479,9 +454,6 @@
 private DevExpress.XtraEditors.LabelControl lb_pageGroup;
 private DevExpress.XtraEditors.TextEdit txt_pageGroup;
  private DevExpress.XtraGrid.Columns.GridColumn gv_pageGroup;
-
-private DevExpress.XtraEditors.LabelControl lb_icoimg;
-private DevExpress.XtraEditors.TextEdit txt_icoimg;
  private DevExpress.XtraGrid.Columns.GridColumn gv_icoimg;
 
 private DevExpress.XtraEditors.LabelControl lb_path;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 45256b0..8200927 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -167,7 +167,6 @@
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 PageView = txt_pageView.Text.Trim(),
                 Path = txt_path.Text.Trim(),
-                Icoimg=txt_icoimg.Text.Trim(),
                 PageGroup=txt_pageGroup.Text.Trim(),
                 PageIdx=txt_pageIdx.Text.Trim(),
                 PageStatus=txt_pageStatus.Checked
@@ -202,7 +201,7 @@
             {
                 _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
             }
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "PAGE_IDX", "asc", "", _sbSqlWhere.ToString());
+            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "a.PAGE_GROUP", "desc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
             {
@@ -284,5 +283,7 @@
                 frm.ShowDialog();
             }
         }
+
+       
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3