From d40f55fc2cf19c5fca6cdf9001a3b15b1040bef7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 09 四月 2025 14:12:46 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 47 +++++++++++------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9 ++++
DevApp/Gs.DevApp/App.config | 4 +-
DevApp/Gs.DevApp/XtraForm1.resx | 3 -
DevApp/Gs.DevApp/XtraForm1.cs | 4 +-
5 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d4703e..09d6be2 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 997f574..7fb333f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -308,6 +308,12 @@
<Compile Include="DevFrm\FQC\Frm_FqcDetect01Check.Designer.cs">
<DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\MesFqcExceptional.Designer.cs">
+ <DependentUpon>MesFqcExceptional.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\FQC\SelectFqcItem.cs">
<SubType>Form</SubType>
</Compile>
@@ -1216,6 +1222,9 @@
<EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01Check.resx">
<DependentUpon>Frm_FqcDetect01Check.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
+ <DependentUpon>MesFqcExceptional.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\FQC\SelectFqcItem.resx">
<DependentUpon>SelectFqcItem.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index ef4e933..507a269 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -28,47 +28,46 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.testo = new DevExpress.XtraEditors.LabelControl();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.SuspendLayout();
this.SuspendLayout();
//
- // simpleButton1
+ // splitContainerControl1
//
- this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.statistical_16x16;
- this.simpleButton1.Location = new System.Drawing.Point(243, 65);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(94, 29);
- this.simpleButton1.TabIndex = 5;
- this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ this.splitContainerControl1.Location = new System.Drawing.Point(192, 205);
+ this.splitContainerControl1.Name = "splitContainerControl1";
//
- // testo
+ // splitContainerControl1.Panel1
//
- this.testo.Location = new System.Drawing.Point(168, 293);
- this.testo.Name = "testo";
- this.testo.Size = new System.Drawing.Size(81, 18);
- this.testo.TabIndex = 6;
- this.testo.Text = "labelControl1";
+ this.splitContainerControl1.Panel1.Text = "Panel1";
+ //
+ // splitContainerControl1.Panel2
+ //
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.Size = new System.Drawing.Size(200, 100);
+ this.splitContainerControl1.TabIndex = 0;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(887, 659);
- this.Controls.Add(this.testo);
- this.Controls.Add(this.simpleButton1);
+ this.Controls.Add(this.splitContainerControl1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private DevExpress.XtraEditors.LabelControl testo;
- private DevExpress.Utils.ToolTipController tips;
+
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index 2a7405a..8867059 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -23,7 +23,7 @@
public XtraForm1()
{
InitializeComponent();
-
+
}
private void simpleButton1_Click(object sender, EventArgs e)
@@ -42,7 +42,7 @@
aa.ToolTipType = ToolTipType.Standard;//鏍囧噯鏍峰紡锛屽彲鏄剧ず楦熷槾銆�
aa.IconType = ToolTipIconType.Information; //娑堟伅鍥炬爣
aa.IconSize = ToolTipIconSize.Small; //澶у浘鏍�
- tips.ShowHint(aa);
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.resx b/DevApp/Gs.DevApp/XtraForm1.resx
index 5160e8b..1af7de1 100644
--- a/DevApp/Gs.DevApp/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/XtraForm1.resx
@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3