diff --git a/AIMS.UI/AIMS.UI.csproj b/AIMS.UI/AIMSControls.csproj similarity index 99% rename from AIMS.UI/AIMS.UI.csproj rename to AIMS.UI/AIMSControls.csproj index 039cbcd..3149c78 100644 --- a/AIMS.UI/AIMS.UI.csproj +++ b/AIMS.UI/AIMSControls.csproj @@ -6,8 +6,8 @@ AnyCPU {84D0ECA0-7A0B-4E7F-90F1-E86C99F9E0DA} Library - AIMS.UI - AIMS.UI + AIMSControls + AIMSControls v4.0 512 true @@ -858,6 +858,7 @@ MainFormManage.cs + frmAnaesthesiaChargeSelect.cs diff --git a/AIMS.UI/DataDictionary/frmAnaesthesiaMethod.Designer.cs b/AIMS.UI/DataDictionary/frmAnaesthesiaMethod.Designer.cs index d9489b1..dbf3670 100644 --- a/AIMS.UI/DataDictionary/frmAnaesthesiaMethod.Designer.cs +++ b/AIMS.UI/DataDictionary/frmAnaesthesiaMethod.Designer.cs @@ -393,7 +393,7 @@ // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbAdd.ForeColor = System.Drawing.Color.Black; - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 56); @@ -410,7 +410,7 @@ // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbModify.ForeColor = System.Drawing.Color.Black; - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 56); @@ -427,7 +427,7 @@ // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbCancel.ForeColor = System.Drawing.Color.Black; - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 56); @@ -439,7 +439,7 @@ // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbSava.ForeColor = System.Drawing.Color.Black; - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 56); @@ -451,7 +451,7 @@ // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbExit.ForeColor = System.Drawing.Color.Black; - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 56); diff --git a/AIMS.UI/DataDictionary/frmAppliance.designer.cs b/AIMS.UI/DataDictionary/frmAppliance.designer.cs index 1fbb19f..675b95d 100644 --- a/AIMS.UI/DataDictionary/frmAppliance.designer.cs +++ b/AIMS.UI/DataDictionary/frmAppliance.designer.cs @@ -318,7 +318,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 51); @@ -334,7 +334,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 51); @@ -350,7 +350,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 51); @@ -366,7 +366,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 51); @@ -382,7 +382,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 51); diff --git a/AIMS.UI/DataDictionary/frmApplianceUseType.designer.cs b/AIMS.UI/DataDictionary/frmApplianceUseType.designer.cs index 96feba0..910ecc4 100644 --- a/AIMS.UI/DataDictionary/frmApplianceUseType.designer.cs +++ b/AIMS.UI/DataDictionary/frmApplianceUseType.designer.cs @@ -276,7 +276,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 56); @@ -292,7 +292,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 56); @@ -308,7 +308,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 56); @@ -324,7 +324,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 56); @@ -340,7 +340,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 56); diff --git a/AIMS.UI/DataDictionary/frmBasicDictionary.Designer.cs b/AIMS.UI/DataDictionary/frmBasicDictionary.Designer.cs index 7baa563..fa0f6b4 100644 --- a/AIMS.UI/DataDictionary/frmBasicDictionary.Designer.cs +++ b/AIMS.UI/DataDictionary/frmBasicDictionary.Designer.cs @@ -197,7 +197,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -324,7 +324,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -335,7 +335,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -351,7 +351,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -367,7 +367,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmBloodGasAnalysisDict.Designer.cs b/AIMS.UI/DataDictionary/frmBloodGasAnalysisDict.Designer.cs index 6cd5fc2..e2d3dcb 100644 --- a/AIMS.UI/DataDictionary/frmBloodGasAnalysisDict.Designer.cs +++ b/AIMS.UI/DataDictionary/frmBloodGasAnalysisDict.Designer.cs @@ -267,7 +267,7 @@ namespace AIMS.PublicUI.UI // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 51); @@ -282,7 +282,7 @@ namespace AIMS.PublicUI.UI // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 51); @@ -297,7 +297,7 @@ namespace AIMS.PublicUI.UI // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 51); @@ -312,7 +312,7 @@ namespace AIMS.PublicUI.UI // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 51); @@ -327,7 +327,7 @@ namespace AIMS.PublicUI.UI // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 51); diff --git a/AIMS.UI/DataDictionary/frmDepartment.Designer.cs b/AIMS.UI/DataDictionary/frmDepartment.Designer.cs index 7e39bfb..f1b7882 100644 --- a/AIMS.UI/DataDictionary/frmDepartment.Designer.cs +++ b/AIMS.UI/DataDictionary/frmDepartment.Designer.cs @@ -95,7 +95,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -111,7 +111,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -127,7 +127,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -143,7 +143,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -159,7 +159,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmDisease.Designer.cs b/AIMS.UI/DataDictionary/frmDisease.Designer.cs index 2953a25..a17532e 100644 --- a/AIMS.UI/DataDictionary/frmDisease.Designer.cs +++ b/AIMS.UI/DataDictionary/frmDisease.Designer.cs @@ -81,7 +81,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -97,7 +97,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -113,7 +113,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -129,7 +129,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -145,7 +145,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmDrugs.Designer.cs b/AIMS.UI/DataDictionary/frmDrugs.Designer.cs index 857fc93..1a82382 100644 --- a/AIMS.UI/DataDictionary/frmDrugs.Designer.cs +++ b/AIMS.UI/DataDictionary/frmDrugs.Designer.cs @@ -134,7 +134,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -150,7 +150,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -166,7 +166,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -182,7 +182,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -198,7 +198,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmEvents.Designer.cs b/AIMS.UI/DataDictionary/frmEvents.Designer.cs index c0b7378..a5bf6c8 100644 --- a/AIMS.UI/DataDictionary/frmEvents.Designer.cs +++ b/AIMS.UI/DataDictionary/frmEvents.Designer.cs @@ -89,7 +89,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -105,7 +105,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -121,7 +121,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -137,7 +137,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -153,7 +153,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmMenu.Designer.cs b/AIMS.UI/DataDictionary/frmMenu.Designer.cs index 50502f0..adedf7c 100644 --- a/AIMS.UI/DataDictionary/frmMenu.Designer.cs +++ b/AIMS.UI/DataDictionary/frmMenu.Designer.cs @@ -112,7 +112,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -128,7 +128,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -144,7 +144,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -160,7 +160,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -176,7 +176,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmMenu.cs b/AIMS.UI/DataDictionary/frmMenu.cs index 553c741..44c9e6c 100644 --- a/AIMS.UI/DataDictionary/frmMenu.cs +++ b/AIMS.UI/DataDictionary/frmMenu.cs @@ -38,14 +38,14 @@ namespace AIMS.PublicUI.UI intMenuOrder.Text = "0"; //资源图片映射 - AIMS.UI.Properties.Resources res = new AIMS.UI.Properties.Resources(); + AIMSControls.Properties.Resources res = new AIMSControls.Properties.Resources(); var info = res.GetType() .GetProperties(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Instance) .Where(x => x.PropertyType.Name == "Bitmap" && x.Name.StartsWith("M_")); foreach (var item in info) { Image img = null; - img = AIMS.UI.Properties.Resources.ResourceManager.GetObject(item.Name) as Image; + img = AIMSControls.Properties.Resources.ResourceManager.GetObject(item.Name) as Image; if (img == null) continue; ButtonItem bti = new ButtonItem() diff --git a/AIMS.UI/DataDictionary/frmOperation.Designer.cs b/AIMS.UI/DataDictionary/frmOperation.Designer.cs index 71c0c2d..0ab8cd0 100644 --- a/AIMS.UI/DataDictionary/frmOperation.Designer.cs +++ b/AIMS.UI/DataDictionary/frmOperation.Designer.cs @@ -82,7 +82,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -98,7 +98,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -114,7 +114,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -130,7 +130,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -146,7 +146,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmOperationBodyPosition.Designer.cs b/AIMS.UI/DataDictionary/frmOperationBodyPosition.Designer.cs index 8f11ea6..0eaf2d7 100644 --- a/AIMS.UI/DataDictionary/frmOperationBodyPosition.Designer.cs +++ b/AIMS.UI/DataDictionary/frmOperationBodyPosition.Designer.cs @@ -84,7 +84,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -100,7 +100,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -116,7 +116,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -132,7 +132,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -148,7 +148,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmOperationPosition.Designer.cs b/AIMS.UI/DataDictionary/frmOperationPosition.Designer.cs index 4614ec3..6531af4 100644 --- a/AIMS.UI/DataDictionary/frmOperationPosition.Designer.cs +++ b/AIMS.UI/DataDictionary/frmOperationPosition.Designer.cs @@ -84,7 +84,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -100,7 +100,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -116,7 +116,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -132,7 +132,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -148,7 +148,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmOperationRoom.designer.cs b/AIMS.UI/DataDictionary/frmOperationRoom.designer.cs index fae5174..730fe11 100644 --- a/AIMS.UI/DataDictionary/frmOperationRoom.designer.cs +++ b/AIMS.UI/DataDictionary/frmOperationRoom.designer.cs @@ -111,7 +111,7 @@ // // tsbAdd // - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新增; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新增; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(41, 54); @@ -127,7 +127,7 @@ // // tsbModify // - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(41, 54); @@ -142,7 +142,7 @@ // // tsbCancel // - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(41, 54); @@ -157,7 +157,7 @@ // // tsbSave // - this.tsbSave.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSave.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSave.Name = "tsbSave"; this.tsbSave.Size = new System.Drawing.Size(41, 54); @@ -172,7 +172,7 @@ // // tsbExit // - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(41, 54); diff --git a/AIMS.UI/DataDictionary/frmOutputLiquids.Designer.cs b/AIMS.UI/DataDictionary/frmOutputLiquids.Designer.cs index 8bf238f..8b03347 100644 --- a/AIMS.UI/DataDictionary/frmOutputLiquids.Designer.cs +++ b/AIMS.UI/DataDictionary/frmOutputLiquids.Designer.cs @@ -80,7 +80,7 @@ // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbAdd.ForeColor = System.Drawing.Color.Black; - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -97,7 +97,7 @@ // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbModify.ForeColor = System.Drawing.Color.Black; - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -114,7 +114,7 @@ // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbCancel.ForeColor = System.Drawing.Color.Black; - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -131,7 +131,7 @@ // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbSava.ForeColor = System.Drawing.Color.Black; - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -148,7 +148,7 @@ // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); this.tsbExit.ForeColor = System.Drawing.Color.Black; - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmPatientKind.Designer.cs b/AIMS.UI/DataDictionary/frmPatientKind.Designer.cs index 8a98bf0..4fa306c 100644 --- a/AIMS.UI/DataDictionary/frmPatientKind.Designer.cs +++ b/AIMS.UI/DataDictionary/frmPatientKind.Designer.cs @@ -81,7 +81,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -97,7 +97,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -113,7 +113,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -129,7 +129,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -145,7 +145,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmPerson.Designer.cs b/AIMS.UI/DataDictionary/frmPerson.Designer.cs index 445b4ab..149ea62 100644 --- a/AIMS.UI/DataDictionary/frmPerson.Designer.cs +++ b/AIMS.UI/DataDictionary/frmPerson.Designer.cs @@ -676,7 +676,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -697,7 +697,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -728,7 +728,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -744,7 +744,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -760,7 +760,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmSysConfig.Designer.cs b/AIMS.UI/DataDictionary/frmSysConfig.Designer.cs index f72c0c5..3e8fa9c 100644 --- a/AIMS.UI/DataDictionary/frmSysConfig.Designer.cs +++ b/AIMS.UI/DataDictionary/frmSysConfig.Designer.cs @@ -82,7 +82,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -98,7 +98,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -114,7 +114,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -130,7 +130,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -146,7 +146,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DataDictionary/frmUserPurview.Designer.cs b/AIMS.UI/DataDictionary/frmUserPurview.Designer.cs index 975a7c0..182c220 100644 --- a/AIMS.UI/DataDictionary/frmUserPurview.Designer.cs +++ b/AIMS.UI/DataDictionary/frmUserPurview.Designer.cs @@ -80,7 +80,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_新建; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_新建; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -96,7 +96,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -112,7 +112,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -128,7 +128,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -144,7 +144,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DrugManagement/frmDosageKind.Designer.cs b/AIMS.UI/DrugManagement/frmDosageKind.Designer.cs index 740fe92..83d6c5a 100644 --- a/AIMS.UI/DrugManagement/frmDosageKind.Designer.cs +++ b/AIMS.UI/DrugManagement/frmDosageKind.Designer.cs @@ -77,7 +77,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -93,7 +93,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -109,7 +109,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -125,7 +125,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -141,7 +141,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DrugManagement/frmDosageUnit.Designer.cs b/AIMS.UI/DrugManagement/frmDosageUnit.Designer.cs index ef1008c..faf9549 100644 --- a/AIMS.UI/DrugManagement/frmDosageUnit.Designer.cs +++ b/AIMS.UI/DrugManagement/frmDosageUnit.Designer.cs @@ -201,7 +201,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); @@ -222,7 +222,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -233,7 +233,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -269,7 +269,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -285,7 +285,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/DrugManagement/frmPharmaCology.Designer.cs b/AIMS.UI/DrugManagement/frmPharmaCology.Designer.cs index 4fcd2c5..a1e0a1e 100644 --- a/AIMS.UI/DrugManagement/frmPharmaCology.Designer.cs +++ b/AIMS.UI/DrugManagement/frmPharmaCology.Designer.cs @@ -189,7 +189,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); @@ -210,7 +210,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 46); @@ -221,7 +221,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -257,7 +257,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -273,7 +273,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/FormLogin.cs b/AIMS.UI/FormLogin.cs index cd7322f..f568625 100644 --- a/AIMS.UI/FormLogin.cs +++ b/AIMS.UI/FormLogin.cs @@ -103,7 +103,9 @@ namespace AIMS /// static void Reg() { - DCSoft.Writer.Controls.WriterControl.StaticSetRegisterCode(AIMSExtension.PublicMethod.Decrypt(UI.Properties.Resources.C)); + // 预先初始化一些数据 + DCSoft.Writer.WriterAppHost.PreloadSystem(); + DCSoft.Writer.Controls.WriterControl.StaticSetRegisterCode(AIMSExtension.PublicMethod.Decrypt(AIMSControls.Properties.Resources.C)); } private void btnExit_Click(object sender, EventArgs e) diff --git a/AIMS.UI/FormMainManage.cs b/AIMS.UI/FormMainManage.cs index cca5e11..1f811d8 100644 --- a/AIMS.UI/FormMainManage.cs +++ b/AIMS.UI/FormMainManage.cs @@ -21,7 +21,7 @@ namespace AIMS { InitializeComponent(); Control.CheckForIllegalCrossThreadCalls = false; - Task.Factory.StartNew(() => { PreLoad(); }); + //Task.Factory.StartNew(() => { PreLoad(); }); comboBoxEx1.Items.AddRange(new object[] { eStyle.Office2013 , @@ -569,17 +569,17 @@ namespace AIMS } } } - static void PreLoad() - { - string msg = DCSoft.Writer.Controls.WriterControl.CheckSystemEnvironment(false); - if (msg != null) - { - MessageBox.Show(null, msg, "ϵͳʾ", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - // ԤȳʼһЩ - DCSoft.Writer.WriterAppHost.PreloadSystem(); - DCSoft.Writer.Controls.WriterControl.StaticSetRegisterCode(AIMSExtension.PublicMethod.Decrypt(UI.Properties.Resources.C)); - } + //static void PreLoad() + //{ + // string msg = DCSoft.Writer.Controls.WriterControl.CheckSystemEnvironment(false); + // if (msg != null) + // { + // MessageBox.Show(null, msg, "ϵͳʾ", MessageBoxButtons.OK, MessageBoxIcon.Error); + // return; + // } + // // ԤȳʼһЩ + // DCSoft.Writer.WriterAppHost.PreloadSystem(); + // DCSoft.Writer.Controls.WriterControl.StaticSetRegisterCode(AIMSExtension.PublicMethod.Decrypt(AIMSControls.Properties.Resources.C)); + //} } } \ No newline at end of file diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs index b13992d..94153f5 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.Designer.cs @@ -207,7 +207,7 @@ this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.Font = new System.Drawing.Font("微软雅黑", 11F); this.button8.ForeColor = System.Drawing.Color.DimGray; - this.button8.Image = global::AIMS.UI.Properties.Resources.系统设置; + this.button8.Image = global::AIMSControls.Properties.Resources.系统设置; this.button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button8.Location = new System.Drawing.Point(0, 881); this.button8.Name = "button8"; @@ -227,7 +227,7 @@ this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.Font = new System.Drawing.Font("微软雅黑", 11F); this.button7.ForeColor = System.Drawing.Color.DimGray; - this.button7.Image = global::AIMS.UI.Properties.Resources.文书编辑; + this.button7.Image = global::AIMSControls.Properties.Resources.文书编辑; this.button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button7.Location = new System.Drawing.Point(0, 450); this.button7.Name = "button7"; @@ -247,7 +247,7 @@ this.btnCancelIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelIn.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelIn.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelIn.Image = global::AIMS.UI.Properties.Resources.显示切换; + this.btnCancelIn.Image = global::AIMSControls.Properties.Resources.显示切换; this.btnCancelIn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelIn.Location = new System.Drawing.Point(0, 400); this.btnCancelIn.Name = "btnCancelIn"; @@ -267,7 +267,7 @@ this.btnCancelOperation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelOperation.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelOperation.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelOperation.Image = global::AIMS.UI.Properties.Resources.取消手术; + this.btnCancelOperation.Image = global::AIMSControls.Properties.Resources.取消手术; this.btnCancelOperation.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelOperation.Location = new System.Drawing.Point(0, 350); this.btnCancelOperation.Name = "btnCancelOperation"; @@ -287,7 +287,7 @@ this.btnTemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTemplate.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnTemplate.ForeColor = System.Drawing.Color.DimGray; - this.btnTemplate.Image = global::AIMS.UI.Properties.Resources.模板应用; + this.btnTemplate.Image = global::AIMSControls.Properties.Resources.模板应用; this.btnTemplate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTemplate.Location = new System.Drawing.Point(0, 300); this.btnTemplate.Name = "btnTemplate"; @@ -307,7 +307,7 @@ this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.Font = new System.Drawing.Font("微软雅黑", 11F); this.button6.ForeColor = System.Drawing.Color.DimGray; - this.button6.Image = global::AIMS.UI.Properties.Resources.手术申请; + this.button6.Image = global::AIMSControls.Properties.Resources.手术申请; this.button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button6.Location = new System.Drawing.Point(0, 250); this.button6.Name = "button6"; @@ -327,7 +327,7 @@ this.btnOperationInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOperationInfo.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOperationInfo.ForeColor = System.Drawing.Color.DimGray; - this.btnOperationInfo.Image = global::AIMS.UI.Properties.Resources.文书单; + this.btnOperationInfo.Image = global::AIMSControls.Properties.Resources.文书单; this.btnOperationInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOperationInfo.Location = new System.Drawing.Point(0, 200); this.btnOperationInfo.Name = "btnOperationInfo"; @@ -347,7 +347,7 @@ this.btnOutputLiquids.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutputLiquids.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOutputLiquids.ForeColor = System.Drawing.Color.DimGray; - this.btnOutputLiquids.Image = global::AIMS.UI.Properties.Resources.快捷事件; + this.btnOutputLiquids.Image = global::AIMSControls.Properties.Resources.快捷事件; this.btnOutputLiquids.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOutputLiquids.Location = new System.Drawing.Point(0, 150); this.btnOutputLiquids.Name = "btnOutputLiquids"; @@ -367,7 +367,7 @@ this.btnAddEvents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddEvents.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnAddEvents.ForeColor = System.Drawing.Color.DimGray; - this.btnAddEvents.Image = global::AIMS.UI.Properties.Resources.事件记录; + this.btnAddEvents.Image = global::AIMSControls.Properties.Resources.事件记录; this.btnAddEvents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnAddEvents.Location = new System.Drawing.Point(0, 100); this.btnAddEvents.Name = "btnAddEvents"; @@ -387,7 +387,7 @@ this.btnDrug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDrug.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnDrug.ForeColor = System.Drawing.Color.DimGray; - this.btnDrug.Image = global::AIMS.UI.Properties.Resources.用药记录; + this.btnDrug.Image = global::AIMSControls.Properties.Resources.用药记录; this.btnDrug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnDrug.Location = new System.Drawing.Point(0, 50); this.btnDrug.Name = "btnDrug"; @@ -407,7 +407,7 @@ this.btnSelectPatient.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSelectPatient.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnSelectPatient.ForeColor = System.Drawing.Color.DimGray; - this.btnSelectPatient.Image = global::AIMS.UI.Properties.Resources.患者列表; + this.btnSelectPatient.Image = global::AIMSControls.Properties.Resources.患者列表; this.btnSelectPatient.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnSelectPatient.Location = new System.Drawing.Point(0, 0); this.btnSelectPatient.Name = "btnSelectPatient"; @@ -459,7 +459,7 @@ this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.UI.Properties.Resources.麻醉医嘱; + this.btnChage.Image = global::AIMSControls.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.Location = new System.Drawing.Point(0, 581); this.btnChage.Name = "btnChage"; @@ -480,7 +480,7 @@ this.btnsjzx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsjzx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; - this.btnsjzx.Image = global::AIMS.UI.Properties.Resources.工作列表; + this.btnsjzx.Image = global::AIMSControls.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.Location = new System.Drawing.Point(0, 631); this.btnsjzx.Name = "btnsjzx"; @@ -500,7 +500,7 @@ this.btnyldj.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnyldj.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnyldj.ForeColor = System.Drawing.Color.DimGray; - this.btnyldj.Image = global::AIMS.UI.Properties.Resources.麻醉记录; + this.btnyldj.Image = global::AIMSControls.Properties.Resources.麻醉记录; this.btnyldj.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnyldj.Location = new System.Drawing.Point(0, 681); this.btnyldj.Name = "btnyldj"; @@ -521,7 +521,7 @@ this.btnzsk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnzsk.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnzsk.ForeColor = System.Drawing.Color.DimGray; - this.btnzsk.Image = global::AIMS.UI.Properties.Resources.知识库; + this.btnzsk.Image = global::AIMSControls.Properties.Resources.知识库; this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnzsk.Location = new System.Drawing.Point(0, 731); this.btnzsk.Name = "btnzsk"; @@ -541,7 +541,7 @@ this.btndptz.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btndptz.Font = new System.Drawing.Font("微软雅黑", 11F); this.btndptz.ForeColor = System.Drawing.Color.DimGray; - this.btndptz.Image = global::AIMS.UI.Properties.Resources.文书状态; + this.btndptz.Image = global::AIMSControls.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.Location = new System.Drawing.Point(0, 781); this.btndptz.Name = "btndptz"; @@ -561,7 +561,7 @@ this.btnxldlx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnxldlx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnxldlx.ForeColor = System.Drawing.Color.DimGray; - this.btnxldlx.Image = global::AIMS.UI.Properties.Resources.心脏复跳_select; + this.btnxldlx.Image = global::AIMSControls.Properties.Resources.心脏复跳_select; this.btnxldlx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnxldlx.Location = new System.Drawing.Point(0, 831); this.btnxldlx.Name = "btnxldlx"; @@ -582,7 +582,7 @@ this.btnsbwh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsbwh.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; - this.btnsbwh.Image = global::AIMS.UI.Properties.Resources.耗材管理; + this.btnsbwh.Image = global::AIMSControls.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.Location = new System.Drawing.Point(0, 881); this.btnsbwh.Name = "btnsbwh"; @@ -879,7 +879,7 @@ // // panel17 // - this.panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_末尾页; + this.panel17.BackgroundImage = global::AIMSControls.Properties.Resources.图标_末尾页; this.panel17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel17.Cursor = System.Windows.Forms.Cursors.Hand; this.panel17.Location = new System.Drawing.Point(124, 4); @@ -892,7 +892,7 @@ // // btnNextPage // - this.btnNextPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_后一页; + this.btnNextPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_后一页; this.btnNextPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnNextPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnNextPage.Location = new System.Drawing.Point(83, 4); @@ -905,7 +905,7 @@ // // panel18 // - this.panel18.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_第一页; + this.panel18.BackgroundImage = global::AIMSControls.Properties.Resources.图标_第一页; this.panel18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel18.Cursor = System.Windows.Forms.Cursors.Hand; this.panel18.Location = new System.Drawing.Point(1, 4); @@ -918,7 +918,7 @@ // // btnUpPage // - this.btnUpPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_前一页; + this.btnUpPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_前一页; this.btnUpPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnUpPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpPage.Location = new System.Drawing.Point(42, 4); @@ -931,7 +931,7 @@ // // plPrintBrowse // - this.plPrintBrowse.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_预览; + this.plPrintBrowse.BackgroundImage = global::AIMSControls.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrintBrowse.Location = new System.Drawing.Point(256, 4); @@ -943,7 +943,7 @@ // // plPrint // - this.plPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_打印; + this.plPrint.BackgroundImage = global::AIMSControls.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrint.Location = new System.Drawing.Point(216, 4); @@ -955,7 +955,7 @@ // // plRefresh // - this.plRefresh.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_刷新; + this.plRefresh.BackgroundImage = global::AIMSControls.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; this.plRefresh.Location = new System.Drawing.Point(296, 4); @@ -1091,7 +1091,7 @@ // picOutRoom // this.picOutRoom.BackColor = System.Drawing.Color.Transparent; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; this.picOutRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOutRoom.Location = new System.Drawing.Point(2, 10); this.picOutRoom.Name = "picOutRoom"; @@ -1184,7 +1184,7 @@ // picOpeBegin // this.picOpeBegin.BackColor = System.Drawing.Color.Transparent; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; this.picOpeBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeBegin.Location = new System.Drawing.Point(2, 10); this.picOpeBegin.Name = "picOpeBegin"; @@ -1290,7 +1290,7 @@ // picBG // this.picBG.BackColor = System.Drawing.Color.Transparent; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; this.picBG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picBG.Location = new System.Drawing.Point(2, 10); this.picBG.Name = "picBG"; @@ -1367,7 +1367,7 @@ // picAnesEnd // this.picAnesEnd.BackColor = System.Drawing.Color.Transparent; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; this.picAnesEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picAnesEnd.Location = new System.Drawing.Point(2, 10); this.picAnesEnd.Name = "picAnesEnd"; @@ -1473,7 +1473,7 @@ // picCG // this.picCG.BackColor = System.Drawing.Color.Transparent; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; this.picCG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picCG.Location = new System.Drawing.Point(2, 10); this.picCG.Name = "picCG"; @@ -1550,7 +1550,7 @@ // picAnesBegin // this.picAnesBegin.BackColor = System.Drawing.Color.Transparent; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; this.picAnesBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picAnesBegin.Location = new System.Drawing.Point(2, 10); this.picAnesBegin.Name = "picAnesBegin"; @@ -1643,7 +1643,7 @@ // picOpeEnd // this.picOpeEnd.BackColor = System.Drawing.Color.Transparent; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; this.picOpeEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeEnd.Location = new System.Drawing.Point(2, 10); this.picOpeEnd.Name = "picOpeEnd"; @@ -1736,7 +1736,7 @@ // picInRoom // this.picInRoom.BackColor = System.Drawing.Color.Transparent; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; this.picInRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picInRoom.Location = new System.Drawing.Point(2, 10); this.picInRoom.Name = "picInRoom"; @@ -1769,7 +1769,7 @@ // // PanelSave // - this.PanelSave.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; this.PanelSave.Location = new System.Drawing.Point(176, 4); diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs index f2ca3af..fadc00d 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaPainlessRecord.cs @@ -64,14 +64,14 @@ namespace AIMS.OperationAanesthesia txtCG.LostFocus += new EventHandler(txtDateTime_LostFocus); txtBG.LostFocus += new EventHandler(txtDateTime_LostFocus); - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; #endregion panel8.MouseWheel += new System.Windows.Forms.MouseEventHandler(panel8_MouseWheel); } @@ -670,32 +670,32 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "麻醉开始") { _record.AnesthesiaBeginTime = null; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; BOperationRecord.Update("AnesthesiaBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始") { _record.OperationBeginTime = null; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; BOperationRecord.Update(" OperationBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束") { _record.OperationEndTime = null; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; BOperationRecord.Update(" OperationEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "麻醉完成") { _record.AnesthesiaEndTime = null; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; BOperationRecord.Update(" AnesthesiaEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbCGType.Text) { _record.InCGType = ""; _record.SpileInTime = null; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; BOperationRecord.Update(" SpileInTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); UpdatePhysioDataResp(); } @@ -703,7 +703,7 @@ namespace AIMS.OperationAanesthesia { _record.InBGType = ""; _record.SpileOutTime = null; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; BOperationRecord.Update(" SpileOutTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); UpdatePhysioDataResp(); } @@ -776,7 +776,7 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "入室" && _record.InRoomTime != Inevent.EventBeginTime) { _record.InRoomTime = Inevent.EventBeginTime; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); //try @@ -805,20 +805,20 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "麻醉开始" && _record.AnesthesiaBeginTime != Inevent.EventBeginTime) { _record.AnesthesiaBeginTime = Inevent.EventBeginTime; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始_select; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始_select; BOperationRecord.Update("AnesthesiaBeginTime=@AnesthesiaBeginTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaBeginTime", _record.AnesthesiaBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始" && _record.OperationBeginTime != Inevent.EventBeginTime) { _record.OperationBeginTime = Inevent.EventBeginTime; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; BOperationRecord.Update("OperationBeginTime=@OperationBegin where Id=@id ", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbCGType.Text && _record.SpileInTime != Inevent.EventBeginTime) { _record.InCGType = cmbCGType.Text; _record.SpileInTime = Inevent.EventBeginTime; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管_select; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管_select; BOperationRecord.Update(" SpileInTime=@SpileIn where Id=@id ", new AIMSModel.ParameterList("@SpileIn", _record.SpileInTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); UpdatePhysioDataResp(); @@ -827,26 +827,26 @@ namespace AIMS.OperationAanesthesia { _record.InBGType = cmbBGType.Text; _record.SpileOutTime = Inevent.EventBeginTime; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; BOperationRecord.Update(" SpileOutTime=@SpileOut where Id=@id ", new AIMSModel.ParameterList("@SpileOut", _record.SpileOutTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); UpdatePhysioDataResp(); } if (Inevent != null && Inevent.EventName == "手术结束" && _record.OperationEndTime != Inevent.EventBeginTime) { _record.OperationEndTime = Inevent.EventBeginTime; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; BOperationRecord.Update("OperationEndTime=@OperationEnd where Id=@id ", new AIMSModel.ParameterList("@OperationEnd", _record.OperationEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "麻醉完成" && _record.AnesthesiaEndTime != Inevent.EventBeginTime) { _record.AnesthesiaEndTime = Inevent.EventBeginTime; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; BOperationRecord.Update("AnesthesiaEndTime=@AnesthesiaEndTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaEndTime", _record.AnesthesiaEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "出室" && _record.OutRoomTime != Inevent.EventBeginTime) { _record.OutRoomTime = Inevent.EventBeginTime; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); _record.AnalgesiaRecord.AssessmentTime = _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm"); @@ -1938,7 +1938,7 @@ namespace AIMS.OperationAanesthesia txtInRoom.ButtonDropDown.Visible = false; txtInRoom.Tag = _record.InRoomTime.Value; txtInRoom.Value = _record.InRoomTime.Value; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; } if (_record.AnesthesiaBeginTime != null) { @@ -1946,7 +1946,7 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaBegin.ButtonDropDown.Visible = false; txtAnaesthesiaBegin.Tag = _record.AnesthesiaBeginTime.Value; txtAnaesthesiaBegin.Value = _record.AnesthesiaBeginTime.Value; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始_select; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始_select; } if (_record.SpileInTime != null) { @@ -1955,7 +1955,7 @@ namespace AIMS.OperationAanesthesia txtCG.CustomFormat = "MM-dd HH:mm"; txtCG.Tag = _record.SpileInTime.Value; txtCG.Value = _record.SpileInTime.Value; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管_select; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管_select; if (_record.SpileOutTime == null) { @@ -1972,7 +1972,7 @@ namespace AIMS.OperationAanesthesia txtBG.CustomFormat = "MM-dd HH:mm"; txtBG.Tag = _record.SpileOutTime.Value; txtBG.Value = _record.SpileOutTime.Value; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; this.cmbBGType.SelectedIndexChanged += new System.EventHandler(this.cmbBGType_SelectedIndexChanged); } if (_record.OperationBeginTime != null) @@ -1981,7 +1981,7 @@ namespace AIMS.OperationAanesthesia txtOperationBegin.ButtonDropDown.Visible = false; txtOperationBegin.Tag = _record.OperationBeginTime.Value; txtOperationBegin.Value = _record.OperationBeginTime.Value; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; } if (_record.OperationEndTime != null) { @@ -1989,7 +1989,7 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.ButtonDropDown.Visible = false; txtOperationEnd.Tag = _record.OperationEndTime.Value; txtOperationEnd.Value = _record.OperationEndTime.Value; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; } if (_record.AnesthesiaEndTime != null) { @@ -1997,7 +1997,7 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaEnd.ButtonDropDown.Visible = false; txtAnaesthesiaEnd.Tag = _record.AnesthesiaEndTime.Value; txtAnaesthesiaEnd.Value = _record.AnesthesiaEndTime.Value; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; } if (_record.OutRoomTime != null) { @@ -2005,7 +2005,7 @@ namespace AIMS.OperationAanesthesia txtOutRoom.ButtonDropDown.Visible = false; txtOutRoom.Tag = _record.OutRoomTime.Value; txtOutRoom.Value = _record.OutRoomTime.Value; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; } if (_record.OutRoomTime != null && _record.StateName == "手术中") @@ -2044,14 +2044,14 @@ namespace AIMS.OperationAanesthesia txtCG.Text = ""; txtBG.Text = ""; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; } private bool GetOpeState(ref string message) diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs index c7cc478..a957fe3 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.Designer.cs @@ -230,7 +230,7 @@ this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button10.Font = new System.Drawing.Font("微软雅黑", 11F); this.button10.ForeColor = System.Drawing.Color.DimGray; - this.button10.Image = global::AIMS.UI.Properties.Resources.安全检查; + this.button10.Image = global::AIMSControls.Properties.Resources.安全检查; this.button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button10.Location = new System.Drawing.Point(0, 550); this.button10.Name = "button10"; @@ -251,7 +251,7 @@ this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.Font = new System.Drawing.Font("微软雅黑", 11F); this.button8.ForeColor = System.Drawing.Color.DimGray; - this.button8.Image = global::AIMS.UI.Properties.Resources.系统设置; + this.button8.Image = global::AIMSControls.Properties.Resources.系统设置; this.button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button8.Location = new System.Drawing.Point(0, 881); this.button8.Name = "button8"; @@ -271,7 +271,7 @@ this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.Font = new System.Drawing.Font("微软雅黑", 11F); this.button7.ForeColor = System.Drawing.Color.DimGray; - this.button7.Image = global::AIMS.UI.Properties.Resources.文书编辑; + this.button7.Image = global::AIMSControls.Properties.Resources.文书编辑; this.button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button7.Location = new System.Drawing.Point(0, 500); this.button7.Name = "button7"; @@ -291,7 +291,7 @@ this.btnCancelIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelIn.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelIn.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelIn.Image = global::AIMS.UI.Properties.Resources.显示切换; + this.btnCancelIn.Image = global::AIMSControls.Properties.Resources.显示切换; this.btnCancelIn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelIn.Location = new System.Drawing.Point(0, 450); this.btnCancelIn.Name = "btnCancelIn"; @@ -311,7 +311,7 @@ this.btnCancelOperation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelOperation.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelOperation.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelOperation.Image = global::AIMS.UI.Properties.Resources.取消手术; + this.btnCancelOperation.Image = global::AIMSControls.Properties.Resources.取消手术; this.btnCancelOperation.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelOperation.Location = new System.Drawing.Point(0, 400); this.btnCancelOperation.Name = "btnCancelOperation"; @@ -331,7 +331,7 @@ this.btnTemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTemplate.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnTemplate.ForeColor = System.Drawing.Color.DimGray; - this.btnTemplate.Image = global::AIMS.UI.Properties.Resources.模板应用; + this.btnTemplate.Image = global::AIMSControls.Properties.Resources.模板应用; this.btnTemplate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTemplate.Location = new System.Drawing.Point(0, 350); this.btnTemplate.Name = "btnTemplate"; @@ -351,7 +351,7 @@ this.btnBloodGasAnalysis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBloodGasAnalysis.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnBloodGasAnalysis.ForeColor = System.Drawing.Color.DimGray; - this.btnBloodGasAnalysis.Image = global::AIMS.UI.Properties.Resources.血气分析; + this.btnBloodGasAnalysis.Image = global::AIMSControls.Properties.Resources.血气分析; this.btnBloodGasAnalysis.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnBloodGasAnalysis.Location = new System.Drawing.Point(0, 300); this.btnBloodGasAnalysis.Name = "btnBloodGasAnalysis"; @@ -371,7 +371,7 @@ this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.Font = new System.Drawing.Font("微软雅黑", 11F); this.button6.ForeColor = System.Drawing.Color.DimGray; - this.button6.Image = global::AIMS.UI.Properties.Resources.不良事件; + this.button6.Image = global::AIMSControls.Properties.Resources.不良事件; this.button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button6.Location = new System.Drawing.Point(0, 250); this.button6.Name = "button6"; @@ -391,7 +391,7 @@ this.btnOperationInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOperationInfo.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOperationInfo.ForeColor = System.Drawing.Color.DimGray; - this.btnOperationInfo.Image = global::AIMS.UI.Properties.Resources.文书单; + this.btnOperationInfo.Image = global::AIMSControls.Properties.Resources.文书单; this.btnOperationInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOperationInfo.Location = new System.Drawing.Point(0, 200); this.btnOperationInfo.Name = "btnOperationInfo"; @@ -411,7 +411,7 @@ this.btnOutputLiquids.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutputLiquids.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOutputLiquids.ForeColor = System.Drawing.Color.DimGray; - this.btnOutputLiquids.Image = global::AIMS.UI.Properties.Resources.快捷事件; + this.btnOutputLiquids.Image = global::AIMSControls.Properties.Resources.快捷事件; this.btnOutputLiquids.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOutputLiquids.Location = new System.Drawing.Point(0, 150); this.btnOutputLiquids.Name = "btnOutputLiquids"; @@ -431,7 +431,7 @@ this.btnAddEvents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddEvents.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnAddEvents.ForeColor = System.Drawing.Color.DimGray; - this.btnAddEvents.Image = global::AIMS.UI.Properties.Resources.事件记录; + this.btnAddEvents.Image = global::AIMSControls.Properties.Resources.事件记录; this.btnAddEvents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnAddEvents.Location = new System.Drawing.Point(0, 100); this.btnAddEvents.Name = "btnAddEvents"; @@ -451,7 +451,7 @@ this.btnDrug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDrug.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnDrug.ForeColor = System.Drawing.Color.DimGray; - this.btnDrug.Image = global::AIMS.UI.Properties.Resources.用药记录; + this.btnDrug.Image = global::AIMSControls.Properties.Resources.用药记录; this.btnDrug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnDrug.Location = new System.Drawing.Point(0, 50); this.btnDrug.Name = "btnDrug"; @@ -471,7 +471,7 @@ this.btnSelectPatient.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSelectPatient.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnSelectPatient.ForeColor = System.Drawing.Color.DimGray; - this.btnSelectPatient.Image = global::AIMS.UI.Properties.Resources.患者列表; + this.btnSelectPatient.Image = global::AIMSControls.Properties.Resources.患者列表; this.btnSelectPatient.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnSelectPatient.Location = new System.Drawing.Point(0, 0); this.btnSelectPatient.Name = "btnSelectPatient"; @@ -523,7 +523,7 @@ this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.UI.Properties.Resources.麻醉医嘱; + this.btnChage.Image = global::AIMSControls.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.Location = new System.Drawing.Point(0, 581); this.btnChage.Name = "btnChage"; @@ -544,7 +544,7 @@ this.btnsjzx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsjzx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; - this.btnsjzx.Image = global::AIMS.UI.Properties.Resources.工作列表; + this.btnsjzx.Image = global::AIMSControls.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.Location = new System.Drawing.Point(0, 631); this.btnsjzx.Name = "btnsjzx"; @@ -564,7 +564,7 @@ this.btnyldj.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnyldj.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnyldj.ForeColor = System.Drawing.Color.DimGray; - this.btnyldj.Image = global::AIMS.UI.Properties.Resources.麻醉记录; + this.btnyldj.Image = global::AIMSControls.Properties.Resources.麻醉记录; this.btnyldj.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnyldj.Location = new System.Drawing.Point(0, 681); this.btnyldj.Name = "btnyldj"; @@ -585,7 +585,7 @@ this.btnzsk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnzsk.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnzsk.ForeColor = System.Drawing.Color.DimGray; - this.btnzsk.Image = global::AIMS.UI.Properties.Resources.知识库; + this.btnzsk.Image = global::AIMSControls.Properties.Resources.知识库; this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnzsk.Location = new System.Drawing.Point(0, 731); this.btnzsk.Name = "btnzsk"; @@ -605,7 +605,7 @@ this.btndptz.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btndptz.Font = new System.Drawing.Font("微软雅黑", 11F); this.btndptz.ForeColor = System.Drawing.Color.DimGray; - this.btndptz.Image = global::AIMS.UI.Properties.Resources.文书状态; + this.btndptz.Image = global::AIMSControls.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.Location = new System.Drawing.Point(0, 781); this.btndptz.Name = "btndptz"; @@ -625,7 +625,7 @@ this.btnxldlx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnxldlx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnxldlx.ForeColor = System.Drawing.Color.DimGray; - this.btnxldlx.Image = global::AIMS.UI.Properties.Resources.心脏复跳_select; + this.btnxldlx.Image = global::AIMSControls.Properties.Resources.心脏复跳_select; this.btnxldlx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnxldlx.Location = new System.Drawing.Point(0, 831); this.btnxldlx.Name = "btnxldlx"; @@ -646,7 +646,7 @@ this.btnsbwh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsbwh.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; - this.btnsbwh.Image = global::AIMS.UI.Properties.Resources.耗材管理; + this.btnsbwh.Image = global::AIMSControls.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.Location = new System.Drawing.Point(0, 881); this.btnsbwh.Name = "btnsbwh"; @@ -995,7 +995,7 @@ // // PanelSave // - this.PanelSave.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; this.PanelSave.Location = new System.Drawing.Point(174, 4); @@ -1007,7 +1007,7 @@ // // panel17 // - this.panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_末尾页; + this.panel17.BackgroundImage = global::AIMSControls.Properties.Resources.图标_末尾页; this.panel17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel17.Cursor = System.Windows.Forms.Cursors.Hand; this.panel17.Location = new System.Drawing.Point(124, 4); @@ -1020,7 +1020,7 @@ // // btnNextPage // - this.btnNextPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_后一页; + this.btnNextPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_后一页; this.btnNextPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnNextPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnNextPage.Location = new System.Drawing.Point(83, 4); @@ -1033,7 +1033,7 @@ // // panel18 // - this.panel18.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_第一页; + this.panel18.BackgroundImage = global::AIMSControls.Properties.Resources.图标_第一页; this.panel18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel18.Cursor = System.Windows.Forms.Cursors.Hand; this.panel18.Location = new System.Drawing.Point(1, 4); @@ -1046,7 +1046,7 @@ // // btnUpPage // - this.btnUpPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_前一页; + this.btnUpPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_前一页; this.btnUpPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnUpPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpPage.Location = new System.Drawing.Point(42, 4); @@ -1059,7 +1059,7 @@ // // plPrintBrowse // - this.plPrintBrowse.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_预览; + this.plPrintBrowse.BackgroundImage = global::AIMSControls.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrintBrowse.Location = new System.Drawing.Point(264, 4); @@ -1071,7 +1071,7 @@ // // plPrint // - this.plPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_打印; + this.plPrint.BackgroundImage = global::AIMSControls.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrint.Location = new System.Drawing.Point(219, 4); @@ -1083,7 +1083,7 @@ // // plRefresh // - this.plRefresh.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_刷新; + this.plRefresh.BackgroundImage = global::AIMSControls.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; this.plRefresh.Location = new System.Drawing.Point(309, 4); @@ -1230,7 +1230,7 @@ // picOutRoom // this.picOutRoom.BackColor = System.Drawing.Color.Transparent; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; this.picOutRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOutRoom.Location = new System.Drawing.Point(2, 10); this.picOutRoom.Name = "picOutRoom"; @@ -1323,7 +1323,7 @@ // picOpeBegin // this.picOpeBegin.BackColor = System.Drawing.Color.Transparent; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; this.picOpeBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeBegin.Location = new System.Drawing.Point(2, 10); this.picOpeBegin.Name = "picOpeBegin"; @@ -1429,7 +1429,7 @@ // picBG // this.picBG.BackColor = System.Drawing.Color.Transparent; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; this.picBG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picBG.Location = new System.Drawing.Point(2, 10); this.picBG.Name = "picBG"; @@ -1506,7 +1506,7 @@ // picAnesEnd // this.picAnesEnd.BackColor = System.Drawing.Color.Transparent; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; this.picAnesEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picAnesEnd.Location = new System.Drawing.Point(2, 10); this.picAnesEnd.Name = "picAnesEnd"; @@ -1612,7 +1612,7 @@ // picCG // this.picCG.BackColor = System.Drawing.Color.Transparent; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; this.picCG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picCG.Location = new System.Drawing.Point(2, 10); this.picCG.Name = "picCG"; @@ -1689,7 +1689,7 @@ // picAnesBegin // this.picAnesBegin.BackColor = System.Drawing.Color.Transparent; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; this.picAnesBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picAnesBegin.Location = new System.Drawing.Point(2, 10); this.picAnesBegin.Name = "picAnesBegin"; @@ -1782,7 +1782,7 @@ // picOpeEnd // this.picOpeEnd.BackColor = System.Drawing.Color.Transparent; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; this.picOpeEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeEnd.Location = new System.Drawing.Point(2, 10); this.picOpeEnd.Name = "picOpeEnd"; @@ -1875,7 +1875,7 @@ // picInRoom // this.picInRoom.BackColor = System.Drawing.Color.Transparent; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; this.picInRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picInRoom.Location = new System.Drawing.Point(2, 10); this.picInRoom.Name = "picInRoom"; diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs index 42416ae..623bbc0 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecord.cs @@ -66,14 +66,14 @@ namespace AIMS.OperationAanesthesia txtCG.LostFocus += new EventHandler(txtDateTime_LostFocus); txtBG.LostFocus += new EventHandler(txtDateTime_LostFocus); - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; #endregion panel8.MouseWheel += new System.Windows.Forms.MouseEventHandler(panel8_MouseWheel); panel82.MouseWheel += new System.Windows.Forms.MouseEventHandler(panel82_MouseWheel); @@ -737,32 +737,32 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "麻醉开始") { _record.AnesthesiaBeginTime = null; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; BOperationRecord.Update("AnesthesiaBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始") { _record.OperationBeginTime = null; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; BOperationRecord.Update(" OperationBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束") { _record.OperationEndTime = null; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; BOperationRecord.Update(" OperationEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "麻醉完成") { _record.AnesthesiaEndTime = null; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; BOperationRecord.Update(" AnesthesiaEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbCGType.Text) { _record.InCGType = ""; _record.SpileInTime = null; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; BOperationRecord.Update(" SpileInTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); UpdatePhysioDataResp(); } @@ -770,7 +770,7 @@ namespace AIMS.OperationAanesthesia { _record.InBGType = ""; _record.SpileOutTime = null; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; BOperationRecord.Update(" SpileOutTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); UpdatePhysioDataResp(); } @@ -843,7 +843,7 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "入室" && _record.InRoomTime != Inevent.EventBeginTime) { _record.InRoomTime = Inevent.EventBeginTime; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); //try @@ -872,20 +872,20 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "麻醉开始" && _record.AnesthesiaBeginTime != Inevent.EventBeginTime) { _record.AnesthesiaBeginTime = Inevent.EventBeginTime; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始_select; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始_select; BOperationRecord.Update("AnesthesiaBeginTime=@AnesthesiaBeginTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaBeginTime", _record.AnesthesiaBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始" && _record.OperationBeginTime != Inevent.EventBeginTime) { _record.OperationBeginTime = Inevent.EventBeginTime; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; BOperationRecord.Update("OperationBeginTime=@OperationBegin where Id=@id ", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbCGType.Text && _record.SpileInTime != Inevent.EventBeginTime) { _record.InCGType = cmbCGType.Text; _record.SpileInTime = Inevent.EventBeginTime; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管_select; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管_select; BOperationRecord.Update(" SpileInTime=@SpileIn where Id=@id ", new AIMSModel.ParameterList("@SpileIn", _record.SpileInTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); UpdatePhysioDataResp(); @@ -894,26 +894,26 @@ namespace AIMS.OperationAanesthesia { _record.InBGType = cmbBGType.Text; _record.SpileOutTime = Inevent.EventBeginTime; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; BOperationRecord.Update(" SpileOutTime=@SpileOut where Id=@id ", new AIMSModel.ParameterList("@SpileOut", _record.SpileOutTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); UpdatePhysioDataResp(); } if (Inevent != null && Inevent.EventName == "手术结束" && _record.OperationEndTime != Inevent.EventBeginTime) { _record.OperationEndTime = Inevent.EventBeginTime; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; BOperationRecord.Update("OperationEndTime=@OperationEnd where Id=@id ", new AIMSModel.ParameterList("@OperationEnd", _record.OperationEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "麻醉完成" && _record.AnesthesiaEndTime != Inevent.EventBeginTime) { _record.AnesthesiaEndTime = Inevent.EventBeginTime; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; BOperationRecord.Update("AnesthesiaEndTime=@AnesthesiaEndTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaEndTime", _record.AnesthesiaEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "出室" && _record.OutRoomTime != Inevent.EventBeginTime) { _record.OutRoomTime = Inevent.EventBeginTime; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } } @@ -2187,7 +2187,7 @@ namespace AIMS.OperationAanesthesia txtInRoom.ButtonDropDown.Visible = false; txtInRoom.Tag = _record.InRoomTime.Value; txtInRoom.Value = _record.InRoomTime.Value; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; } if (_record.AnesthesiaBeginTime != null) { @@ -2195,7 +2195,7 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaBegin.ButtonDropDown.Visible = false; txtAnaesthesiaBegin.Tag = _record.AnesthesiaBeginTime.Value; txtAnaesthesiaBegin.Value = _record.AnesthesiaBeginTime.Value; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始_select; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始_select; } if (_record.SpileInTime != null) { @@ -2204,7 +2204,7 @@ namespace AIMS.OperationAanesthesia txtCG.CustomFormat = "MM-dd HH:mm"; txtCG.Tag = _record.SpileInTime.Value; txtCG.Value = _record.SpileInTime.Value; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管_select; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管_select; if (_record.SpileOutTime == null) { @@ -2221,7 +2221,7 @@ namespace AIMS.OperationAanesthesia txtBG.CustomFormat = "MM-dd HH:mm"; txtBG.Tag = _record.SpileOutTime.Value; txtBG.Value = _record.SpileOutTime.Value; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; this.cmbBGType.SelectedIndexChanged += new System.EventHandler(this.cmbBGType_SelectedIndexChanged); } if (_record.OperationBeginTime != null) @@ -2230,7 +2230,7 @@ namespace AIMS.OperationAanesthesia txtOperationBegin.ButtonDropDown.Visible = false; txtOperationBegin.Tag = _record.OperationBeginTime.Value; txtOperationBegin.Value = _record.OperationBeginTime.Value; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; } if (_record.OperationEndTime != null) { @@ -2238,7 +2238,7 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.ButtonDropDown.Visible = false; txtOperationEnd.Tag = _record.OperationEndTime.Value; txtOperationEnd.Value = _record.OperationEndTime.Value; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; } if (_record.AnesthesiaEndTime != null) { @@ -2246,7 +2246,7 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaEnd.ButtonDropDown.Visible = false; txtAnaesthesiaEnd.Tag = _record.AnesthesiaEndTime.Value; txtAnaesthesiaEnd.Value = _record.AnesthesiaEndTime.Value; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; } if (_record.OutRoomTime != null) { @@ -2254,7 +2254,7 @@ namespace AIMS.OperationAanesthesia txtOutRoom.ButtonDropDown.Visible = false; txtOutRoom.Tag = _record.OutRoomTime.Value; txtOutRoom.Value = _record.OutRoomTime.Value; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; } if (_record.OutRoomTime != null && _record.StateName == "手术中") @@ -2321,14 +2321,14 @@ namespace AIMS.OperationAanesthesia txtCG.Text = ""; txtBG.Text = ""; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picAnesBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉开始; - this.picCG.BackgroundImage = global::AIMS.UI.Properties.Resources.置管; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picAnesBegin.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉开始; + this.picCG.BackgroundImage = global::AIMSControls.Properties.Resources.置管; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; } diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs index 968808d..c59e9ea 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.Designer.cs @@ -175,7 +175,7 @@ this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.Font = new System.Drawing.Font("微软雅黑", 11F); this.button8.ForeColor = System.Drawing.Color.DimGray; - this.button8.Image = global::AIMS.UI.Properties.Resources.系统设置; + this.button8.Image = global::AIMSControls.Properties.Resources.系统设置; this.button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button8.Location = new System.Drawing.Point(0, 450); this.button8.Name = "button8"; @@ -195,7 +195,7 @@ this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.Font = new System.Drawing.Font("微软雅黑", 11F); this.button7.ForeColor = System.Drawing.Color.DimGray; - this.button7.Image = global::AIMS.UI.Properties.Resources.文书编辑; + this.button7.Image = global::AIMSControls.Properties.Resources.文书编辑; this.button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button7.Location = new System.Drawing.Point(0, 400); this.button7.Name = "button7"; @@ -215,7 +215,7 @@ this.btnCancelIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelIn.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelIn.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelIn.Image = global::AIMS.UI.Properties.Resources.显示切换; + this.btnCancelIn.Image = global::AIMSControls.Properties.Resources.显示切换; this.btnCancelIn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelIn.Location = new System.Drawing.Point(0, 350); this.btnCancelIn.Name = "btnCancelIn"; @@ -235,7 +235,7 @@ this.btnCancelOperation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelOperation.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelOperation.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelOperation.Image = global::AIMS.UI.Properties.Resources.取消手术; + this.btnCancelOperation.Image = global::AIMSControls.Properties.Resources.取消手术; this.btnCancelOperation.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelOperation.Location = new System.Drawing.Point(0, 300); this.btnCancelOperation.Name = "btnCancelOperation"; @@ -255,7 +255,7 @@ this.btnTemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTemplate.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnTemplate.ForeColor = System.Drawing.Color.DimGray; - this.btnTemplate.Image = global::AIMS.UI.Properties.Resources.模板应用; + this.btnTemplate.Image = global::AIMSControls.Properties.Resources.模板应用; this.btnTemplate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTemplate.Location = new System.Drawing.Point(0, 250); this.btnTemplate.Name = "btnTemplate"; @@ -275,7 +275,7 @@ this.btnOutputLiquids.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutputLiquids.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOutputLiquids.ForeColor = System.Drawing.Color.DimGray; - this.btnOutputLiquids.Image = global::AIMS.UI.Properties.Resources.快捷事件; + this.btnOutputLiquids.Image = global::AIMSControls.Properties.Resources.快捷事件; this.btnOutputLiquids.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOutputLiquids.Location = new System.Drawing.Point(0, 200); this.btnOutputLiquids.Name = "btnOutputLiquids"; @@ -295,7 +295,7 @@ this.btnAddEvents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddEvents.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnAddEvents.ForeColor = System.Drawing.Color.DimGray; - this.btnAddEvents.Image = global::AIMS.UI.Properties.Resources.事件记录; + this.btnAddEvents.Image = global::AIMSControls.Properties.Resources.事件记录; this.btnAddEvents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnAddEvents.Location = new System.Drawing.Point(0, 150); this.btnAddEvents.Name = "btnAddEvents"; @@ -315,7 +315,7 @@ this.btnDrug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDrug.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnDrug.ForeColor = System.Drawing.Color.DimGray; - this.btnDrug.Image = global::AIMS.UI.Properties.Resources.用药记录; + this.btnDrug.Image = global::AIMSControls.Properties.Resources.用药记录; this.btnDrug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnDrug.Location = new System.Drawing.Point(0, 100); this.btnDrug.Name = "btnDrug"; @@ -335,7 +335,7 @@ this.btnOperationInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOperationInfo.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOperationInfo.ForeColor = System.Drawing.Color.DimGray; - this.btnOperationInfo.Image = global::AIMS.UI.Properties.Resources.文书单; + this.btnOperationInfo.Image = global::AIMSControls.Properties.Resources.文书单; this.btnOperationInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOperationInfo.Location = new System.Drawing.Point(0, 50); this.btnOperationInfo.Name = "btnOperationInfo"; @@ -355,7 +355,7 @@ this.btnSelectPatient.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSelectPatient.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnSelectPatient.ForeColor = System.Drawing.Color.DimGray; - this.btnSelectPatient.Image = global::AIMS.UI.Properties.Resources.患者列表; + this.btnSelectPatient.Image = global::AIMSControls.Properties.Resources.患者列表; this.btnSelectPatient.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnSelectPatient.Location = new System.Drawing.Point(0, 0); this.btnSelectPatient.Name = "btnSelectPatient"; @@ -581,7 +581,7 @@ this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Font = new System.Drawing.Font("微软雅黑", 11F); this.button1.ForeColor = System.Drawing.Color.DimGray; - this.button1.Image = global::AIMS.UI.Properties.Resources.打印苏醒记录; + this.button1.Image = global::AIMSControls.Properties.Resources.打印苏醒记录; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button1.Location = new System.Drawing.Point(0, 559); this.button1.Name = "button1"; @@ -601,7 +601,7 @@ this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.UI.Properties.Resources.麻醉医嘱; + this.btnChage.Image = global::AIMSControls.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.Location = new System.Drawing.Point(0, 609); this.btnChage.Name = "btnChage"; @@ -622,7 +622,7 @@ this.btnsjzx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsjzx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; - this.btnsjzx.Image = global::AIMS.UI.Properties.Resources.工作列表; + this.btnsjzx.Image = global::AIMSControls.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.Location = new System.Drawing.Point(0, 659); this.btnsjzx.Name = "btnsjzx"; @@ -642,7 +642,7 @@ this.btnzsk.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnzsk.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnzsk.ForeColor = System.Drawing.Color.DimGray; - this.btnzsk.Image = global::AIMS.UI.Properties.Resources.知识库; + this.btnzsk.Image = global::AIMSControls.Properties.Resources.知识库; this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnzsk.Location = new System.Drawing.Point(0, 709); this.btnzsk.Name = "btnzsk"; @@ -662,7 +662,7 @@ this.btndptz.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btndptz.Font = new System.Drawing.Font("微软雅黑", 11F); this.btndptz.ForeColor = System.Drawing.Color.DimGray; - this.btndptz.Image = global::AIMS.UI.Properties.Resources.文书状态; + this.btndptz.Image = global::AIMSControls.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.Location = new System.Drawing.Point(0, 759); this.btndptz.Name = "btndptz"; @@ -682,7 +682,7 @@ this.btnsbwh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsbwh.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; - this.btnsbwh.Image = global::AIMS.UI.Properties.Resources.耗材管理; + this.btnsbwh.Image = global::AIMSControls.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.Location = new System.Drawing.Point(0, 809); this.btnsbwh.Name = "btnsbwh"; @@ -803,7 +803,7 @@ // // panel17 // - this.panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_末尾页; + this.panel17.BackgroundImage = global::AIMSControls.Properties.Resources.图标_末尾页; this.panel17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel17.Cursor = System.Windows.Forms.Cursors.Hand; this.panel17.Location = new System.Drawing.Point(126, 4); @@ -815,7 +815,7 @@ // // btnNextPage // - this.btnNextPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_后一页; + this.btnNextPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_后一页; this.btnNextPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnNextPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnNextPage.Location = new System.Drawing.Point(85, 4); @@ -827,7 +827,7 @@ // // plPrintBrowse // - this.plPrintBrowse.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_预览; + this.plPrintBrowse.BackgroundImage = global::AIMSControls.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrintBrowse.Location = new System.Drawing.Point(254, 4); @@ -838,7 +838,7 @@ // // plPrint // - this.plPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_打印; + this.plPrint.BackgroundImage = global::AIMSControls.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrint.Location = new System.Drawing.Point(214, 4); @@ -849,7 +849,7 @@ // // panel18 // - this.panel18.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_第一页; + this.panel18.BackgroundImage = global::AIMSControls.Properties.Resources.图标_第一页; this.panel18.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.panel18.Cursor = System.Windows.Forms.Cursors.Hand; this.panel18.Location = new System.Drawing.Point(3, 4); @@ -861,7 +861,7 @@ // // btnUpPage // - this.btnUpPage.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_前一页; + this.btnUpPage.BackgroundImage = global::AIMSControls.Properties.Resources.图标_前一页; this.btnUpPage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.btnUpPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnUpPage.Location = new System.Drawing.Point(44, 4); @@ -873,7 +873,7 @@ // // plRefresh // - this.plRefresh.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_刷新; + this.plRefresh.BackgroundImage = global::AIMSControls.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; this.plRefresh.Location = new System.Drawing.Point(294, 4); @@ -1004,7 +1004,7 @@ // picOutRoom // this.picOutRoom.BackColor = System.Drawing.Color.Transparent; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; this.picOutRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOutRoom.Location = new System.Drawing.Point(5, 12); this.picOutRoom.Name = "picOutRoom"; @@ -1110,7 +1110,7 @@ // picBG // this.picBG.BackColor = System.Drawing.Color.Transparent; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; this.picBG.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picBG.Location = new System.Drawing.Point(5, 12); this.picBG.Name = "picBG"; @@ -1188,7 +1188,7 @@ // picAnesEnd // this.picAnesEnd.BackColor = System.Drawing.Color.Transparent; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; this.picAnesEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picAnesEnd.Location = new System.Drawing.Point(5, 12); this.picAnesEnd.Name = "picAnesEnd"; @@ -1281,7 +1281,7 @@ // picInRoom // this.picInRoom.BackColor = System.Drawing.Color.Transparent; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; this.picInRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picInRoom.Location = new System.Drawing.Point(5, 12); this.picInRoom.Name = "picInRoom"; @@ -1314,7 +1314,7 @@ // // PanelSave // - this.PanelSave.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; this.PanelSave.Location = new System.Drawing.Point(174, 4); diff --git a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs index fc58efe..f92d267 100644 --- a/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs +++ b/AIMS.UI/OperationAanesthesia/frmAanesthesiaRecover.cs @@ -49,10 +49,10 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaEnd.LostFocus += new EventHandler(txtDateTime_LostFocus); txtBG.LostFocus += new EventHandler(txtDateTime_LostFocus); - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; #endregion } @@ -471,14 +471,14 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "麻醉完成") { _record.AnesthesiaEndTime = null; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; BOperationRecord.Update(" AnesthesiaEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbBGType.Text) { _record.InBGType = ""; _record.SpileOutTime = null; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; BOperationRecord.Update(" SpileOutTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); //UpdatePhysioDataResp(); } @@ -545,26 +545,26 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "入室" && _record.InRoomTime != Inevent.EventBeginTime) { _record.InRoomTime = Inevent.EventBeginTime; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == cmbBGType.Text && _record.SpileOutTime != Inevent.EventBeginTime) { _record.InBGType = cmbBGType.Text; _record.SpileOutTime = Inevent.EventBeginTime; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; BOperationRecord.Update(" SpileOutTime=@SpileOut where Id=@id ", new AIMSModel.ParameterList("@SpileOut", _record.SpileOutTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "麻醉完成" && _record.AnesthesiaEndTime != Inevent.EventBeginTime) { _record.AnesthesiaEndTime = Inevent.EventBeginTime; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; BOperationRecord.Update("AnesthesiaEndTime=@AnesthesiaEndTime where Id=@id ", new AIMSModel.ParameterList("@AnesthesiaEndTime", _record.AnesthesiaEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "出室" && _record.OutRoomTime != Inevent.EventBeginTime) { _record.OutRoomTime = Inevent.EventBeginTime; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } } @@ -1443,7 +1443,7 @@ namespace AIMS.OperationAanesthesia txtInRoom.ButtonDropDown.Visible = false; txtInRoom.Tag = _record.InRoomTime.Value; txtInRoom.Value = _record.InRoomTime.Value; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; } if (_record.SpileOutTime != null) { @@ -1451,7 +1451,7 @@ namespace AIMS.OperationAanesthesia txtBG.CustomFormat = "MM-dd HH:mm"; txtBG.Tag = _record.SpileOutTime.Value; txtBG.Value = _record.SpileOutTime.Value; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管_select; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管_select; } if (_record.AnesthesiaEndTime != null) { @@ -1459,7 +1459,7 @@ namespace AIMS.OperationAanesthesia txtAnaesthesiaEnd.ButtonDropDown.Visible = false; txtAnaesthesiaEnd.Tag = _record.AnesthesiaEndTime.Value; txtAnaesthesiaEnd.Value = _record.AnesthesiaEndTime.Value; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束_select; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束_select; } if (_record.OutRoomTime != null) { @@ -1467,7 +1467,7 @@ namespace AIMS.OperationAanesthesia txtOutRoom.ButtonDropDown.Visible = false; txtOutRoom.Tag = _record.OutRoomTime.Value; txtOutRoom.Value = _record.OutRoomTime.Value; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; } if (_record.OutRoomTime != null && _record.StateName == "麻醉复苏中") @@ -1508,10 +1508,10 @@ namespace AIMS.OperationAanesthesia txtOutRoom.Text = ""; txtBG.Text = ""; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picBG.BackgroundImage = global::AIMS.UI.Properties.Resources.拔管; - this.picAnesEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.麻醉结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picBG.BackgroundImage = global::AIMSControls.Properties.Resources.拔管; + this.picAnesEnd.BackgroundImage = global::AIMSControls.Properties.Resources.麻醉结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; } public DateTime getOpeMaxTime(OperationRecord myOpeRecord) diff --git a/AIMS.UI/OperationAanesthesia/frmBloodGasAnalysisNew.Designer.cs b/AIMS.UI/OperationAanesthesia/frmBloodGasAnalysisNew.Designer.cs index 3ccc954..5d407c2 100644 --- a/AIMS.UI/OperationAanesthesia/frmBloodGasAnalysisNew.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmBloodGasAnalysisNew.Designer.cs @@ -96,7 +96,7 @@ // // tsbAddAnalysis // - this.tsbAddAnalysis.Image = global::AIMS.UI.Properties.Resources.图标_访视单; + this.tsbAddAnalysis.Image = global::AIMSControls.Properties.Resources.图标_访视单; this.tsbAddAnalysis.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAddAnalysis.Name = "tsbAddAnalysis"; this.tsbAddAnalysis.Size = new System.Drawing.Size(71, 34); @@ -105,7 +105,7 @@ // // tsbModifyAnalysis // - this.tsbModifyAnalysis.Image = global::AIMS.UI.Properties.Resources.图标_编辑; + this.tsbModifyAnalysis.Image = global::AIMSControls.Properties.Resources.图标_编辑; this.tsbModifyAnalysis.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModifyAnalysis.Name = "tsbModifyAnalysis"; this.tsbModifyAnalysis.Size = new System.Drawing.Size(71, 34); @@ -114,7 +114,7 @@ // // tsbSave // - this.tsbSave.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSave.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSave.Name = "tsbSave"; this.tsbSave.Size = new System.Drawing.Size(71, 34); @@ -123,7 +123,7 @@ // // tsbDelConsumable // - this.tsbDelConsumable.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbDelConsumable.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbDelConsumable.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbDelConsumable.Name = "tsbDelConsumable"; this.tsbDelConsumable.Size = new System.Drawing.Size(71, 34); diff --git a/AIMS.UI/OperationAanesthesia/frmFactDrugNew.Designer.cs b/AIMS.UI/OperationAanesthesia/frmFactDrugNew.Designer.cs index 7d4cc56..9bb142e 100644 --- a/AIMS.UI/OperationAanesthesia/frmFactDrugNew.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmFactDrugNew.Designer.cs @@ -341,7 +341,7 @@ // dataGridViewImageColumn2 // this.dataGridViewImageColumn2.HeaderText = " "; - this.dataGridViewImageColumn2.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn2.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn2.Name = "dataGridViewImageColumn2"; this.dataGridViewImageColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; @@ -732,7 +732,7 @@ // dataGridViewImageColumn5 // this.dataGridViewImageColumn5.HeaderText = " "; - this.dataGridViewImageColumn5.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn5.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn5.Name = "dataGridViewImageColumn5"; this.dataGridViewImageColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; @@ -1034,7 +1034,7 @@ // dataGridViewImageColumn3 // this.dataGridViewImageColumn3.HeaderText = " "; - this.dataGridViewImageColumn3.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn3.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn3.Name = "dataGridViewImageColumn3"; this.dataGridViewImageColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; @@ -1577,7 +1577,7 @@ // dataGridViewImageColumn1 // this.dataGridViewImageColumn1.HeaderText = " "; - this.dataGridViewImageColumn1.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn1.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; diff --git a/AIMS.UI/OperationAanesthesia/frmFactSpeedyDrug.Designer.cs b/AIMS.UI/OperationAanesthesia/frmFactSpeedyDrug.Designer.cs index e872b75..73d9874 100644 --- a/AIMS.UI/OperationAanesthesia/frmFactSpeedyDrug.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmFactSpeedyDrug.Designer.cs @@ -238,7 +238,7 @@ // dataGridViewImageColumn1 // this.dataGridViewImageColumn1.HeaderText = " "; - this.dataGridViewImageColumn1.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn1.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.Designer.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.Designer.cs index 97a156a..106cafa 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.Designer.cs @@ -279,7 +279,7 @@ this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button9.Font = new System.Drawing.Font("微软雅黑", 11F); this.button9.ForeColor = System.Drawing.Color.DimGray; - this.button9.Image = global::AIMS.UI.Properties.Resources.手术申请; + this.button9.Image = global::AIMSControls.Properties.Resources.手术申请; this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button9.Location = new System.Drawing.Point(0, 650); this.button9.Name = "button9"; @@ -299,7 +299,7 @@ this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Font = new System.Drawing.Font("微软雅黑", 11F); this.button1.ForeColor = System.Drawing.Color.DimGray; - this.button1.Image = global::AIMS.UI.Properties.Resources.添加数据; + this.button1.Image = global::AIMSControls.Properties.Resources.添加数据; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button1.Location = new System.Drawing.Point(0, 600); this.button1.Name = "button1"; @@ -319,7 +319,7 @@ this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.Font = new System.Drawing.Font("微软雅黑", 11F); this.button8.ForeColor = System.Drawing.Color.DimGray; - this.button8.Image = global::AIMS.UI.Properties.Resources.系统设置; + this.button8.Image = global::AIMSControls.Properties.Resources.系统设置; this.button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button8.Location = new System.Drawing.Point(0, 550); this.button8.Name = "button8"; @@ -340,7 +340,7 @@ this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.Font = new System.Drawing.Font("微软雅黑", 11F); this.button7.ForeColor = System.Drawing.Color.DimGray; - this.button7.Image = global::AIMS.UI.Properties.Resources.文书编辑; + this.button7.Image = global::AIMSControls.Properties.Resources.文书编辑; this.button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button7.Location = new System.Drawing.Point(0, 500); this.button7.Name = "button7"; @@ -360,7 +360,7 @@ this.btnCancelIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelIn.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelIn.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelIn.Image = global::AIMS.UI.Properties.Resources.显示切换; + this.btnCancelIn.Image = global::AIMSControls.Properties.Resources.显示切换; this.btnCancelIn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelIn.Location = new System.Drawing.Point(0, 450); this.btnCancelIn.Name = "btnCancelIn"; @@ -381,7 +381,7 @@ this.btnCancelOperation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelOperation.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelOperation.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelOperation.Image = global::AIMS.UI.Properties.Resources.取消手术; + this.btnCancelOperation.Image = global::AIMSControls.Properties.Resources.取消手术; this.btnCancelOperation.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelOperation.Location = new System.Drawing.Point(0, 400); this.btnCancelOperation.Name = "btnCancelOperation"; @@ -402,7 +402,7 @@ this.btnBloodGasAnalysis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBloodGasAnalysis.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnBloodGasAnalysis.ForeColor = System.Drawing.Color.DimGray; - this.btnBloodGasAnalysis.Image = global::AIMS.UI.Properties.Resources.血气分析; + this.btnBloodGasAnalysis.Image = global::AIMSControls.Properties.Resources.血气分析; this.btnBloodGasAnalysis.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnBloodGasAnalysis.Location = new System.Drawing.Point(0, 350); this.btnBloodGasAnalysis.Name = "btnBloodGasAnalysis"; @@ -423,7 +423,7 @@ this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.Font = new System.Drawing.Font("微软雅黑", 11F); this.button6.ForeColor = System.Drawing.Color.DimGray; - this.button6.Image = global::AIMS.UI.Properties.Resources.不良事件; + this.button6.Image = global::AIMSControls.Properties.Resources.不良事件; this.button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button6.Location = new System.Drawing.Point(0, 300); this.button6.Name = "button6"; @@ -444,7 +444,7 @@ this.btnOperationInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOperationInfo.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOperationInfo.ForeColor = System.Drawing.Color.DimGray; - this.btnOperationInfo.Image = global::AIMS.UI.Properties.Resources.文书单; + this.btnOperationInfo.Image = global::AIMSControls.Properties.Resources.文书单; this.btnOperationInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOperationInfo.Location = new System.Drawing.Point(0, 250); this.btnOperationInfo.Name = "btnOperationInfo"; @@ -464,7 +464,7 @@ this.btnOutputLiquids.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutputLiquids.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOutputLiquids.ForeColor = System.Drawing.Color.DimGray; - this.btnOutputLiquids.Image = global::AIMS.UI.Properties.Resources.快捷事件; + this.btnOutputLiquids.Image = global::AIMSControls.Properties.Resources.快捷事件; this.btnOutputLiquids.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOutputLiquids.Location = new System.Drawing.Point(0, 200); this.btnOutputLiquids.Name = "btnOutputLiquids"; @@ -485,7 +485,7 @@ this.btnAddEvents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddEvents.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnAddEvents.ForeColor = System.Drawing.Color.DimGray; - this.btnAddEvents.Image = global::AIMS.UI.Properties.Resources.事件记录; + this.btnAddEvents.Image = global::AIMSControls.Properties.Resources.事件记录; this.btnAddEvents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnAddEvents.Location = new System.Drawing.Point(0, 150); this.btnAddEvents.Name = "btnAddEvents"; @@ -506,7 +506,7 @@ this.btnDrug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDrug.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnDrug.ForeColor = System.Drawing.Color.DimGray; - this.btnDrug.Image = global::AIMS.UI.Properties.Resources.用药记录; + this.btnDrug.Image = global::AIMSControls.Properties.Resources.用药记录; this.btnDrug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnDrug.Location = new System.Drawing.Point(0, 100); this.btnDrug.Name = "btnDrug"; @@ -527,7 +527,7 @@ this.btnTemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTemplate.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnTemplate.ForeColor = System.Drawing.Color.DimGray; - this.btnTemplate.Image = global::AIMS.UI.Properties.Resources.模板应用; + this.btnTemplate.Image = global::AIMSControls.Properties.Resources.模板应用; this.btnTemplate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTemplate.Location = new System.Drawing.Point(0, 50); this.btnTemplate.Name = "btnTemplate"; @@ -547,7 +547,7 @@ this.btnSelectPatient.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSelectPatient.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnSelectPatient.ForeColor = System.Drawing.Color.DimGray; - this.btnSelectPatient.Image = global::AIMS.UI.Properties.Resources.患者列表; + this.btnSelectPatient.Image = global::AIMSControls.Properties.Resources.患者列表; this.btnSelectPatient.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnSelectPatient.Location = new System.Drawing.Point(0, 0); this.btnSelectPatient.Name = "btnSelectPatient"; @@ -771,7 +771,7 @@ this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.UI.Properties.Resources.麻醉医嘱; + this.btnChage.Image = global::AIMSControls.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.Location = new System.Drawing.Point(0, 731); this.btnChage.Name = "btnChage"; @@ -792,7 +792,7 @@ this.btnsjzx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsjzx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; - this.btnsjzx.Image = global::AIMS.UI.Properties.Resources.工作列表; + this.btnsjzx.Image = global::AIMSControls.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.Location = new System.Drawing.Point(0, 781); this.btnsjzx.Name = "btnsjzx"; @@ -812,7 +812,7 @@ this.btndptz.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btndptz.Font = new System.Drawing.Font("微软雅黑", 11F); this.btndptz.ForeColor = System.Drawing.Color.DimGray; - this.btndptz.Image = global::AIMS.UI.Properties.Resources.文书状态; + this.btndptz.Image = global::AIMSControls.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.Location = new System.Drawing.Point(0, 831); this.btndptz.Name = "btndptz"; @@ -832,7 +832,7 @@ this.btnsbwh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsbwh.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; - this.btnsbwh.Image = global::AIMS.UI.Properties.Resources.耗材管理; + this.btnsbwh.Image = global::AIMSControls.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.Location = new System.Drawing.Point(0, 881); this.btnsbwh.Name = "btnsbwh"; @@ -2024,7 +2024,7 @@ // // plPrintBrowse // - this.plPrintBrowse.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_预览; + this.plPrintBrowse.BackgroundImage = global::AIMSControls.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrintBrowse.Location = new System.Drawing.Point(205, 4); @@ -2036,7 +2036,7 @@ // // PanelSave // - this.PanelSave.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; this.PanelSave.Location = new System.Drawing.Point(121, 4); @@ -2048,7 +2048,7 @@ // // plPrint // - this.plPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_打印; + this.plPrint.BackgroundImage = global::AIMSControls.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrint.Location = new System.Drawing.Point(163, 4); @@ -2060,7 +2060,7 @@ // // plRefresh // - this.plRefresh.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_刷新; + this.plRefresh.BackgroundImage = global::AIMSControls.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; this.plRefresh.Location = new System.Drawing.Point(247, 4); @@ -2192,7 +2192,7 @@ // picOutRoom // this.picOutRoom.BackColor = System.Drawing.Color.Transparent; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; this.picOutRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOutRoom.Location = new System.Drawing.Point(2, 10); this.picOutRoom.Name = "picOutRoom"; @@ -2285,7 +2285,7 @@ // picOpeBegin // this.picOpeBegin.BackColor = System.Drawing.Color.Transparent; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; this.picOpeBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeBegin.Location = new System.Drawing.Point(2, 10); this.picOpeBegin.Name = "picOpeBegin"; @@ -2378,7 +2378,7 @@ // picOpeEnd // this.picOpeEnd.BackColor = System.Drawing.Color.Transparent; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; this.picOpeEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeEnd.Location = new System.Drawing.Point(2, 10); this.picOpeEnd.Name = "picOpeEnd"; @@ -2471,7 +2471,7 @@ // picInRoom // this.picInRoom.BackColor = System.Drawing.Color.Transparent; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; this.picInRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picInRoom.Location = new System.Drawing.Point(2, 10); this.picInRoom.Name = "picInRoom"; diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.cs index bf71a17..7c21c28 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord.cs @@ -41,10 +41,10 @@ namespace AIMS.OperationAanesthesia { InitializeComponent(); #region 时间轴事件 - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; #endregion //AIMSExtension.PublicMethod.SetLocalDateTime(); } @@ -250,13 +250,13 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "手术开始") { _record.OperationBeginTime = null; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; BOperationRecord.Update(" OperationBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束") { _record.OperationEndTime = null; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; BOperationRecord.Update(" OperationEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } } @@ -320,25 +320,25 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "入室" && _record.InRoomTime != Inevent.EventBeginTime) { _record.InRoomTime = Inevent.EventBeginTime; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始" && _record.OperationBeginTime != Inevent.EventBeginTime) { _record.OperationBeginTime = Inevent.EventBeginTime; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; BOperationRecord.Update("OperationBeginTime=@OperationBegin where Id=@id ", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束" && _record.OperationEndTime != Inevent.EventBeginTime) { _record.OperationEndTime = Inevent.EventBeginTime; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; BOperationRecord.Update("OperationEndTime=@OperationEnd where Id=@id ", new AIMSModel.ParameterList("@OperationEnd", _record.OperationEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "出室" && _record.OutRoomTime != Inevent.EventBeginTime) { _record.OutRoomTime = Inevent.EventBeginTime; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } } @@ -1023,7 +1023,7 @@ namespace AIMS.OperationAanesthesia txtInRoom.ButtonDropDown.Visible = false; txtInRoom.Tag = _record.InRoomTime.Value; txtInRoom.Value = _record.InRoomTime.Value; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; } if (_record.OperationBeginTime != null) { @@ -1031,7 +1031,7 @@ namespace AIMS.OperationAanesthesia txtOperationBegin.ButtonDropDown.Visible = false; txtOperationBegin.Tag = _record.OperationBeginTime.Value; txtOperationBegin.Value = _record.OperationBeginTime.Value; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; } if (_record.OperationEndTime != null) { @@ -1039,7 +1039,7 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.ButtonDropDown.Visible = false; txtOperationEnd.Tag = _record.OperationEndTime.Value; txtOperationEnd.Value = _record.OperationEndTime.Value; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; } if (_record.OutRoomTime != null) { @@ -1047,7 +1047,7 @@ namespace AIMS.OperationAanesthesia txtOutRoom.ButtonDropDown.Visible = false; txtOutRoom.Tag = _record.OutRoomTime.Value; txtOutRoom.Value = _record.OutRoomTime.Value; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; } if (_record.OutRoomTime != null && _record.StateName == "手术中") @@ -1086,10 +1086,10 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.Text = ""; txtOutRoom.Text = ""; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; } /// diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs index 96041c6..90d9e7c 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.Designer.cs @@ -193,7 +193,7 @@ this.button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button10.Font = new System.Drawing.Font("微软雅黑", 11F); this.button10.ForeColor = System.Drawing.Color.DimGray; - this.button10.Image = global::AIMS.UI.Properties.Resources.安全检查; + this.button10.Image = global::AIMSControls.Properties.Resources.安全检查; this.button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button10.Location = new System.Drawing.Point(0, 700); this.button10.Name = "button10"; @@ -214,7 +214,7 @@ this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button9.Font = new System.Drawing.Font("微软雅黑", 11F); this.button9.ForeColor = System.Drawing.Color.DimGray; - this.button9.Image = global::AIMS.UI.Properties.Resources.手术申请; + this.button9.Image = global::AIMSControls.Properties.Resources.手术申请; this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button9.Location = new System.Drawing.Point(0, 650); this.button9.Name = "button9"; @@ -234,7 +234,7 @@ this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Font = new System.Drawing.Font("微软雅黑", 11F); this.button1.ForeColor = System.Drawing.Color.DimGray; - this.button1.Image = global::AIMS.UI.Properties.Resources.添加数据; + this.button1.Image = global::AIMSControls.Properties.Resources.添加数据; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button1.Location = new System.Drawing.Point(0, 600); this.button1.Name = "button1"; @@ -254,7 +254,7 @@ this.button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button8.Font = new System.Drawing.Font("微软雅黑", 11F); this.button8.ForeColor = System.Drawing.Color.DimGray; - this.button8.Image = global::AIMS.UI.Properties.Resources.系统设置; + this.button8.Image = global::AIMSControls.Properties.Resources.系统设置; this.button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button8.Location = new System.Drawing.Point(0, 550); this.button8.Name = "button8"; @@ -275,7 +275,7 @@ this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button7.Font = new System.Drawing.Font("微软雅黑", 11F); this.button7.ForeColor = System.Drawing.Color.DimGray; - this.button7.Image = global::AIMS.UI.Properties.Resources.文书编辑; + this.button7.Image = global::AIMSControls.Properties.Resources.文书编辑; this.button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button7.Location = new System.Drawing.Point(0, 500); this.button7.Name = "button7"; @@ -295,7 +295,7 @@ this.btnCancelIn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelIn.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelIn.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelIn.Image = global::AIMS.UI.Properties.Resources.显示切换; + this.btnCancelIn.Image = global::AIMSControls.Properties.Resources.显示切换; this.btnCancelIn.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelIn.Location = new System.Drawing.Point(0, 450); this.btnCancelIn.Name = "btnCancelIn"; @@ -316,7 +316,7 @@ this.btnCancelOperation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancelOperation.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnCancelOperation.ForeColor = System.Drawing.Color.DimGray; - this.btnCancelOperation.Image = global::AIMS.UI.Properties.Resources.取消手术; + this.btnCancelOperation.Image = global::AIMSControls.Properties.Resources.取消手术; this.btnCancelOperation.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCancelOperation.Location = new System.Drawing.Point(0, 400); this.btnCancelOperation.Name = "btnCancelOperation"; @@ -337,7 +337,7 @@ this.btnBloodGasAnalysis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBloodGasAnalysis.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnBloodGasAnalysis.ForeColor = System.Drawing.Color.DimGray; - this.btnBloodGasAnalysis.Image = global::AIMS.UI.Properties.Resources.血气分析; + this.btnBloodGasAnalysis.Image = global::AIMSControls.Properties.Resources.血气分析; this.btnBloodGasAnalysis.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnBloodGasAnalysis.Location = new System.Drawing.Point(0, 350); this.btnBloodGasAnalysis.Name = "btnBloodGasAnalysis"; @@ -358,7 +358,7 @@ this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button6.Font = new System.Drawing.Font("微软雅黑", 11F); this.button6.ForeColor = System.Drawing.Color.DimGray; - this.button6.Image = global::AIMS.UI.Properties.Resources.不良事件; + this.button6.Image = global::AIMSControls.Properties.Resources.不良事件; this.button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button6.Location = new System.Drawing.Point(0, 300); this.button6.Name = "button6"; @@ -379,7 +379,7 @@ this.btnOperationInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOperationInfo.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOperationInfo.ForeColor = System.Drawing.Color.DimGray; - this.btnOperationInfo.Image = global::AIMS.UI.Properties.Resources.文书单; + this.btnOperationInfo.Image = global::AIMSControls.Properties.Resources.文书单; this.btnOperationInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOperationInfo.Location = new System.Drawing.Point(0, 250); this.btnOperationInfo.Name = "btnOperationInfo"; @@ -399,7 +399,7 @@ this.btnOutputLiquids.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutputLiquids.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnOutputLiquids.ForeColor = System.Drawing.Color.DimGray; - this.btnOutputLiquids.Image = global::AIMS.UI.Properties.Resources.快捷事件; + this.btnOutputLiquids.Image = global::AIMSControls.Properties.Resources.快捷事件; this.btnOutputLiquids.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnOutputLiquids.Location = new System.Drawing.Point(0, 200); this.btnOutputLiquids.Name = "btnOutputLiquids"; @@ -420,7 +420,7 @@ this.btnAddEvents.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddEvents.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnAddEvents.ForeColor = System.Drawing.Color.DimGray; - this.btnAddEvents.Image = global::AIMS.UI.Properties.Resources.事件记录; + this.btnAddEvents.Image = global::AIMSControls.Properties.Resources.事件记录; this.btnAddEvents.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnAddEvents.Location = new System.Drawing.Point(0, 150); this.btnAddEvents.Name = "btnAddEvents"; @@ -441,7 +441,7 @@ this.btnDrug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDrug.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnDrug.ForeColor = System.Drawing.Color.DimGray; - this.btnDrug.Image = global::AIMS.UI.Properties.Resources.用药记录; + this.btnDrug.Image = global::AIMSControls.Properties.Resources.用药记录; this.btnDrug.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnDrug.Location = new System.Drawing.Point(0, 100); this.btnDrug.Name = "btnDrug"; @@ -462,7 +462,7 @@ this.btnTemplate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTemplate.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnTemplate.ForeColor = System.Drawing.Color.DimGray; - this.btnTemplate.Image = global::AIMS.UI.Properties.Resources.模板应用; + this.btnTemplate.Image = global::AIMSControls.Properties.Resources.模板应用; this.btnTemplate.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTemplate.Location = new System.Drawing.Point(0, 50); this.btnTemplate.Name = "btnTemplate"; @@ -482,7 +482,7 @@ this.btnSelectPatient.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSelectPatient.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnSelectPatient.ForeColor = System.Drawing.Color.DimGray; - this.btnSelectPatient.Image = global::AIMS.UI.Properties.Resources.患者列表; + this.btnSelectPatient.Image = global::AIMSControls.Properties.Resources.患者列表; this.btnSelectPatient.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnSelectPatient.Location = new System.Drawing.Point(0, 0); this.btnSelectPatient.Name = "btnSelectPatient"; @@ -706,7 +706,7 @@ this.btnChage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnChage.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnChage.ForeColor = System.Drawing.Color.DimGray; - this.btnChage.Image = global::AIMS.UI.Properties.Resources.麻醉医嘱; + this.btnChage.Image = global::AIMSControls.Properties.Resources.麻醉医嘱; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.Location = new System.Drawing.Point(0, 731); this.btnChage.Name = "btnChage"; @@ -727,7 +727,7 @@ this.btnsjzx.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsjzx.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; - this.btnsjzx.Image = global::AIMS.UI.Properties.Resources.工作列表; + this.btnsjzx.Image = global::AIMSControls.Properties.Resources.工作列表; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.Location = new System.Drawing.Point(0, 781); this.btnsjzx.Name = "btnsjzx"; @@ -747,7 +747,7 @@ this.btndptz.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btndptz.Font = new System.Drawing.Font("微软雅黑", 11F); this.btndptz.ForeColor = System.Drawing.Color.DimGray; - this.btndptz.Image = global::AIMS.UI.Properties.Resources.文书状态; + this.btndptz.Image = global::AIMSControls.Properties.Resources.文书状态; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.Location = new System.Drawing.Point(0, 831); this.btndptz.Name = "btndptz"; @@ -767,7 +767,7 @@ this.btnsbwh.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnsbwh.Font = new System.Drawing.Font("微软雅黑", 11F); this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; - this.btnsbwh.Image = global::AIMS.UI.Properties.Resources.耗材管理; + this.btnsbwh.Image = global::AIMSControls.Properties.Resources.耗材管理; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.Location = new System.Drawing.Point(0, 881); this.btnsbwh.Name = "btnsbwh"; @@ -947,7 +947,7 @@ // // plPrintBrowse // - this.plPrintBrowse.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_预览; + this.plPrintBrowse.BackgroundImage = global::AIMSControls.Properties.Resources.图标_预览; this.plPrintBrowse.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrintBrowse.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrintBrowse.Location = new System.Drawing.Point(205, 4); @@ -959,7 +959,7 @@ // // PanelSave // - this.PanelSave.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_保存; + this.PanelSave.BackgroundImage = global::AIMSControls.Properties.Resources.图标_保存; this.PanelSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.PanelSave.Cursor = System.Windows.Forms.Cursors.Hand; this.PanelSave.Location = new System.Drawing.Point(121, 4); @@ -971,7 +971,7 @@ // // plPrint // - this.plPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_打印; + this.plPrint.BackgroundImage = global::AIMSControls.Properties.Resources.图标_打印; this.plPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.plPrint.Location = new System.Drawing.Point(163, 4); @@ -983,7 +983,7 @@ // // plRefresh // - this.plRefresh.BackgroundImage = global::AIMS.UI.Properties.Resources.图标_刷新; + this.plRefresh.BackgroundImage = global::AIMSControls.Properties.Resources.图标_刷新; this.plRefresh.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.plRefresh.Cursor = System.Windows.Forms.Cursors.Hand; this.plRefresh.Location = new System.Drawing.Point(247, 4); @@ -1115,7 +1115,7 @@ // picOutRoom // this.picOutRoom.BackColor = System.Drawing.Color.Transparent; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; this.picOutRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOutRoom.Location = new System.Drawing.Point(2, 10); this.picOutRoom.Name = "picOutRoom"; @@ -1208,7 +1208,7 @@ // picOpeBegin // this.picOpeBegin.BackColor = System.Drawing.Color.Transparent; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; this.picOpeBegin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeBegin.Location = new System.Drawing.Point(2, 10); this.picOpeBegin.Name = "picOpeBegin"; @@ -1301,7 +1301,7 @@ // picOpeEnd // this.picOpeEnd.BackColor = System.Drawing.Color.Transparent; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; this.picOpeEnd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picOpeEnd.Location = new System.Drawing.Point(2, 10); this.picOpeEnd.Name = "picOpeEnd"; @@ -1394,7 +1394,7 @@ // picInRoom // this.picInRoom.BackColor = System.Drawing.Color.Transparent; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; this.picInRoom.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picInRoom.Location = new System.Drawing.Point(2, 10); this.picInRoom.Name = "picInRoom"; diff --git a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs index d6c89a9..d393056 100644 --- a/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS.UI/OperationAanesthesia/frmInstrumentRecord2.cs @@ -61,10 +61,10 @@ namespace AIMS.OperationAanesthesia { InitializeComponent(); #region 时间轴事件 - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; #endregion } @@ -79,12 +79,23 @@ namespace AIMS.OperationAanesthesia { btnChage.Visible = true; } - QXList = new List() { + if (PublicMethod.HospitalName.Contains("漳浦天福")) + { + QXList = new List() { + "1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20" , + "21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40" , + "41","42","43","44","45","46","47","48","49","50","51","52","53","54","55","56","57","58","59","60" + }; + + } + else + { + QXList = new List() { "1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","61","62","63", "21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40","64","65","66", "41","42","43","44","45","46","47","48","49","50","51","52","53","54","55","56","57","58","59","60","67","68","69" - }; + } //myEditControl初始化 myEditControl.MoveFocusHotKey = MoveFocusHotKeys.Tab; @@ -300,13 +311,13 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "手术开始") { _record.OperationBeginTime = null; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; BOperationRecord.Update(" OperationBeginTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束") { _record.OperationEndTime = null; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; BOperationRecord.Update(" OperationEndTime=null where Id=@id ", new AIMSModel.ParameterList("@id", _record.Id)); } } @@ -370,25 +381,25 @@ namespace AIMS.OperationAanesthesia if (Inevent != null && Inevent.EventName == "入室" && _record.InRoomTime != Inevent.EventBeginTime) { _record.InRoomTime = Inevent.EventBeginTime; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; BOperationRecord.Update("InRoomTime=@InRoom where Id=@id ", new AIMSModel.ParameterList("@InRoom", _record.InRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术开始" && _record.OperationBeginTime != Inevent.EventBeginTime) { _record.OperationBeginTime = Inevent.EventBeginTime; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; BOperationRecord.Update("OperationBeginTime=@OperationBegin where Id=@id ", new AIMSModel.ParameterList("@OperationBegin", _record.OperationBeginTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "手术结束" && _record.OperationEndTime != Inevent.EventBeginTime) { _record.OperationEndTime = Inevent.EventBeginTime; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; BOperationRecord.Update("OperationEndTime=@OperationEnd where Id=@id ", new AIMSModel.ParameterList("@OperationEnd", _record.OperationEndTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } if (Inevent != null && Inevent.EventName == "出室" && _record.OutRoomTime != Inevent.EventBeginTime) { _record.OutRoomTime = Inevent.EventBeginTime; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; BOperationRecord.Update("OutRoomTime=@OutRoom where Id=@id ", new AIMSModel.ParameterList("@OutRoom", _record.OutRoomTime.Value.ToString("yyyy-MM-dd HH:mm:ss"), "@id", _record.Id)); } } @@ -702,7 +713,7 @@ namespace AIMS.OperationAanesthesia { Incount = 9; FullUcControlsToPanel(QXList, _appliance, _record.InstrumentList, ref i1, ref j1); - for (int nulli = Incount; nulli < 69; nulli++) + for (int nulli = Incount; nulli < QXList.Count; nulli++) { var BillText = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).Name == QXList[nulli]).FirstOrDefault(); @@ -969,7 +980,7 @@ namespace AIMS.OperationAanesthesia txtInRoom.ButtonDropDown.Visible = false; txtInRoom.Tag = _record.InRoomTime.Value; txtInRoom.Value = _record.InRoomTime.Value; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室_select; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室_select; } if (_record.OperationBeginTime != null) { @@ -977,7 +988,7 @@ namespace AIMS.OperationAanesthesia txtOperationBegin.ButtonDropDown.Visible = false; txtOperationBegin.Tag = _record.OperationBeginTime.Value; txtOperationBegin.Value = _record.OperationBeginTime.Value; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始_select; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始_select; } if (_record.OperationEndTime != null) { @@ -985,7 +996,7 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.ButtonDropDown.Visible = false; txtOperationEnd.Tag = _record.OperationEndTime.Value; txtOperationEnd.Value = _record.OperationEndTime.Value; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束_select; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束_select; } if (_record.OutRoomTime != null) { @@ -993,7 +1004,7 @@ namespace AIMS.OperationAanesthesia txtOutRoom.ButtonDropDown.Visible = false; txtOutRoom.Tag = _record.OutRoomTime.Value; txtOutRoom.Value = _record.OutRoomTime.Value; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室_select; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室_select; } //回写时间数据到文书 if (_record.OutRoomTime != null && _record.StateName == "手术中") @@ -1032,10 +1043,10 @@ namespace AIMS.OperationAanesthesia txtOperationEnd.Text = ""; txtOutRoom.Text = ""; - this.picInRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.入手术室; - this.picOpeBegin.BackgroundImage = global::AIMS.UI.Properties.Resources.手术开始; - this.picOpeEnd.BackgroundImage = global::AIMS.UI.Properties.Resources.手术结束; - this.picOutRoom.BackgroundImage = global::AIMS.UI.Properties.Resources.出手术室; + this.picInRoom.BackgroundImage = global::AIMSControls.Properties.Resources.入手术室; + this.picOpeBegin.BackgroundImage = global::AIMSControls.Properties.Resources.手术开始; + this.picOpeEnd.BackgroundImage = global::AIMSControls.Properties.Resources.手术结束; + this.picOutRoom.BackgroundImage = global::AIMSControls.Properties.Resources.出手术室; } /// @@ -1293,35 +1304,7 @@ namespace AIMS.OperationAanesthesia _appliance = newDataTable; FullUcControlsToPanel(QXList, _appliance, _record.InstrumentList, ref i1, ref j1); } - } - private void FirstbtnEnter2() - { - if (_applianceUseType2 == null) - { - _applianceUseType2 = new List(); - ApplianceUseType _nowApplianceUseType = BApplianceUseType.SelectSingle(1, RecursiveType.None, 0); - _applianceUseType2.Add(_nowApplianceUseType); - DataTable newDataTable = null; - if (_applianceUseType2.Count > 0) _appliance2 = BAppliance.GetApplianiceNumberByIds(_applianceUseType2[0].TheApplianceId, _applianceUseType2[0].ApplianceNumber); - newDataTable = _appliance2.Clone(); - foreach (ApplianceUseType item in _applianceUseType2) - { - if (item.TheApplianceId != null && item.TheApplianceId != "") - { - DataTable dt = BAppliance.GetApplianiceNumberByIds(item.TheApplianceId, item.ApplianceNumber); - object[] obj = new object[newDataTable.Columns.Count]; - //添加DataTable1的数据 - for (int i = 0; i < dt.Rows.Count; i++) - { - dt.Rows[i].ItemArray.CopyTo(obj, 0); - newDataTable.Rows.Add(obj); - } - } - } - _appliance2 = newDataTable; - //FullUcControlsToPanel(panelQXList2, _appliance2, _record.InstrumentList2, ref i1, ref j1); - } - } + } #endregion #region 加载物品控件 @@ -1338,7 +1321,7 @@ namespace AIMS.OperationAanesthesia { foreach (DataRow dr in dt.Rows) { - if (Incount >= 70) + if (Incount >= QXList.Count) break; var BillText = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).Name == QXList[Incount]).FirstOrDefault(); @@ -1436,7 +1419,7 @@ namespace AIMS.OperationAanesthesia } } } - for (int nulli = 9; nulli < 69; nulli++) + for (int nulli = 9; nulli < QXList.Count; nulli++) { var BillText = myEditControl.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement && (x as XTextInputFieldElement).Name == QXList[nulli]).FirstOrDefault(); diff --git a/AIMS.UI/OperationAanesthesia/frmOpeRecoverInInfo.designer.cs b/AIMS.UI/OperationAanesthesia/frmOpeRecoverInInfo.designer.cs index 001f76d..05ca681 100644 --- a/AIMS.UI/OperationAanesthesia/frmOpeRecoverInInfo.designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmOpeRecoverInInfo.designer.cs @@ -358,7 +358,7 @@ this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Image = global::AIMS.UI.Properties.Resources.麻醉记录_select; + this.button1.Image = global::AIMSControls.Properties.Resources.麻醉记录_select; this.button1.Location = new System.Drawing.Point(863, 126); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(45, 45); diff --git a/AIMS.UI/OperationAanesthesia/frmOpeRecoverInfo.Designer.cs b/AIMS.UI/OperationAanesthesia/frmOpeRecoverInfo.Designer.cs index 0d2b1cd..dde7556 100644 --- a/AIMS.UI/OperationAanesthesia/frmOpeRecoverInfo.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmOpeRecoverInfo.Designer.cs @@ -653,7 +653,7 @@ this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Image = global::AIMS.UI.Properties.Resources.麻醉记录_select; + this.button1.Image = global::AIMSControls.Properties.Resources.麻醉记录_select; this.button1.Location = new System.Drawing.Point(817, 346); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(45, 45); diff --git a/AIMS.UI/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs b/AIMS.UI/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs index 1485be3..f60ce44 100644 --- a/AIMS.UI/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs +++ b/AIMS.UI/OperationAanesthesia/frmOpeRecoverOutInfo.designer.cs @@ -397,7 +397,7 @@ this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Image = global::AIMS.UI.Properties.Resources.麻醉记录_select; + this.button1.Image = global::AIMSControls.Properties.Resources.麻醉记录_select; this.button1.Location = new System.Drawing.Point(863, 131); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(45, 45); diff --git a/AIMS.UI/OperationAanesthesia/frmSelectPatientNew3.cs b/AIMS.UI/OperationAanesthesia/frmSelectPatientNew3.cs index 354ca36..3bbfbc7 100644 --- a/AIMS.UI/OperationAanesthesia/frmSelectPatientNew3.cs +++ b/AIMS.UI/OperationAanesthesia/frmSelectPatientNew3.cs @@ -1,18 +1,14 @@ -using DrawGraph; -using AIMS.OremrUserControl; +using AIMS.OremrUserControl; +using AIMSBLL; +using AIMSExtension; +using AIMSModel; +using DrawGraph; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Data; using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using AIMSModel; -using AIMSBLL; -using DCSoftDotfuscate; using System.Net; -using AIMSExtension; +using System.Windows.Forms; namespace AIMS.OperationAanesthesia { diff --git a/AIMS.UI/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.designer.cs b/AIMS.UI/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.designer.cs index 9fa5f76..93422eb 100644 --- a/AIMS.UI/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.designer.cs +++ b/AIMS.UI/OperationAanesthesia/oldSystemCode/frmOperatingRoomRegister.designer.cs @@ -264,7 +264,7 @@ // // tsbSetup // - this.tsbSetup.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbSetup.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbSetup.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSetup.Name = "tsbSetup"; this.tsbSetup.Size = new System.Drawing.Size(99, 34); @@ -273,7 +273,7 @@ // // tsbExit // - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(71, 34); @@ -283,7 +283,7 @@ // // tsbSaveOperationApply // - this.tsbSaveOperationApply.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSaveOperationApply.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSaveOperationApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSaveOperationApply.Name = "tsbSaveOperationApply"; this.tsbSaveOperationApply.Size = new System.Drawing.Size(71, 34); @@ -292,7 +292,7 @@ // // tsbConfigDataGridview // - this.tsbConfigDataGridview.Image = global::AIMS.UI.Properties.Resources.图标_回顾恢复; + this.tsbConfigDataGridview.Image = global::AIMSControls.Properties.Resources.图标_回顾恢复; this.tsbConfigDataGridview.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbConfigDataGridview.Name = "tsbConfigDataGridview"; this.tsbConfigDataGridview.RightToLeft = System.Windows.Forms.RightToLeft.No; diff --git a/AIMS.UI/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.Designer.cs b/AIMS.UI/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.Designer.cs index 1d83b88..71c6b87 100644 --- a/AIMS.UI/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.Designer.cs +++ b/AIMS.UI/OperationAanesthesia/oldSystemCode/frmPrescriptionDocument.Designer.cs @@ -65,7 +65,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -81,7 +81,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_打印; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_打印; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(44, 46); @@ -97,7 +97,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭窗口; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭窗口; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/OperationAfter/frmNotesRecordExport.designer.cs b/AIMS.UI/OperationAfter/frmNotesRecordExport.designer.cs index 3342c13..39ae953 100644 --- a/AIMS.UI/OperationAfter/frmNotesRecordExport.designer.cs +++ b/AIMS.UI/OperationAfter/frmNotesRecordExport.designer.cs @@ -170,7 +170,7 @@ // toolStripButton2 // this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton2.Image = global::AIMS.UI.Properties.Resources.图标_预览; + this.toolStripButton2.Image = global::AIMSControls.Properties.Resources.图标_预览; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(60, 46); @@ -182,7 +182,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(72, 46); diff --git a/AIMS.UI/OperationAfter/frmOperationCharg2.designer.cs b/AIMS.UI/OperationAfter/frmOperationCharg2.designer.cs index 17720eb..6631541 100644 --- a/AIMS.UI/OperationAfter/frmOperationCharg2.designer.cs +++ b/AIMS.UI/OperationAfter/frmOperationCharg2.designer.cs @@ -207,7 +207,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(68, 46); @@ -223,7 +223,7 @@ // tsbExportExcel // this.tsbExportExcel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExportExcel.Image = global::AIMS.UI.Properties.Resources.图标_排程通过; + this.tsbExportExcel.Image = global::AIMSControls.Properties.Resources.图标_排程通过; this.tsbExportExcel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExportExcel.Name = "tsbExportExcel"; this.tsbExportExcel.Size = new System.Drawing.Size(99, 46); @@ -239,7 +239,7 @@ // tsbPrint // this.tsbPrint.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbPrint.Image = global::AIMS.UI.Properties.Resources.图标_打印; + this.tsbPrint.Image = global::AIMSControls.Properties.Resources.图标_打印; this.tsbPrint.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbPrint.Name = "tsbPrint"; this.tsbPrint.Size = new System.Drawing.Size(100, 46); @@ -1157,7 +1157,7 @@ // toolStripButton2 // this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton2.Image = global::AIMS.UI.Properties.Resources.图标_排程通过; + this.toolStripButton2.Image = global::AIMSControls.Properties.Resources.图标_排程通过; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(92, 46); diff --git a/AIMS.UI/OperationAfter/frmOperationCharg3.designer.cs b/AIMS.UI/OperationAfter/frmOperationCharg3.designer.cs index 1d8272c..27e7153 100644 --- a/AIMS.UI/OperationAfter/frmOperationCharg3.designer.cs +++ b/AIMS.UI/OperationAfter/frmOperationCharg3.designer.cs @@ -148,7 +148,7 @@ // toolStripButton2 // this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton2.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.toolStripButton2.Image = global::AIMSControls.Properties.Resources.图标_设置; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(60, 46); @@ -159,7 +159,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(65, 46); @@ -170,7 +170,7 @@ // toolStripButton3 // this.toolStripButton3.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton3.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton3.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Size = new System.Drawing.Size(65, 46); @@ -921,7 +921,7 @@ // this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton4.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton4.Image = global::AIMS.UI.Properties.Resources.图标_刷新; + this.toolStripButton4.Image = global::AIMSControls.Properties.Resources.图标_刷新; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Size = new System.Drawing.Size(72, 46); diff --git a/AIMS.UI/OperationAfter/frmOperationCharg5.designer.cs b/AIMS.UI/OperationAfter/frmOperationCharg5.designer.cs index bd19886..b2b8d1e 100644 --- a/AIMS.UI/OperationAfter/frmOperationCharg5.designer.cs +++ b/AIMS.UI/OperationAfter/frmOperationCharg5.designer.cs @@ -134,7 +134,7 @@ // toolStripButton2 // this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton2.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.toolStripButton2.Image = global::AIMSControls.Properties.Resources.图标_设置; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(60, 46); @@ -145,7 +145,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(65, 46); @@ -156,7 +156,7 @@ // toolStripButton3 // this.toolStripButton3.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton3.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton3.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton3.Size = new System.Drawing.Size(65, 46); @@ -781,7 +781,7 @@ // this.toolStripButton4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton4.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton4.Image = global::AIMS.UI.Properties.Resources.图标_刷新; + this.toolStripButton4.Image = global::AIMSControls.Properties.Resources.图标_刷新; this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton4.Name = "toolStripButton4"; this.toolStripButton4.Size = new System.Drawing.Size(72, 46); diff --git a/AIMS.UI/OperationAfter/frmOperationManage.Designer.cs b/AIMS.UI/OperationAfter/frmOperationManage.Designer.cs index 70162cf..e0afe2b 100644 --- a/AIMS.UI/OperationAfter/frmOperationManage.Designer.cs +++ b/AIMS.UI/OperationAfter/frmOperationManage.Designer.cs @@ -204,7 +204,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(68, 46); @@ -220,7 +220,7 @@ // tsbReviewApply // this.tsbReviewApply.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbReviewApply.Image = global::AIMS.UI.Properties.Resources.图标_回顾恢复; + this.tsbReviewApply.Image = global::AIMSControls.Properties.Resources.图标_回顾恢复; this.tsbReviewApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbReviewApply.Name = "tsbReviewApply"; this.tsbReviewApply.Size = new System.Drawing.Size(68, 46); @@ -238,7 +238,7 @@ // tspSetting // this.tspSetting.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tspSetting.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tspSetting.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tspSetting.ImageTransparentColor = System.Drawing.Color.Magenta; this.tspSetting.Name = "tspSetting"; this.tspSetting.Size = new System.Drawing.Size(68, 46); @@ -254,7 +254,7 @@ // tsbExportExcel // this.tsbExportExcel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExportExcel.Image = global::AIMS.UI.Properties.Resources.图标_排程通过; + this.tsbExportExcel.Image = global::AIMSControls.Properties.Resources.图标_排程通过; this.tsbExportExcel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExportExcel.Name = "tsbExportExcel"; this.tsbExportExcel.Size = new System.Drawing.Size(73, 46); @@ -270,7 +270,7 @@ // tsbPrint // this.tsbPrint.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbPrint.Image = global::AIMS.UI.Properties.Resources.图标_打印; + this.tsbPrint.Image = global::AIMSControls.Properties.Resources.图标_打印; this.tsbPrint.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbPrint.Name = "tsbPrint"; this.tsbPrint.Size = new System.Drawing.Size(40, 46); diff --git a/AIMS.UI/OperationAfter/frmOperationReview.Designer.cs b/AIMS.UI/OperationAfter/frmOperationReview.Designer.cs index bd44580..1a90fd4 100644 --- a/AIMS.UI/OperationAfter/frmOperationReview.Designer.cs +++ b/AIMS.UI/OperationAfter/frmOperationReview.Designer.cs @@ -163,7 +163,7 @@ // tsbEditApply // this.tsbEditApply.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbEditApply.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbEditApply.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbEditApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbEditApply.Name = "tsbEditApply"; this.tsbEditApply.Size = new System.Drawing.Size(68, 48); @@ -181,7 +181,7 @@ // tsbOperationReview // this.tsbOperationReview.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbOperationReview.Image = global::AIMS.UI.Properties.Resources.图标_回顾手术; + this.tsbOperationReview.Image = global::AIMSControls.Properties.Resources.图标_回顾手术; this.tsbOperationReview.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbOperationReview.Name = "tsbOperationReview"; this.tsbOperationReview.Size = new System.Drawing.Size(68, 48); @@ -199,7 +199,7 @@ // tsbOperationRecover // this.tsbOperationRecover.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbOperationRecover.Image = global::AIMS.UI.Properties.Resources.图标_回顾恢复; + this.tsbOperationRecover.Image = global::AIMSControls.Properties.Resources.图标_回顾恢复; this.tsbOperationRecover.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbOperationRecover.Name = "tsbOperationRecover"; this.tsbOperationRecover.Size = new System.Drawing.Size(68, 48); @@ -217,7 +217,7 @@ // tspBAGD // this.tspBAGD.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tspBAGD.Image = global::AIMS.UI.Properties.Resources.图标_访视单; + this.tspBAGD.Image = global::AIMSControls.Properties.Resources.图标_访视单; this.tspBAGD.ImageTransparentColor = System.Drawing.Color.Magenta; this.tspBAGD.Name = "tspBAGD"; this.tspBAGD.Size = new System.Drawing.Size(64, 48); @@ -234,7 +234,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_申请作废; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_申请作废; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(88, 48); @@ -251,7 +251,7 @@ // tsbSet // this.tsbSet.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSet.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbSet.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbSet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSet.Name = "tsbSet"; this.tsbSet.Size = new System.Drawing.Size(44, 48); @@ -888,7 +888,7 @@ // toolStripButton2 // this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton2.Image = global::AIMS.UI.Properties.Resources.图标_回顾手术; + this.toolStripButton2.Image = global::AIMSControls.Properties.Resources.图标_回顾手术; this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton2.Name = "toolStripButton2"; this.toolStripButton2.Size = new System.Drawing.Size(68, 48); diff --git a/AIMS.UI/OperationAfter/frmPatientStateTree.cs b/AIMS.UI/OperationAfter/frmPatientStateTree.cs index 9cdb477..10a5686 100644 --- a/AIMS.UI/OperationAfter/frmPatientStateTree.cs +++ b/AIMS.UI/OperationAfter/frmPatientStateTree.cs @@ -13,35 +13,35 @@ namespace AIMS.OperationAfter.UI { InitializeComponent(); //申请手术 - panel2.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSYH; - panel9.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAS_GRAY_; + panel2.BackgroundImage = global::AIMSControls.Properties.Resources.GCSYH; + panel9.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAS_GRAY_; label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel14.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSNOTPASS; + panel14.BackgroundImage = global::AIMSControls.Properties.Resources.GCSNOTPASS; //术前排程 panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel12.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSQPC_GRAY_; + panel12.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSQPC_GRAY_; label18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel18.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSNOTPASS; + panel18.BackgroundImage = global::AIMSControls.Properties.Resources.GCSNOTPASS; //术前访视 - panel10.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSQFS_GRAY_; + panel10.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSQFS_GRAY_; panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSUNRATED; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSUNRATED; //麻醉计划 label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel11.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAP_GRAY_; + panel11.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAP_GRAY_; panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel19.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSNotDevelop; + panel19.BackgroundImage = global::AIMSControls.Properties.Resources.GCSNotDevelop; //麻醉知情同意书 panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel26.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAGREED_GRAY_; + panel26.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAGREED_GRAY_; label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel20.BackgroundImage = global::AIMS.UI.Properties.Resources.GCDONTS; + panel20.BackgroundImage = global::AIMSControls.Properties.Resources.GCDONTS; //术后随访 - panel23.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSYHRIG; - panel15.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSH_GRAY_; + panel23.BackgroundImage = global::AIMSControls.Properties.Resources.GCSYHRIG; + panel15.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSH_GRAY_; label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel22.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSNOTFOLLOW; + panel22.BackgroundImage = global::AIMSControls.Properties.Resources.GCSNOTFOLLOW; } @@ -73,18 +73,18 @@ namespace AIMS.OperationAfter.UI if (dt.Rows[i]["XmlFileName"].ToString().Contains("手术患者术前术后访视单") || dt.Rows[i]["XmlFileName"].ToString().Contains("术前访视")) { //label13.Text = ""; - panel11.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAP; + panel11.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAP; label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(86)))), ((int)(((byte)(164))))); panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(3)))), ((int)(((byte)(86)))), ((int)(((byte)(164))))); - panel19.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSADevelop; + panel19.BackgroundImage = global::AIMSControls.Properties.Resources.GCSADevelop; } if (dt.Rows[i]["XmlFileName"].ToString().Contains("麻醉知情同意书") || dt.Rows[i]["XmlFileName"].ToString().Contains("知情同意书")) { //label14.Text = ""; - panel26.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAGREED; + panel26.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAGREED; panel5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(145)))), ((int)(((byte)(205))))); - panel20.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSASigned; + panel20.BackgroundImage = global::AIMSControls.Properties.Resources.GCSASigned; label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(145)))), ((int)(((byte)(205))))); } @@ -92,39 +92,39 @@ namespace AIMS.OperationAfter.UI { //label16.Text = ""; label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(242)))), ((int)(((byte)(7))))); - panel23.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSYYELLOW; - panel15.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSH; - panel22.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSHaveFollow; + panel23.BackgroundImage = global::AIMSControls.Properties.Resources.GCSYYELLOW; + panel15.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSH; + panel22.BackgroundImage = global::AIMSControls.Properties.Resources.GCSHaveFollow; } } } panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel24.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSZA_GRAY_; + panel24.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSZA_GRAY_; label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel25.BackgroundImage = global::AIMS.UI.Properties.Resources.GCDONTS; + panel25.BackgroundImage = global::AIMSControls.Properties.Resources.GCDONTS; panel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel13.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAR_GRAY_; + panel13.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAR_GRAY_; label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(195)))), ((int)(((byte)(193)))), ((int)(((byte)(193))))); - panel21.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSNOTPASS; + panel21.BackgroundImage = global::AIMSControls.Properties.Resources.GCSNOTPASS; for (int i = 0; i < patientdt.Rows.Count; i++) { if (patientdt.Rows[i]["RecoverId"].ToString() == "1") { label17.Text = patientdt.Rows[0]["InRoomTime"].ToString(); - panel25.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSASigned; - panel24.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSZMZ; + panel25.BackgroundImage = global::AIMSControls.Properties.Resources.GCSASigned; + panel24.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSZMZ; panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(4)))), ((int)(((byte)(186)))), ((int)(((byte)(159))))); } if (patientdt.Rows[i]["RecoverId"].ToString() == "2") { panel8.BackColor = Color.Lime; label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(143)))), ((int)(((byte)(249)))), ((int)(((byte)(1))))); - panel13.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAR; + panel13.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAR; label15.Text = patientdt.Rows[i]["InRoomTime"].ToString(); - panel21.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSPASS; + panel21.BackgroundImage = global::AIMSControls.Properties.Resources.GCSPASS; } } } @@ -136,31 +136,31 @@ namespace AIMS.OperationAfter.UI private void SQFS(DataTable patientdt) { label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(40)))), ((int)(((byte)(158))))); - panel10.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSQFS; + panel10.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSQFS; panel4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(40)))), ((int)(((byte)(158))))); if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA1) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP1; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP1; } else if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA2) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP2; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP2; } else if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA3) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP3; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP3; } else if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA4) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP4; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP4; } else if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA5) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP5; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP5; } else if (patientdt.Rows[0]["ASALevelName"].ToString() == ASA6) { - panel17.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSCLASSP6; + panel17.BackgroundImage = global::AIMSControls.Properties.Resources.GCSCLASSP6; } } /// @@ -170,8 +170,8 @@ namespace AIMS.OperationAfter.UI private void SQPC(DataTable patientdt) { label12.Text = patientdt.Rows[0]["OrderOperationTime"].ToString(); - panel18.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSPASS; - panel12.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSSQPC; + panel18.BackgroundImage = global::AIMSControls.Properties.Resources.GCSPASS; + panel12.BackgroundImage = global::AIMSControls.Properties.Resources.GCSSQPC; panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(46)))), ((int)(((byte)(146))))); label18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(167)))), ((int)(((byte)(46)))), ((int)(((byte)(146))))); } @@ -183,9 +183,9 @@ namespace AIMS.OperationAfter.UI { label10.Text = patientdt.Rows[0]["ApplyTime"].ToString(); label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(21)))), ((int)(((byte)(131))))); - panel14.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSPASS; - panel9.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSAS; - panel2.BackgroundImage = global::AIMS.UI.Properties.Resources.GCSYPink; + panel14.BackgroundImage = global::AIMSControls.Properties.Resources.GCSPASS; + panel9.BackgroundImage = global::AIMSControls.Properties.Resources.GCSAS; + panel2.BackgroundImage = global::AIMSControls.Properties.Resources.GCSYPink; } } } diff --git a/AIMS.UI/OperationAfter/frmReportExport.designer.cs b/AIMS.UI/OperationAfter/frmReportExport.designer.cs index 2260531..a3f0c13 100644 --- a/AIMS.UI/OperationAfter/frmReportExport.designer.cs +++ b/AIMS.UI/OperationAfter/frmReportExport.designer.cs @@ -111,7 +111,7 @@ // tspSetting // this.tspSetting.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tspSetting.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tspSetting.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tspSetting.ImageTransparentColor = System.Drawing.Color.Magenta; this.tspSetting.Name = "tspSetting"; this.tspSetting.Size = new System.Drawing.Size(68, 46); @@ -122,7 +122,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_手术排程; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_手术排程; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(65, 46); diff --git a/AIMS.UI/OperationFront/frmExeOperationPlan.Designer.cs b/AIMS.UI/OperationFront/frmExeOperationPlan.Designer.cs index 1f89599..6c96ad5 100644 --- a/AIMS.UI/OperationFront/frmExeOperationPlan.Designer.cs +++ b/AIMS.UI/OperationFront/frmExeOperationPlan.Designer.cs @@ -117,7 +117,7 @@ // tsbExe // this.tsbExe.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExe.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbExe.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbExe.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExe.Name = "tsbExe"; this.tsbExe.Size = new System.Drawing.Size(68, 46); @@ -133,7 +133,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); @@ -149,7 +149,7 @@ // tsbSet // this.tsbSet.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSet.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbSet.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbSet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSet.Name = "tsbSet"; this.tsbSet.Size = new System.Drawing.Size(44, 46); diff --git a/AIMS.UI/OperationFront/frmOperationApply.Designer.cs b/AIMS.UI/OperationFront/frmOperationApply.Designer.cs index 7a25153..bf940b1 100644 --- a/AIMS.UI/OperationFront/frmOperationApply.Designer.cs +++ b/AIMS.UI/OperationFront/frmOperationApply.Designer.cs @@ -182,7 +182,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(76, 46); @@ -198,7 +198,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(52, 46); @@ -214,7 +214,7 @@ // tsbAuditing // this.tsbAuditing.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAuditing.Image = global::AIMS.UI.Properties.Resources.图标_完成; + this.tsbAuditing.Image = global::AIMSControls.Properties.Resources.图标_完成; this.tsbAuditing.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAuditing.Name = "tsbAuditing"; this.tsbAuditing.Size = new System.Drawing.Size(40, 46); @@ -230,7 +230,7 @@ // tsbDelete // this.tsbDelete.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbDelete.Image = global::AIMS.UI.Properties.Resources.图标_申请作废; + this.tsbDelete.Image = global::AIMSControls.Properties.Resources.图标_申请作废; this.tsbDelete.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbDelete.Name = "tsbDelete"; this.tsbDelete.Size = new System.Drawing.Size(40, 46); @@ -246,7 +246,7 @@ // toolStripButton1 // this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_回顾恢复; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_回顾恢复; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(60, 46); @@ -262,7 +262,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/OperationFront/frmOperationApplyDetail.Designer.cs b/AIMS.UI/OperationFront/frmOperationApplyDetail.Designer.cs index 161bd49..950661b 100644 --- a/AIMS.UI/OperationFront/frmOperationApplyDetail.Designer.cs +++ b/AIMS.UI/OperationFront/frmOperationApplyDetail.Designer.cs @@ -163,7 +163,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 46); @@ -179,7 +179,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(52, 46); @@ -190,7 +190,7 @@ // tsbSet // this.tsbSet.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSet.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbSet.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbSet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSet.Name = "tsbSet"; this.tsbSet.Size = new System.Drawing.Size(52, 46); @@ -207,7 +207,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/OperationFront/frmOperationFrontVisit.Designer.cs b/AIMS.UI/OperationFront/frmOperationFrontVisit.Designer.cs index be81b88..328a508 100644 --- a/AIMS.UI/OperationFront/frmOperationFrontVisit.Designer.cs +++ b/AIMS.UI/OperationFront/frmOperationFrontVisit.Designer.cs @@ -1300,7 +1300,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_访视单; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_访视单; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(76, 42); @@ -1316,7 +1316,7 @@ // tsbModify // this.tsbModify.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbModify.Image = global::AIMS.UI.Properties.Resources.图标_申请修改; + this.tsbModify.Image = global::AIMSControls.Properties.Resources.图标_申请修改; this.tsbModify.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModify.Name = "tsbModify"; this.tsbModify.Size = new System.Drawing.Size(76, 42); @@ -1332,7 +1332,7 @@ // tsbWaitSet // this.tsbWaitSet.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbWaitSet.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbWaitSet.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbWaitSet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbWaitSet.Name = "tsbWaitSet"; this.tsbWaitSet.Size = new System.Drawing.Size(80, 42); @@ -1348,7 +1348,7 @@ // tsbAlreadySet // this.tsbAlreadySet.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAlreadySet.Image = global::AIMS.UI.Properties.Resources.图标_设置; + this.tsbAlreadySet.Image = global::AIMSControls.Properties.Resources.图标_设置; this.tsbAlreadySet.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAlreadySet.Name = "tsbAlreadySet"; this.tsbAlreadySet.Size = new System.Drawing.Size(80, 42); @@ -1366,7 +1366,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 42); diff --git a/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs b/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs index 311ca4a..0485f79 100644 --- a/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS.UI/OperationFront/frmOperationSchedulePlan.cs @@ -1057,7 +1057,7 @@ namespace AIMS.OperationFront.UI // this.buttonItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; this.buttonItem1.Checked = true; - this.buttonItem1.Image = global::AIMS.UI.Properties.Resources.Table1; + this.buttonItem1.Image = global::AIMSControls.Properties.Resources.Table1; this.buttonItem1.ImagePaddingHorizontal = 15; this.buttonItem1.ImagePaddingVertical = 0; this.buttonItem1.Name = "buttonItem1"; @@ -1399,7 +1399,7 @@ namespace AIMS.OperationFront.UI // buttonInstrumentNurse // this.buttonInstrumentNurse.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.buttonInstrumentNurse.Image = global::AIMS.UI.Properties.Resources.BookNoteWhite; + this.buttonInstrumentNurse.Image = global::AIMSControls.Properties.Resources.BookNoteWhite; this.buttonInstrumentNurse.ImagePaddingHorizontal = 15; this.buttonInstrumentNurse.ImagePaddingVertical = 0; this.buttonInstrumentNurse.Name = "buttonInstrumentNurse"; @@ -1740,7 +1740,7 @@ namespace AIMS.OperationFront.UI // buttonItemTourNurse // this.buttonItemTourNurse.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.buttonItemTourNurse.Image = global::AIMS.UI.Properties.Resources.BookNoteWhite; + this.buttonItemTourNurse.Image = global::AIMSControls.Properties.Resources.BookNoteWhite; this.buttonItemTourNurse.ImagePaddingHorizontal = 15; this.buttonItemTourNurse.ImagePaddingVertical = 0; this.buttonItemTourNurse.Name = "buttonItemTourNurse"; @@ -2079,7 +2079,7 @@ namespace AIMS.OperationFront.UI // buttonItemAnas // this.buttonItemAnas.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.buttonItemAnas.Image = global::AIMS.UI.Properties.Resources.BookNote; + this.buttonItemAnas.Image = global::AIMSControls.Properties.Resources.BookNote; this.buttonItemAnas.ImagePaddingHorizontal = 15; this.buttonItemAnas.ImagePaddingVertical = 0; this.buttonItemAnas.Name = "buttonItemAnas"; @@ -2496,7 +2496,7 @@ namespace AIMS.OperationFront.UI // tsbNewOperationApply // this.tsbNewOperationApply.Font = new System.Drawing.Font("΢ź", 9F); - this.tsbNewOperationApply.Image = global::AIMS.UI.Properties.Resources.ͼ_ų; + this.tsbNewOperationApply.Image = global::AIMSControls.Properties.Resources.ͼ_ų; this.tsbNewOperationApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbNewOperationApply.Name = "tsbNewOperationApply"; this.tsbNewOperationApply.Size = new System.Drawing.Size(68, 46); @@ -2507,7 +2507,7 @@ namespace AIMS.OperationFront.UI // tsbModifyOperationApply // this.tsbModifyOperationApply.Font = new System.Drawing.Font("΢ź", 9F); - this.tsbModifyOperationApply.Image = global::AIMS.UI.Properties.Resources.ͼ_޸; + this.tsbModifyOperationApply.Image = global::AIMSControls.Properties.Resources.ͼ_޸; this.tsbModifyOperationApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbModifyOperationApply.Name = "tsbModifyOperationApply"; this.tsbModifyOperationApply.Size = new System.Drawing.Size(68, 46); @@ -2518,7 +2518,7 @@ namespace AIMS.OperationFront.UI // tsbCancelOperationApply // this.tsbCancelOperationApply.Font = new System.Drawing.Font("΢ź", 9F); - this.tsbCancelOperationApply.Image = global::AIMS.UI.Properties.Resources.ͼ_; + this.tsbCancelOperationApply.Image = global::AIMSControls.Properties.Resources.ͼ_; this.tsbCancelOperationApply.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancelOperationApply.Name = "tsbCancelOperationApply"; this.tsbCancelOperationApply.Size = new System.Drawing.Size(68, 46); @@ -2534,7 +2534,7 @@ namespace AIMS.OperationFront.UI // btnpass // this.btnpass.Font = new System.Drawing.Font("΢ź", 9F); - this.btnpass.Image = global::AIMS.UI.Properties.Resources.ͼ_ųͨ; + this.btnpass.Image = global::AIMSControls.Properties.Resources.ͼ_ųͨ; this.btnpass.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnpass.Name = "btnpass"; this.btnpass.Size = new System.Drawing.Size(68, 46); @@ -2550,7 +2550,7 @@ namespace AIMS.OperationFront.UI // btnPlan // this.btnPlan.Font = new System.Drawing.Font("΢ź", 9F); - this.btnPlan.Image = global::AIMS.UI.Properties.Resources.ͼ_ӡ; + this.btnPlan.Image = global::AIMSControls.Properties.Resources.ͼ_ӡ; this.btnPlan.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnPlan.Name = "btnPlan"; this.btnPlan.Size = new System.Drawing.Size(76, 46); @@ -2561,7 +2561,7 @@ namespace AIMS.OperationFront.UI // button3 // this.button3.Font = new System.Drawing.Font("΢ź", 9F); - this.button3.Image = global::AIMS.UI.Properties.Resources.ͼ_ӡ; + this.button3.Image = global::AIMSControls.Properties.Resources.ͼ_ӡ; this.button3.ImageTransparentColor = System.Drawing.Color.Magenta; this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(76, 46); @@ -2577,7 +2577,7 @@ namespace AIMS.OperationFront.UI // btnDataCente // this.btnDataCente.Font = new System.Drawing.Font("΢ź", 9F); - this.btnDataCente.Image = global::AIMS.UI.Properties.Resources.ͼ_ع˻ָ; + this.btnDataCente.Image = global::AIMSControls.Properties.Resources.ͼ_ع˻ָ; this.btnDataCente.ImageTransparentColor = System.Drawing.Color.Magenta; this.btnDataCente.Name = "btnDataCente"; this.btnDataCente.Size = new System.Drawing.Size(68, 46); @@ -2593,7 +2593,7 @@ namespace AIMS.OperationFront.UI // tspSetting // this.tspSetting.Font = new System.Drawing.Font("΢ź", 9F); - this.tspSetting.Image = global::AIMS.UI.Properties.Resources.ͼ_; + this.tspSetting.Image = global::AIMSControls.Properties.Resources.ͼ_; this.tspSetting.ImageTransparentColor = System.Drawing.Color.Magenta; this.tspSetting.Name = "tspSetting"; this.tspSetting.Size = new System.Drawing.Size(68, 46); diff --git a/AIMS.UI/OperationFront/frmStopOperation.Designer.cs b/AIMS.UI/OperationFront/frmStopOperation.Designer.cs index 984f551..8c88e8f 100644 --- a/AIMS.UI/OperationFront/frmStopOperation.Designer.cs +++ b/AIMS.UI/OperationFront/frmStopOperation.Designer.cs @@ -54,7 +54,7 @@ // tsbCancel // this.tsbCancel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCancel.Image = global::AIMS.UI.Properties.Resources.图标_申请作废; + this.tsbCancel.Image = global::AIMSControls.Properties.Resources.图标_申请作废; this.tsbCancel.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCancel.Name = "tsbCancel"; this.tsbCancel.Size = new System.Drawing.Size(68, 46); @@ -70,7 +70,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/OremrUserControl/ucDocument.Designer.cs b/AIMS.UI/OremrUserControl/ucDocument.Designer.cs index 7740dd9..c7bc45f 100644 --- a/AIMS.UI/OremrUserControl/ucDocument.Designer.cs +++ b/AIMS.UI/OremrUserControl/ucDocument.Designer.cs @@ -88,7 +88,7 @@ // tsbSave // this.tsbSave.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSave.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbSave.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbSave.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSave.Name = "tsbSave"; this.tsbSave.Size = new System.Drawing.Size(48, 46); @@ -104,7 +104,7 @@ // tsbSaveAndPrint // this.tsbSaveAndPrint.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSaveAndPrint.Image = global::AIMS.UI.Properties.Resources.图标_打印; + this.tsbSaveAndPrint.Image = global::AIMSControls.Properties.Resources.图标_打印; this.tsbSaveAndPrint.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSaveAndPrint.Name = "tsbSaveAndPrint"; this.tsbSaveAndPrint.Size = new System.Drawing.Size(88, 46); @@ -120,7 +120,7 @@ // tsbPreview // this.tsbPreview.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbPreview.Image = global::AIMS.UI.Properties.Resources.图标_预览; + this.tsbPreview.Image = global::AIMSControls.Properties.Resources.图标_预览; this.tsbPreview.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbPreview.Name = "tsbPreview"; this.tsbPreview.Size = new System.Drawing.Size(40, 46); @@ -136,7 +136,7 @@ // tsbCheckout // this.tsbCheckout.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCheckout.Image = global::AIMS.UI.Properties.Resources.图标_回顾手术; + this.tsbCheckout.Image = global::AIMSControls.Properties.Resources.图标_回顾手术; this.tsbCheckout.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCheckout.Name = "tsbCheckout"; this.tsbCheckout.Size = new System.Drawing.Size(64, 46); @@ -153,7 +153,7 @@ // this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.toolStripButton1.Image = global::AIMS.UI.Properties.Resources.图标_麻醉知情同意书; + this.toolStripButton1.Image = global::AIMSControls.Properties.Resources.图标_麻醉知情同意书; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(64, 46); @@ -165,7 +165,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/OremrUserControl/ucReport.Designer.cs b/AIMS.UI/OremrUserControl/ucReport.Designer.cs index ccff41d..1326eb2 100644 --- a/AIMS.UI/OremrUserControl/ucReport.Designer.cs +++ b/AIMS.UI/OremrUserControl/ucReport.Designer.cs @@ -47,7 +47,7 @@ // // picDocToPrint // - this.picDocToPrint.BackgroundImage = global::AIMS.UI.Properties.Resources.存为模板; + this.picDocToPrint.BackgroundImage = global::AIMSControls.Properties.Resources.存为模板; this.picDocToPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.picDocToPrint.Cursor = System.Windows.Forms.Cursors.Hand; this.picDocToPrint.Location = new System.Drawing.Point(28, 3); diff --git a/AIMS.UI/Properties/AssemblyInfo.cs b/AIMS.UI/Properties/AssemblyInfo.cs index d2a5d58..121a56e 100644 --- a/AIMS.UI/Properties/AssemblyInfo.cs +++ b/AIMS.UI/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("AIMS.UI")] +[assembly: AssemblyTitle("AIMSControls")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("AIMS.UI")] +[assembly: AssemblyProduct("AIMSControls")] [assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/AIMS.UI/Properties/Resources.Designer.cs b/AIMS.UI/Properties/Resources.Designer.cs index df0ae9f..55db225 100644 --- a/AIMS.UI/Properties/Resources.Designer.cs +++ b/AIMS.UI/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace AIMS.UI.Properties { +namespace AIMSControls.Properties { using System; @@ -39,7 +39,7 @@ namespace AIMS.UI.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AIMS.UI.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AIMSControls.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/AIMS.UI/Properties/Settings.Designer.cs b/AIMS.UI/Properties/Settings.Designer.cs index 73a276f..62bc74c 100644 --- a/AIMS.UI/Properties/Settings.Designer.cs +++ b/AIMS.UI/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ -namespace AIMS.UI.Properties -{ - - +namespace AIMSControls.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/AIMS.UI/PublicUI/MainFormManage.designer.cs b/AIMS.UI/PublicUI/MainFormManage.designer.cs index ed9583d..8da5b71 100644 --- a/AIMS.UI/PublicUI/MainFormManage.designer.cs +++ b/AIMS.UI/PublicUI/MainFormManage.designer.cs @@ -119,7 +119,7 @@ // this.colorThemeButton.AutoExpandOnClick = true; this.colorThemeButton.CanCustomize = false; - this.colorThemeButton.Image = global::AIMS.UI.Properties.Resources.ColorScheme; + this.colorThemeButton.Image = global::AIMSControls.Properties.Resources.ColorScheme; this.colorThemeButton.Name = "colorThemeButton"; this.colorThemeButton.ShowSubItems = false; this.colorThemeButton.Text = "皮肤"; diff --git a/AIMSExtension/OpeApplyAnalyze.cs b/AIMS.UI/PublicUI/OpeApplyAnalyze.cs similarity index 99% rename from AIMSExtension/OpeApplyAnalyze.cs rename to AIMS.UI/PublicUI/OpeApplyAnalyze.cs index acbe16c..2a56458 100644 --- a/AIMSExtension/OpeApplyAnalyze.cs +++ b/AIMS.UI/PublicUI/OpeApplyAnalyze.cs @@ -7,7 +7,7 @@ using System.IO; using System.Text; using System.Windows.Forms; -namespace AIMS +namespace AIMS.OperationAanesthesia { public class OpeApplyAnalyze { diff --git a/AIMS.UI/PublicUI/frmCreateTemplate.Designer.cs b/AIMS.UI/PublicUI/frmCreateTemplate.Designer.cs index 1433469..92f6f15 100644 --- a/AIMS.UI/PublicUI/frmCreateTemplate.Designer.cs +++ b/AIMS.UI/PublicUI/frmCreateTemplate.Designer.cs @@ -204,7 +204,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 43); @@ -220,7 +220,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 43); @@ -496,7 +496,7 @@ // dataGridViewImageColumn1 // this.dataGridViewImageColumn1.HeaderText = " "; - this.dataGridViewImageColumn1.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn1.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; @@ -1355,7 +1355,7 @@ // dataGridViewImageColumn5 // this.dataGridViewImageColumn5.HeaderText = " "; - this.dataGridViewImageColumn5.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn5.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn5.Name = "dataGridViewImageColumn5"; this.dataGridViewImageColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; diff --git a/AIMS.UI/PublicUI/frmDrugSel.Designer.cs b/AIMS.UI/PublicUI/frmDrugSel.Designer.cs index fd5865a..ee8c14e 100644 --- a/AIMS.UI/PublicUI/frmDrugSel.Designer.cs +++ b/AIMS.UI/PublicUI/frmDrugSel.Designer.cs @@ -224,7 +224,7 @@ // dataGridViewImageColumn1 // this.dataGridViewImageColumn1.HeaderText = " "; - this.dataGridViewImageColumn1.Image = global::AIMS.UI.Properties.Resources.SYSCRL; + this.dataGridViewImageColumn1.Image = global::AIMSControls.Properties.Resources.SYSCRL; this.dataGridViewImageColumn1.Name = "dataGridViewImageColumn1"; this.dataGridViewImageColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.dataGridViewImageColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Programmatic; diff --git a/AIMS.UI/PublicUI/frmEditPassWord.Designer.cs b/AIMS.UI/PublicUI/frmEditPassWord.Designer.cs index 457ae42..ff8947e 100644 --- a/AIMS.UI/PublicUI/frmEditPassWord.Designer.cs +++ b/AIMS.UI/PublicUI/frmEditPassWord.Designer.cs @@ -115,7 +115,7 @@ // tsbOk // this.tsbOk.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbOk.Image = global::AIMS.UI.Properties.Resources.图标_完成; + this.tsbOk.Image = global::AIMSControls.Properties.Resources.图标_完成; this.tsbOk.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbOk.Name = "tsbOk"; this.tsbOk.Size = new System.Drawing.Size(52, 46); @@ -132,7 +132,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 46); diff --git a/AIMS.UI/PublicUI/frmNotice.Designer.cs b/AIMS.UI/PublicUI/frmNotice.Designer.cs index 676625a..342efaa 100644 --- a/AIMS.UI/PublicUI/frmNotice.Designer.cs +++ b/AIMS.UI/PublicUI/frmNotice.Designer.cs @@ -238,7 +238,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 41); @@ -254,7 +254,7 @@ // tsbDelete // this.tsbDelete.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbDelete.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbDelete.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbDelete.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbDelete.Name = "tsbDelete"; this.tsbDelete.Size = new System.Drawing.Size(48, 41); @@ -270,7 +270,7 @@ // tsbSava // this.tsbSava.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbSava.Image = global::AIMS.UI.Properties.Resources.图标_保存; + this.tsbSava.Image = global::AIMSControls.Properties.Resources.图标_保存; this.tsbSava.ImageTransparentColor = System.Drawing.Color.Transparent; this.tsbSava.Name = "tsbSava"; this.tsbSava.Size = new System.Drawing.Size(52, 41); @@ -286,7 +286,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 41); diff --git a/AIMS.UI/PublicUI/frmNoticeMain.Designer.cs b/AIMS.UI/PublicUI/frmNoticeMain.Designer.cs index 5cac885..9359710 100644 --- a/AIMS.UI/PublicUI/frmNoticeMain.Designer.cs +++ b/AIMS.UI/PublicUI/frmNoticeMain.Designer.cs @@ -124,7 +124,7 @@ // tsbAdd // this.tsbAdd.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbAdd.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbAdd.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbAdd.Name = "tsbAdd"; this.tsbAdd.Size = new System.Drawing.Size(52, 41); @@ -140,7 +140,7 @@ // tsbDelete // this.tsbDelete.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbDelete.Image = global::AIMS.UI.Properties.Resources.图标_取消; + this.tsbDelete.Image = global::AIMSControls.Properties.Resources.图标_取消; this.tsbDelete.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbDelete.Name = "tsbDelete"; this.tsbDelete.Size = new System.Drawing.Size(48, 41); @@ -156,7 +156,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 41); diff --git a/AIMS.UI/PublicUI/frmTemplate.Designer.cs b/AIMS.UI/PublicUI/frmTemplate.Designer.cs index c8b9f06..1eb021a 100644 --- a/AIMS.UI/PublicUI/frmTemplate.Designer.cs +++ b/AIMS.UI/PublicUI/frmTemplate.Designer.cs @@ -161,7 +161,7 @@ // tsbExit // this.tsbExit.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbExit.Image = global::AIMS.UI.Properties.Resources.图标_关闭当前页; + this.tsbExit.Image = global::AIMSControls.Properties.Resources.图标_关闭当前页; this.tsbExit.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbExit.Name = "tsbExit"; this.tsbExit.Size = new System.Drawing.Size(52, 47); @@ -172,7 +172,7 @@ // tsbCreateTemplate // this.tsbCreateTemplate.Font = new System.Drawing.Font("微软雅黑", 9F); - this.tsbCreateTemplate.Image = global::AIMS.UI.Properties.Resources.图标_手术申请; + this.tsbCreateTemplate.Image = global::AIMSControls.Properties.Resources.图标_手术申请; this.tsbCreateTemplate.ImageTransparentColor = System.Drawing.Color.Magenta; this.tsbCreateTemplate.Name = "tsbCreateTemplate"; this.tsbCreateTemplate.Size = new System.Drawing.Size(72, 47); diff --git a/AIMS.sln b/AIMS.sln index 34ecdd4..457a692 100644 --- a/AIMS.sln +++ b/AIMS.sln @@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeginScreen", "BeginScreen\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentManagement", "DocumentManagement\DocumentManagement.csproj", "{80E69D05-8436-4342-B0B1-5ADAA8E83D41}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIMS.UI", "AIMS.UI\AIMS.UI.csproj", "{84D0ECA0-7A0B-4E7F-90F1-E86C99F9E0DA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIMSControls", "AIMS.UI\AIMSControls.csproj", "{84D0ECA0-7A0B-4E7F-90F1-E86C99F9E0DA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index 08f9cae..3207a8c 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -139,9 +139,9 @@ - + {84d0eca0-7a0b-4e7f-90f1-e86c99f9e0da} - AIMS.UI + AIMSControls {e7e04b19-8dac-41b1-b1aa-a9fea1d5d9fb} diff --git a/AIMSExtension/AIMSExtension.csproj b/AIMSExtension/AIMSExtension.csproj index 28d4820..c2b84d9 100644 --- a/AIMSExtension/AIMSExtension.csproj +++ b/AIMSExtension/AIMSExtension.csproj @@ -63,7 +63,6 @@ - diff --git a/DocumentManagement/UI/frmTemplate.cs b/DocumentManagement/UI/frmTemplate.cs index a447b43..94fb39e 100644 --- a/DocumentManagement/UI/frmTemplate.cs +++ b/DocumentManagement/UI/frmTemplate.cs @@ -293,7 +293,7 @@ namespace DocumentManagement // //((XTextCheckBoxElement)el).Resizeable = ResizeableType; // //MessageBox.Show(((XTextCheckBoxElement)el).WidthHeightRate.ToString()); //} - InitCodeCompiler(); + //InitCodeCompiler(); }