From 4e3866d4a9f8b55dd2a6dceaf64ec0b50458e9bd Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 23:32:59 +0800
Subject: [PATCH] 111
---
DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs | 3 +--
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 11 +++++++++++
DevApp/GsDevSolution.sln | 12 ------------
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs | 2 +-
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
index 60a5f6c..8ea2748 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
@@ -16,7 +16,7 @@
public partial class Frm_ShouJianDetect01H5 : DevExpress.XtraEditors.XtraForm
{
private string guid = "";
- private string WebApiUrl = "http://192.168.0.51:86/AutoUpdater/h5/shoujian.html";
+ private string WebApiUrl = "http://192.168.0.51:8086/AutoUpdater/h5/shoujian.html";
private ChromiumWebBrowser chromeBrowser;
public Frm_ShouJianDetect01H5(string _guid)
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
index 6ed4f8b..18c06c1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
@@ -44,12 +44,11 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
-
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(259, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(259, 24);
this.lookSearchSupplier.TabIndex = 10;
//
// searchLookUpEdit1View
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index 288cce0..b617c35 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -39,6 +39,7 @@
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txtGWM = new DevExpress.XtraEditors.TextEdit();
+ this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.txtGs.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_slaveAddress.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -113,6 +114,7 @@
//
// panelControl1
//
+ this.panelControl1.Controls.Add(this.simpleButton3);
this.panelControl1.Controls.Add(this.btnEdit);
this.panelControl1.Controls.Add(this.simpleButton1);
this.panelControl1.Controls.Add(this.labelControl2);
@@ -162,6 +164,14 @@
this.txtGWM.Size = new System.Drawing.Size(183, 24);
this.txtGWM.TabIndex = 7;
//
+ // simpleButton3
+ //
+ this.simpleButton3.Location = new System.Drawing.Point(683, 13);
+ this.simpleButton3.Name = "simpleButton3";
+ this.simpleButton3.Size = new System.Drawing.Size(94, 29);
+ this.simpleButton3.TabIndex = 11;
+ this.simpleButton3.Text = "simpleButton3";
+ //
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -194,5 +204,6 @@
private DevExpress.XtraEditors.TextEdit txtGWM;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private DevExpress.XtraEditors.ButtonEdit btnEdit;
+ private DevExpress.XtraEditors.SimpleButton simpleButton3;
}
}
\ No newline at end of file
diff --git a/DevApp/GsDevSolution.sln b/DevApp/GsDevSolution.sln
index 14d4b61..d90da1b 100644
--- a/DevApp/GsDevSolution.sln
+++ b/DevApp/GsDevSolution.sln
@@ -5,10 +5,6 @@
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.DevApp", "Gs.DevApp\Gs.DevApp.csproj", "{A7EB5F78-699E-4514-8905-30842765E673}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.WeightIqc", "Gs.WeightIqc\Gs.WeightIqc.csproj", "{31ED2821-04C4-4A4A-B794-E4972BBB4810}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gs.WeightLine", "Gs.WeightLine\Gs.WeightLine.csproj", "{9B6D4E64-C711-4856-BFA7-C746CEC2B0F8}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@
{A7EB5F78-699E-4514-8905-30842765E673}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7EB5F78-699E-4514-8905-30842765E673}.Release|Any CPU.Build.0 = Release|Any CPU
- {31ED2821-04C4-4A4A-B794-E4972BBB4810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {31ED2821-04C4-4A4A-B794-E4972BBB4810}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {31ED2821-04C4-4A4A-B794-E4972BBB4810}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {31ED2821-04C4-4A4A-B794-E4972BBB4810}.Release|Any CPU.Build.0 = Release|Any CPU
- {9B6D4E64-C711-4856-BFA7-C746CEC2B0F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9B6D4E64-C711-4856-BFA7-C746CEC2B0F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9B6D4E64-C711-4856-BFA7-C746CEC2B0F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9B6D4E64-C711-4856-BFA7-C746CEC2B0F8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--
Gitblit v1.9.3