From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/ShowUp.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
index a6fd13a..96a5f77 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
@@ -1,12 +1,9 @@
-锘縰sing CefSharp;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using System;
using System.Collections.Generic;
using System.Configuration;
-using System.Data;
using System.Net;
-using System.Windows.Documents;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -33,7 +30,6 @@
this.parentGuid = _parentGuid;
this.ucUpFile1.parentGuid = _parentGuid;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
-
getBtn();
}
@@ -60,13 +56,19 @@
lst.Add(new
{
btnTxt = "妫�楠岄」鐩甛nXLS妯℃澘",
- xls = "001妫�楠岄」鐩�.xls"//001
+ xls = "002妫�楠岄」鐩�.xls"//001
});
lst.Add(new
{
btnTxt = "鐗╂枡妫�楠岄」鐩甛nXLS妯℃澘",
- xls = "001鐗╂枡妫�楠岄」鐩�.xls"
+ xls = "003鐗╂枡妫�楠岄」鐩�.xls"
+ });
+
+ lst.Add(new
+ {
+ btnTxt = "宸ュ崟鍚庣洊鐮乗nXLS妯℃澘",
+ xls = "004宸ュ崟鍚庣洊鐮�.xls"
});
foreach (var obj in lst)
@@ -75,10 +77,10 @@
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(120, 120);
+ btn.Size = new System.Drawing.Size(180, 140);
btn.TabIndex = 1;
btn.Text = obj.btnTxt;
- btn.Margin = new System.Windows.Forms.Padding(10);
+ btn.Margin = new System.Windows.Forms.Padding(5);
btn.Tag = obj.xls;
this.flowLayoutPanel1.Controls.Add(btn);
btn.Click += Btn_Click;
--
Gitblit v1.9.3