Merge branch 'master' of https://gitee.com/weixin2015/1257-upper-computer-SQLServer
This commit is contained in:
@@ -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">
|
||||
<PropertyGroup>
|
||||
<ProjectView>ProjectFiles</ProjectView>
|
||||
<ProjectView>ShowAllFiles</ProjectView>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -76,8 +76,8 @@ namespace JinYuan.Helper
|
||||
public string Topic1 = "EVE/60J/CTPCTQ/602VIW01";
|
||||
public string BU_id = "EVE8BU";
|
||||
public string District_id = "JM";
|
||||
public string Factory_id = "602";
|
||||
public string Production_line_id = "602L";
|
||||
public string Factory_id = "60J";
|
||||
public string Production_line_id = "MW-602";
|
||||
public string Work_center_id = "602VIE01";
|
||||
public string Device_name = "602VIW01";
|
||||
public string Action_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
+1
-1
@@ -163,7 +163,7 @@
|
||||
//
|
||||
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.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.Name = "btSatrt";
|
||||
this.btSatrt.Padding = new System.Windows.Forms.Padding(2);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectView>ProjectFiles</ProjectView>
|
||||
<ProjectView>ShowAllFiles</ProjectView>
|
||||
<PublishUrlHistory>publish\</PublishUrlHistory>
|
||||
<InstallUrlHistory />
|
||||
<SupportUrlHistory />
|
||||
|
||||
Reference in New Issue
Block a user