From 9c38dbf93ea5b7dea6b34b03cb3143812b20147d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 七月 2025 23:05:41 +0800
Subject: [PATCH] BUG

---
 DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
index 4dbf148..662bd38 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.cs
@@ -1,17 +1,11 @@
-锘縰sing DevExpress.Utils.VisualEffects;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
 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
@@ -26,9 +20,10 @@
 
         private void GetList()
         {
+            this.flowLayoutPanel1.Controls.Clear();
             var _obj = new
             {
-
+                keyType = ""
             };
             var strReturn = "";
             try
@@ -40,27 +35,51 @@
                 foreach (DataRow row in dt.Rows)
                 {
                     SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
-                    btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
+                    if (row["reportType"].ToString().StartsWith("瀹㈡埛妯℃澘"))
+                    {
+                        btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32;
+                    }
+                    else
+                        btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
                     btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
                     btn.Name = Guid.NewGuid().ToString();
-                    btn.Size = new System.Drawing.Size(150, 150);
+                    btn.Size = new System.Drawing.Size(170, 170);
                     btn.TabIndex = 1;
                     btn.Text = row["reportType"].ToString() + "\n" + row["reportName"].ToString();
                     btn.Margin = new System.Windows.Forms.Padding(20);
-                    btn.Tag = row["reportType"].ToString()+ "{}";
+                    btn.Tag = row["reportType"].ToString() + "{}";
                     this.flowLayoutPanel1.Controls.Add(btn);
                     btn.Click += Btn_Click;
                 }
+
+                SimpleButton btn2 = new DevExpress.XtraEditors.SimpleButton();
+                btn2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.addfile_32x32;
+                btn2.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
+                btn2.Name = Guid.NewGuid().ToString();
+                btn2.Size = new System.Drawing.Size(150, 150);
+                btn2.TabIndex = 1;
+                btn2.Text = "澧炲姞瀹㈡埛" + "\n" + "妯℃澘";
+                btn2.Margin = new System.Windows.Forms.Padding(20);
+                this.flowLayoutPanel1.Controls.Add(btn2);
+                btn2.Click += (s, e) =>
+                {
+                    EasyRptEdtShow frm = new EasyRptEdtShow();
+                    frm.UpdateParent += (ss, ee) =>
+                    {
+                        GetList();
+                    };
+                    frm.ShowDialog();
+                };
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
         private void Btn_Click(object sender, EventArgs e)
         {
-            string _guid =Guid.NewGuid().ToString();
+            string _guid = Guid.NewGuid().ToString();
             SimpleButton btn = (SimpleButton)sender;
             string rptParameter = btn.Tag.ToString();
             if (string.IsNullOrEmpty(rptParameter))
@@ -69,7 +88,7 @@
                 return;
             }
             var _bl = false;
-            _bl = _ckRptService(_guid,rptParameter);
+            _bl = _ckRptService(_guid, rptParameter);
             //濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
             if (_bl)
             {
@@ -82,7 +101,7 @@
             rptWizard.ShowDialog();
         }
 
-        private bool _ckRptService(string _guid,  string rptParameter)
+        private bool _ckRptService(string _guid, string rptParameter)
         {
             try
             {

--
Gitblit v1.9.3