SoftwareGroup/602_WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/weixin2015/1257-upper-computer-SQLServer

Browse Source
This commit is contained in:
fy
2025-09-09 11:56:25 +08:00
parent 02275578d3 27d5236f43
commit 7776810e50
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JinYuan.Helper/JinYuan.Helper.csproj.user
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
JinYuan.Helper/SendDateMQTT.cs
+2 -2
View File
@@ -76,8 +76,8 @@ namespace JinYuan.Helper
public string Topic1 = "EVE/60J/CTPCTQ/602VIW01"; public string Topic1 = "EVE/60J/CTPCTQ/602VIW01";
public string BU_id = "EVE8BU"; public string BU_id = "EVE8BU";
public string District_id = "JM"; public string District_id = "JM";
public string Factory_id = "602"; public string Factory_id = "60J";
public string Production_line_id = "602L"; public string Production_line_id = "MW-602";
public string Work_center_id = "602VIE01"; public string Work_center_id = "602VIE01";
public string Device_name = "602VIW01"; public string Device_name = "602VIW01";
public string Action_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); public string Action_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
LargeSquareOne/FrmDataMonitor.Designer.cs
Generated
+1 -1
View File
@@ -163,7 +163,7 @@
// //
this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.btSatrt.BackNormalColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btSatrt.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btSatrt.Location = new System.Drawing.Point(42, 105); this.btSatrt.Location = new System.Drawing.Point(42, 32);
this.btSatrt.Margin = new System.Windows.Forms.Padding(2); this.btSatrt.Margin = new System.Windows.Forms.Padding(2);
this.btSatrt.Name = "btSatrt"; this.btSatrt.Name = "btSatrt";
this.btSatrt.Padding = new System.Windows.Forms.Padding(2); this.btSatrt.Padding = new System.Windows.Forms.Padding(2);
LargeSquareOne/LargeSquareOne.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory> <PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory /> <InstallUrlHistory />
<SupportUrlHistory /> <SupportUrlHistory />