排除警告

This commit is contained in:
leomon 2023-08-03 12:55:03 +08:00
parent 87c4482341
commit f68917ae00
43 changed files with 1041 additions and 518 deletions

View File

@ -69,6 +69,9 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Net.Http">
<HintPath>Extensions\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
@ -1549,6 +1552,6 @@
<ItemGroup /> <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>rd /s /q zh-TW zh-cn en ar</PostBuildEvent> <PostBuildEvent>rd /s /q zh-TW zh-cn en</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<AtuoUpdate> <AtuoUpdate>
<ConnectionString>Data Source=.;Initial Catalog=AIMSDB_FJZPTFYY;User ID=sa;Password=Test2020;</ConnectionString> <ConnectionString>Data Source=.;Initial Catalog=AIMSDB_QHDSGRYY;User ID=sa;Password=Test2020;</ConnectionString>
<DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString> <DataConnectionString>Data Source=.;Initial Catalog=AIMSDB_DATA;User ID=sa;Password=Test2020;</DataConnectionString>
<HisConnectionStringOracel>Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;</HisConnectionStringOracel> <HisConnectionStringOracel>Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.10.7)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=orcl2))));Persist Security Info=True;User ID=smview;Password=i39;</HisConnectionStringOracel>
<LastLoginNo></LastLoginNo> <LastLoginNo></LastLoginNo>

View File

@ -1,4 +1,4 @@
attrib -h -s -r /s *.* attrib -h -s -r /s *.*
del /s *.~* *.pdb *.vshost.exe.manifest *.vshost.exe.config *.vshost.exe AutoUpdateTool.exe del /s *.~* *.pdb *.vshost.exe.manifest *.vshost.exe.config *.vshost.exe AutoUpdateTool.exe DevComponents.Instrumentation.xml
del %0 del %0
pause pause

View File

@ -164,14 +164,14 @@ namespace AIMS.PublicUI.UI
{ {
foreach (DataGridViewRow yRow in dgvY.Rows) foreach (DataGridViewRow yRow in dgvY.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString())
{ {
MessageBox.Show("已经选过了!"); MessageBox.Show("已经选过了!");
foreach (DataGridViewRow drow in dgvD.Rows) foreach (DataGridViewRow drow in dgvD.Rows)
{ {
if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
drow.Cells["Select"].Value = false; drow.Cells["Selectc"].Value = false;
} }
} }
return; return;
@ -181,7 +181,7 @@ namespace AIMS.PublicUI.UI
List<int> list = new List<int>(); List<int> list = new List<int>();
foreach (DataGridViewRow row in dgvD.Rows) foreach (DataGridViewRow row in dgvD.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
list.Add(Convert.ToInt32(row.Cells["Id"].Value)); list.Add(Convert.ToInt32(row.Cells["Id"].Value));
} }

View File

@ -53,7 +53,7 @@
this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
@ -301,7 +301,7 @@
this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id, this.Id,
this.Index, this.Index,
this.Select, this.Selectc,
this.oName}); this.oName});
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
@ -338,9 +338,9 @@
// //
// Select // Select
// //
this.Select.HeaderText = "选择"; this.Selectc.HeaderText = "选择";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.Width = 65; this.Selectc.Width = 65;
// //
// oName // oName
// //
@ -395,12 +395,11 @@
private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect; private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect;
private System.Windows.Forms.DataGridViewTextBoxColumn yId; private System.Windows.Forms.DataGridViewTextBoxColumn yId;
private System.Windows.Forms.DataGridViewTextBoxColumn yName; private System.Windows.Forms.DataGridViewTextBoxColumn yName;
private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol;
private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX2;
private DevComponents.DotNetBar.ButtonX buttonX1; private DevComponents.DotNetBar.ButtonX buttonX1;
private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn Index;
private System.Windows.Forms.DataGridViewCheckBoxColumn Select; private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc;
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
} }
} }

View File

@ -175,14 +175,14 @@ namespace AIMS.PublicUI.UI
{ {
foreach (DataGridViewRow yRow in dgvY.Rows) foreach (DataGridViewRow yRow in dgvY.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString() && row.Cells["ospec"].Value.ToString() == yRow.Cells["yspec"].Value.ToString()) if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString() && row.Cells["ospec"].Value.ToString() == yRow.Cells["yspec"].Value.ToString())
{ {
MessageBox.Show("已经选过了!"); MessageBox.Show("已经选过了!");
foreach (DataGridViewRow drow in dgvD.Rows) foreach (DataGridViewRow drow in dgvD.Rows)
{ {
if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
drow.Cells["Select"].Value = false; drow.Cells["Selectc"].Value = false;
} }
} }
return; return;
@ -192,7 +192,7 @@ namespace AIMS.PublicUI.UI
List<int> list = new List<int>(); List<int> list = new List<int>();
foreach (DataGridViewRow row in dgvD.Rows) foreach (DataGridViewRow row in dgvD.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
list.Add(Convert.ToInt32(row.Cells["Id"].Value)); list.Add(Convert.ToInt32(row.Cells["Id"].Value));
} }

View File

@ -57,7 +57,7 @@
this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ospec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ospec = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dDOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dDOSEPER = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -340,7 +340,7 @@
this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id, this.Id,
this.Index, this.Index,
this.Select, this.Selectc,
this.oName, this.oName,
this.ospec, this.ospec,
this.dDOSEPER, this.dDOSEPER,
@ -381,9 +381,9 @@
// //
// Select // Select
// //
this.Select.HeaderText = "选择"; this.Selectc.HeaderText = "选择";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.Width = 65; this.Selectc.Width = 65;
// //
// oName // oName
// //
@ -468,7 +468,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER3; private System.Windows.Forms.DataGridViewTextBoxColumn DOSEPER3;
private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn Index;
private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol;
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
private System.Windows.Forms.DataGridViewTextBoxColumn ospec; private System.Windows.Forms.DataGridViewTextBoxColumn ospec;
private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER; private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER;
@ -476,6 +475,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER3; private System.Windows.Forms.DataGridViewTextBoxColumn dDOSEPER3;
private DevComponents.DotNetBar.ButtonX buttonX3; private DevComponents.DotNetBar.ButtonX buttonX3;
private DevComponents.DotNetBar.ButtonX buttonX4; private DevComponents.DotNetBar.ButtonX buttonX4;
private System.Windows.Forms.DataGridViewCheckBoxColumn Select; private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc;
} }
} }

View File

@ -162,14 +162,14 @@ namespace AIMS.PublicUI.UI
{ {
foreach (DataGridViewRow yRow in dgvY.Rows) foreach (DataGridViewRow yRow in dgvY.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString())
{ {
MessageBox.Show("已经选过了!"); MessageBox.Show("已经选过了!");
foreach (DataGridViewRow drow in dgvD.Rows) foreach (DataGridViewRow drow in dgvD.Rows)
{ {
if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
drow.Cells["Select"].Value = false; drow.Cells["Selectc"].Value = false;
} }
} }
return; return;
@ -179,7 +179,7 @@ namespace AIMS.PublicUI.UI
List<int> list = new List<int>(); List<int> list = new List<int>();
foreach (DataGridViewRow row in dgvD.Rows) foreach (DataGridViewRow row in dgvD.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
list.Add(Convert.ToInt32(row.Cells["Id"].Value)); list.Add(Convert.ToInt32(row.Cells["Id"].Value));
} }

View File

@ -53,7 +53,7 @@
this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
@ -301,7 +301,7 @@
this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id, this.Id,
this.Index, this.Index,
this.Select, this.Selectc,
this.oName}); this.oName});
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
@ -338,9 +338,9 @@
// //
// Select // Select
// //
this.Select.HeaderText = "选择"; this.Selectc.HeaderText = "选择";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.Width = 65; this.Selectc.Width = 65;
// //
// oName // oName
// //
@ -397,10 +397,9 @@
private System.Windows.Forms.DataGridViewTextBoxColumn yName; private System.Windows.Forms.DataGridViewTextBoxColumn yName;
private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn Index;
private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol;
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
private DevComponents.DotNetBar.ButtonX buttonX2; private DevComponents.DotNetBar.ButtonX buttonX2;
private DevComponents.DotNetBar.ButtonX buttonX1; private DevComponents.DotNetBar.ButtonX buttonX1;
private System.Windows.Forms.DataGridViewCheckBoxColumn Select; private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc;
} }
} }

View File

@ -198,14 +198,14 @@ namespace AIMS.PublicUI.UI
{ {
foreach (DataGridViewRow yRow in dgvY.Rows) foreach (DataGridViewRow yRow in dgvY.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString()) if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True" && row.Cells["oName"].Value.ToString() == yRow.Cells["yName"].Value.ToString())
{ {
MessageBox.Show("已经选过了!"); MessageBox.Show("已经选过了!");
foreach (DataGridViewRow drow in dgvD.Rows) foreach (DataGridViewRow drow in dgvD.Rows)
{ {
if (drow.Cells["Select"].EditedFormattedValue.ToString() == "True") if (drow.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
drow.Cells["Select"].Value = false; drow.Cells["Selectc"].Value = false;
} }
} }
return; return;
@ -215,7 +215,7 @@ namespace AIMS.PublicUI.UI
List<int> list = new List<int>(); List<int> list = new List<int>();
foreach (DataGridViewRow row in dgvD.Rows) foreach (DataGridViewRow row in dgvD.Rows)
{ {
if (row.Cells["Select"].EditedFormattedValue.ToString() == "True") if (row.Cells["Selectc"].EditedFormattedValue.ToString() == "True")
{ {
list.Add(Convert.ToInt32(row.Cells["Id"].Value)); list.Add(Convert.ToInt32(row.Cells["Id"].Value));
} }

View File

@ -57,7 +57,7 @@
this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -364,7 +364,7 @@
this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id, this.Id,
this.Index, this.Index,
this.Select, this.Selectc,
this.oName}); this.oName});
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
@ -401,9 +401,9 @@
// //
// Select // Select
// //
this.Select.HeaderText = "选择"; this.Selectc.HeaderText = "选择";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.Width = 65; this.Selectc.Width = 65;
// //
// oName // oName
// //
@ -501,7 +501,6 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn Index;
private System.Windows.Forms.DataGridViewCheckBoxColumn Selectcol;
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect; private System.Windows.Forms.DataGridViewCheckBoxColumn ySelect;
private System.Windows.Forms.DataGridViewTextBoxColumn yId; private System.Windows.Forms.DataGridViewTextBoxColumn yId;
@ -516,6 +515,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
private DevComponents.DotNetBar.ButtonX buttonX1; private DevComponents.DotNetBar.ButtonX buttonX1;
private System.Windows.Forms.DataGridViewCheckBoxColumn Select; private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc;
} }
} }

View File

@ -54,7 +54,7 @@
this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.dgvD = new DevComponents.DotNetBar.Controls.DataGridViewX();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Index = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Selectc = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.oCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.oxmbm = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oxmbm = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -309,7 +309,7 @@
this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvD.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Id, this.Id,
this.Index, this.Index,
this.Select, this.Selectc,
this.oName, this.oName,
this.oCode, this.oCode,
this.oxmbm, this.oxmbm,
@ -349,10 +349,10 @@
// //
// Select // Select
// //
this.Select.HeaderText = "选择"; this.Selectc.HeaderText = "选择";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.Visible = false; this.Selectc.Visible = false;
this.Select.Width = 65; this.Selectc.Width = 65;
// //
// oName // oName
// //
@ -521,7 +521,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
private System.Windows.Forms.DataGridViewTextBoxColumn Id; private System.Windows.Forms.DataGridViewTextBoxColumn Id;
private System.Windows.Forms.DataGridViewTextBoxColumn Index; private System.Windows.Forms.DataGridViewTextBoxColumn Index;
private System.Windows.Forms.DataGridViewCheckBoxColumn Select; private System.Windows.Forms.DataGridViewCheckBoxColumn Selectc;
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
private System.Windows.Forms.DataGridViewTextBoxColumn oCode; private System.Windows.Forms.DataGridViewTextBoxColumn oCode;
private System.Windows.Forms.DataGridViewTextBoxColumn oxmbm; private System.Windows.Forms.DataGridViewTextBoxColumn oxmbm;

View File

@ -37,7 +37,7 @@ namespace AIMS.PublicUI.UI
toolStripSeparator4.Visible = true; toolStripSeparator4.Visible = true;
panel1.Visible = true; panel1.Visible = true;
dgvApplianceUseType.Columns["IsValid"].Visible = true; dgvApplianceUseType.Columns["IsValid"].Visible = true;
dgvApplianceUseType.Columns["Select"].Visible = true; dgvApplianceUseType.Columns["SelectC"].Visible = true;
} }
ControlExtension.EnabledControl(panel1, false); ControlExtension.EnabledControl(panel1, false);

View File

@ -54,7 +54,7 @@
this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.oName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.HCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.IsValid = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Select = new System.Windows.Forms.DataGridViewButtonColumn(); this.Selectc = new System.Windows.Forms.DataGridViewButtonColumn();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@ -252,7 +252,7 @@
this.oName, this.oName,
this.HCode, this.HCode,
this.IsValid, this.IsValid,
this.Select}); this.Selectc});
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@ -332,13 +332,13 @@
// //
// Select // Select
// //
this.Select.HeaderText = "项目维护"; this.Selectc.HeaderText = "项目维护";
this.Select.Name = "Select"; this.Selectc.Name = "Select";
this.Select.ReadOnly = true; this.Selectc.ReadOnly = true;
this.Select.Text = "项目维护"; this.Selectc.Text = "项目维护";
this.Select.UseColumnTextForButtonValue = true; this.Selectc.UseColumnTextForButtonValue = true;
this.Select.Visible = false; this.Selectc.Visible = false;
this.Select.Width = 150; this.Selectc.Width = 150;
// //
// dataGridViewTextBoxColumn1 // dataGridViewTextBoxColumn1
// //
@ -433,6 +433,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn oName; private System.Windows.Forms.DataGridViewTextBoxColumn oName;
private System.Windows.Forms.DataGridViewTextBoxColumn HCode; private System.Windows.Forms.DataGridViewTextBoxColumn HCode;
private System.Windows.Forms.DataGridViewTextBoxColumn IsValid; private System.Windows.Forms.DataGridViewTextBoxColumn IsValid;
private System.Windows.Forms.DataGridViewButtonColumn Select; private System.Windows.Forms.DataGridViewButtonColumn Selectc;
} }
} }

View File

@ -30,6 +30,22 @@
{ {
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.dgvPerson = new System.Windows.Forms.DataGridView(); this.dgvPerson = new System.Windows.Forms.DataGridView();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DepNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.NoColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.HelpCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SexColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DiplomaColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.JobTitleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BirthDayColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.TimeToWorkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PersonTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RoleNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PassWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PersonOrderColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SignatureStr = new System.Windows.Forms.DataGridViewImageColumn();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.cboDepartment = new System.Windows.Forms.ComboBox(); this.cboDepartment = new System.Windows.Forms.ComboBox();
@ -73,22 +89,6 @@
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tsbExit = new System.Windows.Forms.ToolStripButton(); this.tsbExit = new System.Windows.Forms.ToolStripButton();
this.chkAllShow = new System.Windows.Forms.CheckBox(); this.chkAllShow = new System.Windows.Forms.CheckBox();
this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DepNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.NoColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.NameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.HelpCodeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SexColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.DiplomaColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.JobTitleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.BirthDayColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.TimeToWorkColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PersonTypeColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.RoleNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PassWordColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.IsValidColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.PersonOrderColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.SignatureStr = new System.Windows.Forms.DataGridViewImageColumn();
this.panel2.SuspendLayout(); this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvPerson)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvPerson)).BeginInit();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
@ -139,6 +139,126 @@
this.dgvPerson.Size = new System.Drawing.Size(1016, 338); this.dgvPerson.Size = new System.Drawing.Size(1016, 338);
this.dgvPerson.TabIndex = 2; this.dgvPerson.TabIndex = 2;
// //
// Id
//
this.Id.DataPropertyName = "Id";
this.Id.Frozen = true;
this.Id.HeaderText = "Id";
this.Id.Name = "Id";
this.Id.ReadOnly = true;
this.Id.Visible = false;
//
// DepNameColumn
//
this.DepNameColumn.DataPropertyName = "DepName";
this.DepNameColumn.HeaderText = "所在科室";
this.DepNameColumn.Name = "DepNameColumn";
this.DepNameColumn.ReadOnly = true;
//
// NoColumn
//
this.NoColumn.DataPropertyName = "No";
this.NoColumn.HeaderText = "工号";
this.NoColumn.Name = "NoColumn";
this.NoColumn.ReadOnly = true;
this.NoColumn.Width = 80;
//
// NameColumn
//
this.NameColumn.DataPropertyName = "Name";
this.NameColumn.HeaderText = "名称";
this.NameColumn.Name = "NameColumn";
this.NameColumn.ReadOnly = true;
//
// HelpCodeColumn
//
this.HelpCodeColumn.DataPropertyName = "HelpCode";
this.HelpCodeColumn.HeaderText = "助记码";
this.HelpCodeColumn.Name = "HelpCodeColumn";
this.HelpCodeColumn.ReadOnly = true;
this.HelpCodeColumn.Width = 80;
//
// SexColumn
//
this.SexColumn.DataPropertyName = "Sex";
this.SexColumn.HeaderText = "性别";
this.SexColumn.Name = "SexColumn";
this.SexColumn.ReadOnly = true;
this.SexColumn.Width = 60;
//
// DiplomaColumn
//
this.DiplomaColumn.DataPropertyName = "Diploma";
this.DiplomaColumn.HeaderText = "His编码";
this.DiplomaColumn.Name = "DiplomaColumn";
this.DiplomaColumn.ReadOnly = true;
this.DiplomaColumn.Width = 80;
//
// JobTitleColumn
//
this.JobTitleColumn.DataPropertyName = "JobTitle";
this.JobTitleColumn.HeaderText = "职称";
this.JobTitleColumn.Name = "JobTitleColumn";
this.JobTitleColumn.ReadOnly = true;
this.JobTitleColumn.Width = 80;
//
// BirthDayColumn
//
this.BirthDayColumn.DataPropertyName = "BirthDay";
this.BirthDayColumn.HeaderText = "出生日期";
this.BirthDayColumn.Name = "BirthDayColumn";
this.BirthDayColumn.ReadOnly = true;
//
// TimeToWorkColumn
//
this.TimeToWorkColumn.DataPropertyName = "TimeToWork";
this.TimeToWorkColumn.HeaderText = "参加工作日期";
this.TimeToWorkColumn.Name = "TimeToWorkColumn";
this.TimeToWorkColumn.ReadOnly = true;
//
// PersonTypeColumn
//
this.PersonTypeColumn.DataPropertyName = "PersonType";
this.PersonTypeColumn.HeaderText = "类型";
this.PersonTypeColumn.Name = "PersonTypeColumn";
this.PersonTypeColumn.ReadOnly = true;
//
// RoleNameColumn
//
this.RoleNameColumn.DataPropertyName = "RoleName";
this.RoleNameColumn.HeaderText = "角色";
this.RoleNameColumn.Name = "RoleNameColumn";
this.RoleNameColumn.ReadOnly = true;
//
// PassWordColumn
//
this.PassWordColumn.DataPropertyName = "PassWord";
this.PassWordColumn.HeaderText = "密码";
this.PassWordColumn.Name = "PassWordColumn";
this.PassWordColumn.ReadOnly = true;
this.PassWordColumn.Visible = false;
//
// IsValidColumn
//
this.IsValidColumn.DataPropertyName = "IsValid";
this.IsValidColumn.HeaderText = "有效性";
this.IsValidColumn.Name = "IsValidColumn";
this.IsValidColumn.ReadOnly = true;
this.IsValidColumn.Width = 75;
//
// PersonOrderColumn
//
this.PersonOrderColumn.DataPropertyName = "PersonOrder";
this.PersonOrderColumn.HeaderText = "排序";
this.PersonOrderColumn.Name = "PersonOrderColumn";
this.PersonOrderColumn.ReadOnly = true;
this.PersonOrderColumn.Width = 60;
//
// SignatureStr
//
this.SignatureStr.HeaderText = "签名";
this.SignatureStr.Name = "SignatureStr";
//
// panel1 // panel1
// //
this.panel1.Controls.Add(this.pictureBox1); this.panel1.Controls.Add(this.pictureBox1);
@ -276,7 +396,7 @@
// //
this.txtSignatureIndex.Location = new System.Drawing.Point(934, 9); this.txtSignatureIndex.Location = new System.Drawing.Point(934, 9);
this.txtSignatureIndex.Name = "txtSignatureIndex"; this.txtSignatureIndex.Name = "txtSignatureIndex";
this.txtSignatureIndex.Size = new System.Drawing.Size(76, 23); this.txtSignatureIndex.Size = new System.Drawing.Size(118, 23);
this.txtSignatureIndex.TabIndex = 568; this.txtSignatureIndex.TabIndex = 568;
// //
// label15 // label15
@ -659,126 +779,6 @@
this.chkAllShow.UseVisualStyleBackColor = true; this.chkAllShow.UseVisualStyleBackColor = true;
this.chkAllShow.CheckedChanged += new System.EventHandler(this.chkAllShow_CheckedChanged); this.chkAllShow.CheckedChanged += new System.EventHandler(this.chkAllShow_CheckedChanged);
// //
// Id
//
this.Id.DataPropertyName = "Id";
this.Id.Frozen = true;
this.Id.HeaderText = "Id";
this.Id.Name = "Id";
this.Id.ReadOnly = true;
this.Id.Visible = false;
//
// DepNameColumn
//
this.DepNameColumn.DataPropertyName = "DepName";
this.DepNameColumn.HeaderText = "所在科室";
this.DepNameColumn.Name = "DepNameColumn";
this.DepNameColumn.ReadOnly = true;
//
// NoColumn
//
this.NoColumn.DataPropertyName = "No";
this.NoColumn.HeaderText = "工号";
this.NoColumn.Name = "NoColumn";
this.NoColumn.ReadOnly = true;
this.NoColumn.Width = 80;
//
// NameColumn
//
this.NameColumn.DataPropertyName = "Name";
this.NameColumn.HeaderText = "名称";
this.NameColumn.Name = "NameColumn";
this.NameColumn.ReadOnly = true;
//
// HelpCodeColumn
//
this.HelpCodeColumn.DataPropertyName = "HelpCode";
this.HelpCodeColumn.HeaderText = "助记码";
this.HelpCodeColumn.Name = "HelpCodeColumn";
this.HelpCodeColumn.ReadOnly = true;
this.HelpCodeColumn.Width = 80;
//
// SexColumn
//
this.SexColumn.DataPropertyName = "Sex";
this.SexColumn.HeaderText = "性别";
this.SexColumn.Name = "SexColumn";
this.SexColumn.ReadOnly = true;
this.SexColumn.Width = 60;
//
// DiplomaColumn
//
this.DiplomaColumn.DataPropertyName = "Diploma";
this.DiplomaColumn.HeaderText = "His编码";
this.DiplomaColumn.Name = "DiplomaColumn";
this.DiplomaColumn.ReadOnly = true;
this.DiplomaColumn.Width = 80;
//
// JobTitleColumn
//
this.JobTitleColumn.DataPropertyName = "JobTitle";
this.JobTitleColumn.HeaderText = "职称";
this.JobTitleColumn.Name = "JobTitleColumn";
this.JobTitleColumn.ReadOnly = true;
this.JobTitleColumn.Width = 80;
//
// BirthDayColumn
//
this.BirthDayColumn.DataPropertyName = "BirthDay";
this.BirthDayColumn.HeaderText = "出生日期";
this.BirthDayColumn.Name = "BirthDayColumn";
this.BirthDayColumn.ReadOnly = true;
//
// TimeToWorkColumn
//
this.TimeToWorkColumn.DataPropertyName = "TimeToWork";
this.TimeToWorkColumn.HeaderText = "参加工作日期";
this.TimeToWorkColumn.Name = "TimeToWorkColumn";
this.TimeToWorkColumn.ReadOnly = true;
//
// PersonTypeColumn
//
this.PersonTypeColumn.DataPropertyName = "PersonType";
this.PersonTypeColumn.HeaderText = "类型";
this.PersonTypeColumn.Name = "PersonTypeColumn";
this.PersonTypeColumn.ReadOnly = true;
//
// RoleNameColumn
//
this.RoleNameColumn.DataPropertyName = "RoleName";
this.RoleNameColumn.HeaderText = "角色";
this.RoleNameColumn.Name = "RoleNameColumn";
this.RoleNameColumn.ReadOnly = true;
//
// PassWordColumn
//
this.PassWordColumn.DataPropertyName = "PassWord";
this.PassWordColumn.HeaderText = "密码";
this.PassWordColumn.Name = "PassWordColumn";
this.PassWordColumn.ReadOnly = true;
this.PassWordColumn.Visible = false;
//
// IsValidColumn
//
this.IsValidColumn.DataPropertyName = "IsValid";
this.IsValidColumn.HeaderText = "有效性";
this.IsValidColumn.Name = "IsValidColumn";
this.IsValidColumn.ReadOnly = true;
this.IsValidColumn.Width = 75;
//
// PersonOrderColumn
//
this.PersonOrderColumn.DataPropertyName = "PersonOrder";
this.PersonOrderColumn.HeaderText = "排序";
this.PersonOrderColumn.Name = "PersonOrderColumn";
this.PersonOrderColumn.ReadOnly = true;
this.PersonOrderColumn.Width = 60;
//
// SignatureStr
//
this.SignatureStr.HeaderText = "签名";
this.SignatureStr.Name = "SignatureStr";
//
// frmPerson // frmPerson
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

Binary file not shown.

Binary file not shown.

View File

@ -74,16 +74,9 @@
this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); this.superTabMain = new DevComponents.DotNetBar.SuperTabControl();
this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel();
this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx();
this.panel8 = new AIMS.PublicUI.UI.DrawPanel();
this.paneltop = new System.Windows.Forms.Panel();
this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress();
this.zgcAnaesRecord = new DrawGraph.ZedGraphControl();
this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem();
this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel();
this.panelExBLSJ = new DevComponents.DotNetBar.PanelEx(); this.panelExBLSJ = new DevComponents.DotNetBar.PanelEx();
this.panel82 = new AIMS.PublicUI.UI.DrawPanel();
this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress();
this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl();
this.spTabBM = new DevComponents.DotNetBar.SuperTabItem(); this.spTabBM = new DevComponents.DotNetBar.SuperTabItem();
this.panel7 = new System.Windows.Forms.Panel(); this.panel7 = new System.Windows.Forms.Panel();
this.panel21 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel();
@ -135,6 +128,13 @@
this.txtInRoom1 = new System.Windows.Forms.Button(); this.txtInRoom1 = new System.Windows.Forms.Button();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.panel8 = new AIMS.PublicUI.UI.DrawPanel();
this.paneltop = new System.Windows.Forms.Panel();
this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress();
this.zgcAnaesRecord = new DrawGraph.ZedGraphControl();
this.panel82 = new AIMS.PublicUI.UI.DrawPanel();
this.circularProgress2 = new DevComponents.DotNetBar.Controls.CircularProgress();
this.zgcAnaesRecord2 = new DrawGraph.ZedGraphControl();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.panel14.SuspendLayout(); this.panel14.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
@ -144,10 +144,8 @@
this.superTabMain.SuspendLayout(); this.superTabMain.SuspendLayout();
this.superTabControlPanel1.SuspendLayout(); this.superTabControlPanel1.SuspendLayout();
this.panelExZKZB.SuspendLayout(); this.panelExZKZB.SuspendLayout();
this.panel8.SuspendLayout();
this.superTabControlPanel2.SuspendLayout(); this.superTabControlPanel2.SuspendLayout();
this.panelExBLSJ.SuspendLayout(); this.panelExBLSJ.SuspendLayout();
this.panel82.SuspendLayout();
this.panel7.SuspendLayout(); this.panel7.SuspendLayout();
this.panel21.SuspendLayout(); this.panel21.SuspendLayout();
this.plTitleEventTime.SuspendLayout(); this.plTitleEventTime.SuspendLayout();
@ -175,6 +173,8 @@
this.panel6.SuspendLayout(); this.panel6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit();
this.panel8.SuspendLayout();
this.panel82.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// panel2 // panel2
@ -200,7 +200,7 @@
// //
// panel14 // panel14
// //
this.panel14.BackColor = System.Drawing.Color.White; this.panel14.BackColor = System.Drawing.Color.AliceBlue;
this.panel14.Controls.Add(this.button10); this.panel14.Controls.Add(this.button10);
this.panel14.Controls.Add(this.button8); this.panel14.Controls.Add(this.button8);
this.panel14.Controls.Add(this.button7); this.panel14.Controls.Add(this.button7);
@ -483,7 +483,7 @@
// //
// panel4 // panel4
// //
this.panel4.BackColor = System.Drawing.Color.White; this.panel4.BackColor = System.Drawing.Color.AliceBlue;
this.panel4.Controls.Add(this.btnChage); this.panel4.Controls.Add(this.btnChage);
this.panel4.Controls.Add(this.btnsjzx); this.panel4.Controls.Add(this.btnsjzx);
this.panel4.Controls.Add(this.btnyldj); this.panel4.Controls.Add(this.btnyldj);
@ -919,69 +919,6 @@
this.panelExZKZB.Style.GradientAngle = 90; this.panelExZKZB.Style.GradientAngle = 90;
this.panelExZKZB.TabIndex = 0; this.panelExZKZB.TabIndex = 0;
// //
// panel8
//
this.panel8.AutoScroll = true;
this.panel8.BackColor = System.Drawing.Color.White;
this.panel8.Controls.Add(this.paneltop);
this.panel8.Controls.Add(this.circularProgress1);
this.panel8.Controls.Add(this.zgcAnaesRecord);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1389, 803);
this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
//
// paneltop
//
this.paneltop.Location = new System.Drawing.Point(9, 137);
this.paneltop.Name = "paneltop";
this.paneltop.Size = new System.Drawing.Size(690, 30);
this.paneltop.TabIndex = 7;
this.paneltop.Visible = false;
//
// circularProgress1
//
this.circularProgress1.AnimationSpeed = 50;
//
//
//
this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.circularProgress1.FocusCuesEnabled = false;
this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.circularProgress1.Location = new System.Drawing.Point(602, 274);
this.circularProgress1.Margin = new System.Windows.Forms.Padding(4);
this.circularProgress1.Name = "circularProgress1";
this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue;
this.circularProgress1.Size = new System.Drawing.Size(389, 239);
this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.circularProgress1.TabIndex = 6;
this.circularProgress1.Value = 100;
//
// zgcAnaesRecord
//
this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41);
this.zgcAnaesRecord.Name = "zgcAnaesRecord";
this.zgcAnaesRecord.ScrollGrace = 0D;
this.zgcAnaesRecord.ScrollMaxX = 0D;
this.zgcAnaesRecord.ScrollMaxY = 0D;
this.zgcAnaesRecord.ScrollMaxY2 = 0D;
this.zgcAnaesRecord.ScrollMinX = 0D;
this.zgcAnaesRecord.ScrollMinY = 0D;
this.zgcAnaesRecord.ScrollMinY2 = 0D;
this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000);
this.zgcAnaesRecord.TabIndex = 0;
this.zgcAnaesRecord.Visible = false;
this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder);
this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent);
this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent);
this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent);
this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp);
this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick);
//
// spTabQXQDD // spTabQXQDD
// //
this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; this.spTabQXQDD.AttachedControl = this.superTabControlPanel1;
@ -1018,60 +955,6 @@
this.panelExBLSJ.Style.GradientAngle = 90; this.panelExBLSJ.Style.GradientAngle = 90;
this.panelExBLSJ.TabIndex = 0; this.panelExBLSJ.TabIndex = 0;
// //
// panel82
//
this.panel82.AutoScroll = true;
this.panel82.BackColor = System.Drawing.Color.White;
this.panel82.Controls.Add(this.circularProgress2);
this.panel82.Controls.Add(this.zgcAnaesRecord2);
this.panel82.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel82.Location = new System.Drawing.Point(0, 0);
this.panel82.Name = "panel82";
this.panel82.Size = new System.Drawing.Size(1389, 803);
this.panel82.TabIndex = 3;
this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll);
//
// circularProgress2
//
this.circularProgress2.AnimationSpeed = 50;
//
//
//
this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.circularProgress2.FocusCuesEnabled = false;
this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.circularProgress2.Location = new System.Drawing.Point(678, 354);
this.circularProgress2.Margin = new System.Windows.Forms.Padding(4);
this.circularProgress2.Name = "circularProgress2";
this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue;
this.circularProgress2.Size = new System.Drawing.Size(389, 239);
this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.circularProgress2.TabIndex = 6;
this.circularProgress2.Value = 100;
//
// zgcAnaesRecord2
//
this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41);
this.zgcAnaesRecord2.Name = "zgcAnaesRecord2";
this.zgcAnaesRecord2.ScrollGrace = 0D;
this.zgcAnaesRecord2.ScrollMaxX = 0D;
this.zgcAnaesRecord2.ScrollMaxY = 0D;
this.zgcAnaesRecord2.ScrollMaxY2 = 0D;
this.zgcAnaesRecord2.ScrollMinX = 0D;
this.zgcAnaesRecord2.ScrollMinY = 0D;
this.zgcAnaesRecord2.ScrollMinY2 = 0D;
this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000);
this.zgcAnaesRecord2.TabIndex = 0;
this.zgcAnaesRecord2.Visible = false;
this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder);
this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent);
this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent);
this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent);
this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp);
this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick);
//
// spTabBM // spTabBM
// //
this.spTabBM.AttachedControl = this.superTabControlPanel2; this.spTabBM.AttachedControl = this.superTabControlPanel2;
@ -1263,7 +1146,7 @@
// //
// plTitleEventTime // plTitleEventTime
// //
this.plTitleEventTime.BackColor = System.Drawing.Color.White; this.plTitleEventTime.BackColor = System.Drawing.Color.AliceBlue;
this.plTitleEventTime.Controls.Add(this.panel13); this.plTitleEventTime.Controls.Add(this.panel13);
this.plTitleEventTime.Controls.Add(this.panel10); this.plTitleEventTime.Controls.Add(this.panel10);
this.plTitleEventTime.Controls.Add(this.panel16); this.plTitleEventTime.Controls.Add(this.panel16);
@ -2023,6 +1906,123 @@
this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71);
this.flowLayoutPanel1.TabIndex = 0; this.flowLayoutPanel1.TabIndex = 0;
// //
// panel8
//
this.panel8.AutoScroll = true;
this.panel8.BackColor = System.Drawing.Color.White;
this.panel8.Controls.Add(this.paneltop);
this.panel8.Controls.Add(this.circularProgress1);
this.panel8.Controls.Add(this.zgcAnaesRecord);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1389, 803);
this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
//
// paneltop
//
this.paneltop.Location = new System.Drawing.Point(9, 137);
this.paneltop.Name = "paneltop";
this.paneltop.Size = new System.Drawing.Size(690, 30);
this.paneltop.TabIndex = 7;
this.paneltop.Visible = false;
//
// circularProgress1
//
this.circularProgress1.AnimationSpeed = 50;
//
//
//
this.circularProgress1.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
this.circularProgress1.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
this.circularProgress1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.circularProgress1.FocusCuesEnabled = false;
this.circularProgress1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.circularProgress1.Location = new System.Drawing.Point(602, 274);
this.circularProgress1.Margin = new System.Windows.Forms.Padding(4);
this.circularProgress1.Name = "circularProgress1";
this.circularProgress1.ProgressColor = System.Drawing.Color.DodgerBlue;
this.circularProgress1.Size = new System.Drawing.Size(389, 239);
this.circularProgress1.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.circularProgress1.TabIndex = 6;
this.circularProgress1.Value = 100;
//
// zgcAnaesRecord
//
this.zgcAnaesRecord.Location = new System.Drawing.Point(416, 41);
this.zgcAnaesRecord.Name = "zgcAnaesRecord";
this.zgcAnaesRecord.ScrollGrace = 0D;
this.zgcAnaesRecord.ScrollMaxX = 0D;
this.zgcAnaesRecord.ScrollMaxY = 0D;
this.zgcAnaesRecord.ScrollMaxY2 = 0D;
this.zgcAnaesRecord.ScrollMinX = 0D;
this.zgcAnaesRecord.ScrollMinY = 0D;
this.zgcAnaesRecord.ScrollMinY2 = 0D;
this.zgcAnaesRecord.Size = new System.Drawing.Size(800, 1000);
this.zgcAnaesRecord.TabIndex = 0;
this.zgcAnaesRecord.Visible = false;
this.zgcAnaesRecord.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord_ContextMenuBuilder);
this.zgcAnaesRecord.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseDownEvent);
this.zgcAnaesRecord.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseUpEvent);
this.zgcAnaesRecord.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord_MouseMoveEvent);
this.zgcAnaesRecord.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord_KeyUp);
this.zgcAnaesRecord.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord_MouseDoubleClick);
//
// panel82
//
this.panel82.AutoScroll = true;
this.panel82.BackColor = System.Drawing.Color.White;
this.panel82.Controls.Add(this.circularProgress2);
this.panel82.Controls.Add(this.zgcAnaesRecord2);
this.panel82.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel82.Location = new System.Drawing.Point(0, 0);
this.panel82.Name = "panel82";
this.panel82.Size = new System.Drawing.Size(1389, 803);
this.panel82.TabIndex = 3;
this.panel82.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel82_Scroll);
//
// circularProgress2
//
this.circularProgress2.AnimationSpeed = 50;
//
//
//
this.circularProgress2.BackgroundStyle.BackgroundImageAlpha = ((byte)(0));
this.circularProgress2.BackgroundStyle.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Zoom;
this.circularProgress2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.circularProgress2.FocusCuesEnabled = false;
this.circularProgress2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.circularProgress2.Location = new System.Drawing.Point(678, 354);
this.circularProgress2.Margin = new System.Windows.Forms.Padding(4);
this.circularProgress2.Name = "circularProgress2";
this.circularProgress2.ProgressColor = System.Drawing.Color.DodgerBlue;
this.circularProgress2.Size = new System.Drawing.Size(389, 239);
this.circularProgress2.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
this.circularProgress2.TabIndex = 6;
this.circularProgress2.Value = 100;
//
// zgcAnaesRecord2
//
this.zgcAnaesRecord2.Location = new System.Drawing.Point(416, 41);
this.zgcAnaesRecord2.Name = "zgcAnaesRecord2";
this.zgcAnaesRecord2.ScrollGrace = 0D;
this.zgcAnaesRecord2.ScrollMaxX = 0D;
this.zgcAnaesRecord2.ScrollMaxY = 0D;
this.zgcAnaesRecord2.ScrollMaxY2 = 0D;
this.zgcAnaesRecord2.ScrollMinX = 0D;
this.zgcAnaesRecord2.ScrollMinY = 0D;
this.zgcAnaesRecord2.ScrollMinY2 = 0D;
this.zgcAnaesRecord2.Size = new System.Drawing.Size(800, 1000);
this.zgcAnaesRecord2.TabIndex = 0;
this.zgcAnaesRecord2.Visible = false;
this.zgcAnaesRecord2.ContextMenuBuilder += new DrawGraph.ZedGraphControl.ContextMenuBuilderEventHandler(this.zgcAnaesRecord2_ContextMenuBuilder);
this.zgcAnaesRecord2.MouseDownEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseDownEvent);
this.zgcAnaesRecord2.MouseUpEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseUpEvent);
this.zgcAnaesRecord2.MouseMoveEvent += new DrawGraph.ZedGraphControl.ZedMouseEventHandler(this.zgcAnaesRecord2_MouseMoveEvent);
this.zgcAnaesRecord2.KeyUp += new System.Windows.Forms.KeyEventHandler(this.zgcAnaesRecord2_KeyUp);
this.zgcAnaesRecord2.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.zgcAnaesRecord2_MouseDoubleClick);
//
// frmAanesthesiaRecord // frmAanesthesiaRecord
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@ -2045,10 +2045,8 @@
this.superTabMain.ResumeLayout(false); this.superTabMain.ResumeLayout(false);
this.superTabControlPanel1.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false);
this.panelExZKZB.ResumeLayout(false); this.panelExZKZB.ResumeLayout(false);
this.panel8.ResumeLayout(false);
this.superTabControlPanel2.ResumeLayout(false); this.superTabControlPanel2.ResumeLayout(false);
this.panelExBLSJ.ResumeLayout(false); this.panelExBLSJ.ResumeLayout(false);
this.panel82.ResumeLayout(false);
this.panel7.ResumeLayout(false); this.panel7.ResumeLayout(false);
this.panel7.PerformLayout(); this.panel7.PerformLayout();
this.panel21.ResumeLayout(false); this.panel21.ResumeLayout(false);
@ -2077,6 +2075,8 @@
this.panel6.ResumeLayout(false); this.panel6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit();
this.panel8.ResumeLayout(false);
this.panel82.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
} }

View File

@ -277,7 +277,7 @@ namespace AIMS.PublicUI.UI
{ {
Velocity = Convert.ToDecimal(item.Velocity); Velocity = Convert.ToDecimal(item.Velocity);
} }
catch (Exception ex) catch (Exception)
{ {
Velocity = 0; Velocity = 0;
} }

View File

@ -2291,6 +2291,15 @@ namespace AIMS.OperationAanesthesia
btnOperationInfo_Click(null, null); btnOperationInfo_Click(null, null);
return; return;
} }
if (_record.StateName == "手术中")
{
if (txtOutRoom.CustomFormat == " ")
{
txtOutRoom.BackColor = Color.Red;
MessageBox.Show("手术还没有结束,请填写出室时间后打印!", "系统提示");
return;
}
}
if (superTabMain.SelectedTab.Name == "spTabQXQDD") if (superTabMain.SelectedTab.Name == "spTabQXQDD")
{ {

View File

@ -1326,7 +1326,7 @@ namespace AIMS.OperationAanesthesia
#region #region
int i1 = 0, j1 = 0; int i1 = 0, j1 = 0;
int i2 = 0, j2 = 0; //int i2 = 0, j2 = 0;
int Incount = 0; int Incount = 0;
int IncRowsount = 25; int IncRowsount = 25;
/// <summary> /// <summary>

View File

@ -16,7 +16,7 @@ namespace AIMS.OperationAanesthesia
{ {
public OperatingRoomPutDoorRegister opr; public OperatingRoomPutDoorRegister opr;
private string patientModel; private string patientModel;
private OrisPatient p; //private OrisPatient p;
List<Department> execdepartments; List<Department> execdepartments;
public frmOperatingRoomRegister() public frmOperatingRoomRegister()
{ {
@ -95,8 +95,8 @@ namespace AIMS.OperationAanesthesia
//if (p.BirthDay != null) txtAge.Text = PublicMethod.GetAge(p.BirthDay.Value); //if (p.BirthDay != null) txtAge.Text = PublicMethod.GetAge(p.BirthDay.Value);
//hisPatientId = p.HISPatientId; //hisPatientId = p.HISPatientId;
//hisVisitId = p.VisitId.ToString(); //hisVisitId = p.VisitId.ToString();
if (p.Height != null) txtHeight.Text = row["PATIENT_HEIGHT"].ToString(); txtHeight.Text = row["PATIENT_HEIGHT"].ToString();
if (p.Weight != null) txtWeight.Text = row["PATIENT_WEIGHT"].ToString(); txtWeight.Text = row["PATIENT_WEIGHT"].ToString();
//if (p.InHospitalTime != null) dtpInHospitalTime.Value = p.InHospitalTime.Value; //if (p.InHospitalTime != null) dtpInHospitalTime.Value = p.InHospitalTime.Value;
//if (p.BirthDay != null) dtpBirthDay.Value = p.BirthDay.Value; //if (p.BirthDay != null) dtpBirthDay.Value = p.BirthDay.Value;
@ -551,7 +551,7 @@ namespace AIMS.OperationAanesthesia
opr.AnaesthesiaEndTime = txtAnaesthesiaEndTime.Text != "" ? DateTime.Parse(txtAnaesthesiaEndTime.Text) : (DateTime?)null; opr.AnaesthesiaEndTime = txtAnaesthesiaEndTime.Text != "" ? DateTime.Parse(txtAnaesthesiaEndTime.Text) : (DateTime?)null;
opr.AnaesthesiaMethod = GetCheckBoxCheckedValues(panel5); opr.AnaesthesiaMethod = GetCheckBoxCheckedValues(panel5);
opr.ASALevel = cboASALevel.Text; opr.ASALevel = cboASALevel.Text;
opr.BirthDay = p != null ? p.BirthDay : (DateTime?)null; //opr.BirthDay = p != null ? p.BirthDay : (DateTime?)null;
opr.Complication = txtComplication.Text; opr.Complication = txtComplication.Text;
opr.Contacts = txtContacts.Text; opr.Contacts = txtContacts.Text;
opr.ContactsTel = txtContactsTel.Text; opr.ContactsTel = txtContactsTel.Text;
@ -560,7 +560,7 @@ namespace AIMS.OperationAanesthesia
opr.ExecDeptName = "手术室"; opr.ExecDeptName = "手术室";
opr.ExecDeptNo = "手术室"; opr.ExecDeptNo = "手术室";
opr.Height = txtHeight.Text != "" ? decimal.Parse(txtHeight.Text) : (decimal?)null; opr.Height = txtHeight.Text != "" ? decimal.Parse(txtHeight.Text) : (decimal?)null;
opr.HISPatientId = p != null ? p.HisPatientId : ""; //opr.HISPatientId = p != null ? p.HisPatientId : "";
opr.IdEntityNo = txtIdEntityNo.Text; opr.IdEntityNo = txtIdEntityNo.Text;
opr.InHospitalNo = txtInHospitalNo.Text; opr.InHospitalNo = txtInHospitalNo.Text;
opr.InstrumentNurseName = txtInstrumentNurse.Text; opr.InstrumentNurseName = txtInstrumentNurse.Text;
@ -588,14 +588,14 @@ namespace AIMS.OperationAanesthesia
opr.PatientBedNo = lblBed.Text; opr.PatientBedNo = lblBed.Text;
opr.PatientDeptName = cboPDepartment.Text; opr.PatientDeptName = cboPDepartment.Text;
//opr.PatientDeptNo = cboPDepartment.Text != "" ? cboPDepartment.SelectedValue.ToString() : ""; //opr.PatientDeptNo = cboPDepartment.Text != "" ? cboPDepartment.SelectedValue.ToString() : "";
opr.PatientId = p != null ? p.Id.ToString() : ""; //opr.PatientId = p != null ? p.Id.ToString() : "";
opr.PatientModel = GetCheckBoxCheckedValue(panel6); opr.PatientModel = GetCheckBoxCheckedValue(panel6);
opr.Sex = RbMan.Checked == true ? "男" : "女"; opr.Sex = RbMan.Checked == true ? "男" : "女";
opr.State = 0; opr.State = 0;
opr.Tel = txtContactsTel.Text; opr.Tel = txtContactsTel.Text;
opr.TourNurseName = txtTourNurse.Text; opr.TourNurseName = txtTourNurse.Text;
opr.TourNurseNo = txtTourNurse.Text != "" ? txtTourNurse.Tag.ToString() : ""; opr.TourNurseNo = txtTourNurse.Text != "" ? txtTourNurse.Tag.ToString() : "";
opr.VisitId = p != null ? p.VisitTimes.ToString() : ""; //opr.VisitId = p != null ? p.VisitTimes.ToString() : "";
opr.Weight = txtWeight.Text != "" ? decimal.Parse(txtWeight.Text) : (decimal?)null; opr.Weight = txtWeight.Text != "" ? decimal.Parse(txtWeight.Text) : (decimal?)null;
} }
private string GetDugsIds() private string GetDugsIds()

View File

@ -34,8 +34,8 @@ namespace AIMS.OperationAanesthesia
//容器tab //容器tab
//public TabItem Tb; //public TabItem Tb;
//文档事件 //文档事件
private EventCodeCompilerBill codeCompiler; //private EventCodeCompilerBill codeCompiler;
private string strClick, strContentChanged; //private string strClick, strContentChanged;
public frmPrescriptionDocument() public frmPrescriptionDocument()
@ -324,8 +324,8 @@ namespace AIMS.OperationAanesthesia
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.LoadXml(xmlStatic); doc.LoadXml(xmlStatic);
strClick = doc.GetElementsByTagName("ClickEvent")[0].InnerText; //strClick = doc.GetElementsByTagName("ClickEvent")[0].InnerText;
strContentChanged = doc.GetElementsByTagName("ContentChangedEnvent")[0].InnerText; //strContentChanged = doc.GetElementsByTagName("ContentChangedEnvent")[0].InnerText;
} }
//codeCompiler = new EventCodeCompilerBill(ref this.myEditControl, strClick, strContentChanged, QXList); //codeCompiler = new EventCodeCompilerBill(ref this.myEditControl, strClick, strContentChanged, QXList);

View File

@ -124,7 +124,7 @@ namespace AIMS.OperationAfter.UI
} }
catch (Exception ex) catch (Exception ex)
{ {
throw; throw ex;
} }
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
Close(); Close();

View File

@ -9,6 +9,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
@ -100,10 +101,23 @@ namespace AIMS.OperationAfter.UI
ControlExtension.GetOperationSite(labelSite, CboOperationSite); ControlExtension.GetOperationSite(labelSite, CboOperationSite);
btnFind_Click(null, null); LoadDataRescue();
} }
private System.Windows.Forms.Timer timerLoadRescue;
public void LoadDataRescue()
{
timerLoadRescue = new System.Windows.Forms.Timer();
timerLoadRescue.Enabled = true;//调试时设置为FALSE
timerLoadRescue.Interval = 300;
timerLoadRescue.Tick -= timerLoadRescue_Tick;
timerLoadRescue.Tick += timerLoadRescue_Tick;
timerLoadRescue.Start();
}
private void timerLoadRescue_Tick(object sender, EventArgs e)
{
btnFind_Click(null, null);
}
/// <summary> /// <summary>
/// 绑定基础表项目数据 到 ComboBox /// 绑定基础表项目数据 到 ComboBox
/// </summary> /// </summary>
@ -249,13 +263,25 @@ namespace AIMS.OperationAfter.UI
} }
dgv.DataSource = dataTable; dgv.DataSource = dataTable;
//for (int i = 0; i < dgv.Rows.Count; i++) List<string> list = new List<string>() { "麻醉复苏中", "手术结束", "麻醉复苏结束" };
//{ List<string> list2 = new List<string>() { "退回", "作废" };
// if (dgv.Rows[i].Cells["OperationTypeColumn"].Value.ToString() == "急诊")
// { for (int i = 0; i < dgv.Rows.Count; i++)
// dgv.Rows[i].DefaultCellStyle.BackColor = Color.LightSalmon; {
// } if (dgv.Rows[i].Cells["StateColumn"].Value.ToString() == "手术中")
//} {
dgv.Rows[i].DefaultCellStyle.BackColor = Color.LemonChiffon;
}
else if (list.Contains(dgv.Rows[i].Cells["StateColumn"].Value.ToString()))
{
dgv.Rows[i].DefaultCellStyle.BackColor = Color.LightGreen;
}
else if (list2.Contains(dgv.Rows[i].Cells["StateColumn"].Value.ToString()))
{
dgv.Rows[i].DefaultCellStyle.BackColor = Color.Red;
}
}
dgv.ClearSelection();
} }
private void tsbExportExcel_Click(object sender, EventArgs e) private void tsbExportExcel_Click(object sender, EventArgs e)

View File

@ -33,6 +33,7 @@ namespace AIMS.PublicUI.UI
private void frmCreateTemplate_Load(object sender, EventArgs e) private void frmCreateTemplate_Load(object sender, EventArgs e)
{ {
Initial();
if (IsAdd == true) if (IsAdd == true)
{ {
txtOperatorName.Text = PublicMethod.OperatorName; txtOperatorName.Text = PublicMethod.OperatorName;
@ -47,7 +48,6 @@ namespace AIMS.PublicUI.UI
if (_record.FactDrugList.Count > 0) if (_record.FactDrugList.Count > 0)
{ {
cboDrug.Checked = true; cboDrug.Checked = true;
Initial();
SetDGVEvent(dgvDrugsSQ); SetDGVEvent(dgvDrugsSQ);
_record.FactDrugList.Sort(new FactDrugComparer()); _record.FactDrugList.Sort(new FactDrugComparer());
FullDrugsData(_record.FactDrugList); FullDrugsData(_record.FactDrugList);
@ -786,7 +786,7 @@ namespace AIMS.PublicUI.UI
} }
if (dr["Spare3"].ToString() != "" && dr["Spare3"].ToString() != "0" && dr["Spare3"].ToString() != "0.00") if (dr["Spare3"].ToString() != "" && dr["Spare3"].ToString() != "0" && dr["Spare3"].ToString() != "0.00")
{ {
FactDrugObj.Velocity = dr["Spare3"].ToString() ; FactDrugObj.Velocity = dr["Spare3"].ToString();
FactDrugObj.VelocityUnit = dr["Spare4"].ToString(); FactDrugObj.VelocityUnit = dr["Spare4"].ToString();
} }
@ -832,7 +832,7 @@ namespace AIMS.PublicUI.UI
} }
if (child["Spare3"].ToString() != "" && child["Spare3"].ToString() != "0" && child["Spare3"].ToString() != "0.00") if (child["Spare3"].ToString() != "" && child["Spare3"].ToString() != "0" && child["Spare3"].ToString() != "0.00")
{ {
FactDrugObjChild.Velocity = child["Spare3"].ToString( ); FactDrugObjChild.Velocity = child["Spare3"].ToString();
FactDrugObjChild.VelocityUnit = child["Spare4"].ToString(); FactDrugObjChild.VelocityUnit = child["Spare4"].ToString();
} }
@ -1050,7 +1050,7 @@ namespace AIMS.PublicUI.UI
drugsR.DensityUnit = dr.Cells[7].EditedFormattedValue.ToString();//浓度单位 drugsR.DensityUnit = dr.Cells[7].EditedFormattedValue.ToString();//浓度单位
if (dr.Cells[8].EditedFormattedValue.ToString() != "") if (dr.Cells[8].EditedFormattedValue.ToString() != "")
{ {
drugsR.Velocity = dr.Cells[8].EditedFormattedValue.ToString( );//速度 drugsR.Velocity = dr.Cells[8].EditedFormattedValue.ToString();//速度
} }
else else
{ {

View File

@ -37,7 +37,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\AIMS\DLL\Newtonsoft.Json.dll</HintPath> <HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

View File

@ -34,6 +34,10 @@
<Reference Include="Mono.Security"> <Reference Include="Mono.Security">
<HintPath>..\AIMS\Extensions\Mono.Security.dll</HintPath> <HintPath>..\AIMS\Extensions\Mono.Security.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Npgsql, Version=2.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL"> <Reference Include="Npgsql, Version=2.2.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\AIMS\Extensions\Npgsql.dll</HintPath> <HintPath>..\AIMS\Extensions\Npgsql.dll</HintPath>
@ -44,6 +48,9 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http">
<HintPath>..\AIMS\Extensions\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Printing" /> <Reference Include="System.Printing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -56,6 +63,7 @@
<Compile Include="BrowserHelper.cs" /> <Compile Include="BrowserHelper.cs" />
<Compile Include="ChineseCalendar.cs" /> <Compile Include="ChineseCalendar.cs" />
<Compile Include="DATADBHelper.cs" /> <Compile Include="DATADBHelper.cs" />
<Compile Include="Sign\DataSignClient.cs" />
<Compile Include="DbAccessException.cs" /> <Compile Include="DbAccessException.cs" />
<Compile Include="DBHelper.cs" /> <Compile Include="DBHelper.cs" />
<Compile Include="DbHelperSQL.cs" /> <Compile Include="DbHelperSQL.cs" />
@ -83,6 +91,9 @@
</Compile> </Compile>
<Compile Include="PublicMethod.cs" /> <Compile Include="PublicMethod.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Sign\SignatureRequest.cs" />
<Compile Include="Sign\SignManage.cs" />
<Compile Include="Sign\SignConfig.cs" />
<Compile Include="TableAttribute.cs" /> <Compile Include="TableAttribute.cs" />
<Compile Include="TableStructure.cs" /> <Compile Include="TableStructure.cs" />
<Compile Include="XmlUse.cs" /> <Compile Include="XmlUse.cs" />

View File

@ -0,0 +1,202 @@
#if STJ
#else
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
#endif
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Security.Cryptography;
using System.Text;
//using System.Text.Json;
using System.Threading.Tasks;
namespace AIMS.Infrastructure.CA
{
public class DataSignClient
{
private static HttpClient _httpClient;
private readonly string _baseUrl;
private readonly string _accessToken;
private readonly string _signature;
private readonly string _timestamp;
private readonly SignConfig signConfig;
public DataSignClient(SignConfig signConfig)
{
_baseUrl = signConfig.Url.TrimEnd('/');
this.signConfig = signConfig;
if (_httpClient == null)
{
_httpClient = new HttpClient();
_httpClient.BaseAddress = new Uri(signConfig.Url.TrimEnd('/'));
}
}
public DataSignClient(HttpClient httpClient, string accessToken, string signature, string timestamp)
{
_httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
_accessToken = accessToken ?? throw new ArgumentNullException(nameof(accessToken));
_signature = signature ?? throw new ArgumentNullException(nameof(signature));
_timestamp = timestamp ?? throw new ArgumentNullException(nameof(timestamp));
}
// 封装业务数据签名的API
public SignatureResponse SignData(SignatureRequest request)
{
var requestUrl = $"/binary/sign/ZPTFYY";
var httpResponse = BusinessDataSign(requestUrl, request.Data, request.Signatory, request.DataType, request.SigAlgType);
return httpResponse;
}
private SignatureResponse BusinessDataSign(string signUrl,
byte[] fileStream, Signatory signatory,
string dataType = null, string sigAlgType = null, string fileName = null)
{
if (signUrl == null) throw new ArgumentNullException(nameof(signUrl));
if (fileStream == null) throw new ArgumentNullException(nameof(fileStream));
if (signatory == null) throw new ArgumentNullException(nameof(signatory));
var request = new HttpRequestMessage(HttpMethod.Post, signUrl);
Sign(request);
var multiPartContent = new MultipartFormDataContent();
var fileContent = new ByteArrayContent(fileStream);
fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
multiPartContent.Add(fileContent, "data", fileName ?? "filename"); // replace "filename" with actual filename
var signatoryContent = new StringContent(Serialize(signatory));
multiPartContent.Add(signatoryContent, "signatory");
multiPartContent.Add(new StringContent(dataType), "dataType");
multiPartContent.Add(new StringContent(sigAlgType), "sigAlgType");
request.Content = multiPartContent;
//File.WriteAllText("log.http", request.());
var response = _httpClient.SendAsync(request);
//response.EnsureSuccessStatusCode();
var responseContent = response.Result.Content.ReadAsStringAsync().Result;
Console.Out.WriteLine(responseContent);
request.Dispose();
response.Dispose();
return Deserialize<SignatureResponse>(responseContent);
}
// 封装获取数据签名详细信息的API
public DetailResponse GetSignDetail(DetailRequest request)
{
var requestUrl = $"{_baseUrl}/binary/detail/ZPTFYY?id={request.Id}&bizId={request.BizId}";
var httpResponse = GetDetail(requestUrl);
return httpResponse;
}
// 封装下载数据签名原文的API
public Stream DownloadOriginalData(DownloadRequest request)
{
var requestUrl = $"{_baseUrl}/binary/download?id={request.Id}&bizId={request.BizId}";
var httpResponse = DownloadFile(requestUrl);
return httpResponse;
}
// 封装下载存证报告的API
public Stream DownloadEvidence(EvidenceDownloadRequest request)
{
var requestUrl = $"{_baseUrl}/evidence/download?contractId={request.ContractId}&bizId={request.BizId}";
var httpResponse = DownloadFile(requestUrl);
return httpResponse;
}
private DetailResponse GetDetail(string detailUrl)
{
if (detailUrl == null) throw new ArgumentNullException(nameof(detailUrl));
var request = new HttpRequestMessage(HttpMethod.Get, detailUrl);
Sign(request);
var response = _httpClient.SendAsync(request).Result;
response.EnsureSuccessStatusCode();
var responseContent = response.Content.ReadAsStringAsync().Result;
request.Dispose();
response.Dispose();
return Deserialize<DetailResponse>(responseContent);
}
private Stream DownloadFile(string downloadUrl)
{
if (downloadUrl == null) throw new ArgumentNullException(nameof(downloadUrl));
var request = new HttpRequestMessage(HttpMethod.Get, downloadUrl);
Sign(request);
var response = _httpClient.SendAsync(request).Result;
response.EnsureSuccessStatusCode();
request.Dispose();
response.Dispose();
return response.Content.ReadAsStreamAsync().Result;
}
// Add other API methods like GetDetail, Download, DownloadEvidence here
public void Sign(HttpRequestMessage request)
{
var timestamp = GenerateTimestamp();
var nonce = GenerateNonce();
var signature = GenerateSignature(timestamp, nonce);
request.Headers.TryAddWithoutValidation("x-qys-accesstoken", signConfig.AppToken);
request.Headers.TryAddWithoutValidation("x-qys-timestamp", timestamp);
request.Headers.TryAddWithoutValidation("x-qys-nonce", nonce);
request.Headers.TryAddWithoutValidation("x-qys-signature", signature);
}
#region sign
private string GenerateNonce()
{
return Guid.NewGuid().ToString("n");
}
private string GenerateTimestamp()
{
long currentMilliseconds = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds;
return currentMilliseconds.ToString();
}
static MD5 md5 = MD5.Create();
private string GenerateSignature(string timestamp, string nonce)
{
var raw = signConfig.AppToken + signConfig.AppSecret + timestamp + nonce;
var bytes = md5.ComputeHash(Encoding.UTF8.GetBytes(raw));
return BitConverter.ToString(bytes).Replace("-", "").ToLower();
}
#endregion
#if STJ
private static System.Text.Json.JsonSerializerOptions JsonSerializerOptions = new System.Text.Json.JsonSerializerOptions(JsonSerializerDefaults.Web);
public static string Serialize<T>(T obj)
{
return System.Text.Json.JsonSerializer.Serialize(obj, JsonSerializerOptions);
}
public static T Deserialize<T>(string jsonText)
{
return System.Text.Json.JsonSerializer.Deserialize<T>(jsonText, JsonSerializerOptions);
}
#else
private static JsonSerializerSettings JsonSerializerOptions = new JsonSerializerSettings()
{
ContractResolver = new DefaultContractResolver
{
NamingStrategy = new CamelCaseNamingStrategy()
}
};
public static string Serialize<T>(T obj)
{
return JsonConvert.SerializeObject(obj, JsonSerializerOptions);
}
public static T Deserialize<T>(string jsonText)
{
return JsonConvert.DeserializeObject<T>(jsonText, JsonSerializerOptions);
}
#endif
}
}

View File

@ -0,0 +1,10 @@
namespace AIMS.Infrastructure.CA
{
public class SignConfig
{
public string Url { get; set; }
public string AppToken { get; set; }
public string AppSecret { get; set; }
}
}

View File

@ -0,0 +1,59 @@
using System.Text;
using AIMSExtension;
using HelperDB;
namespace AIMS.Infrastructure.CA
{
public class SignManage
{
public string GetSignStr(string docstr, string FileName, string Pid, string PName, string PContact)
{
string SignatureStr = "";
if (PublicMethod.HospitalName == "漳浦天福医院")
{
var sdk = new DataSignClient(new SignConfig
{
Url = @"http://10.129.131.105:9182",
AppSecret = "2Sl8ZoyYlBfQZcdHTXDnAHdGOrj0wt",
AppToken = "p12zxfQvns"
});
SignatureResponse signature = sdk.SignData(new SignatureRequest
{
SigAlgType = "SM2",
DataType = "txt",
Data = Encoding.UTF8.GetBytes(docstr),
FileName = FileName,
Signatory = new Signatory
{
Company = new Company { Name = "漳浦天福医院" },
Operator = new Operator { Name = PName, Contact = PContact },
TenantType = nameof(TenantType.PERSONAL),
}
});
if (signature != null && signature.Result != null && signature.Result.SealImgBase64 != null)
{
SignatureStr = signature.Result.SealImgBase64.Replace("data:image/png;base64,", "");
//更新人员图片
UpdateSignatureStr(Pid, SignatureStr);
}
}
return SignatureStr;
}
public void UpdateSignatureStr(string Id, string SignatureStr)
{
try
{
string sql = "update Person set SignatureStr='" + SignatureStr + "' where id=" + Id;
DBHelper.ExecNonQuery(sql);
}
catch (System.Exception ex)
{
PublicMethod.WriteLog(ex);
}
}
}
}

View File

@ -0,0 +1,120 @@
using System;
using System.IO;
namespace AIMS.Infrastructure.CA
{
// 封装数据签名请求
public class SignatureRequest
{
public byte[] Data { get; set; } // 数据文件
public string DataType { get; set; } // 文件类型
public Signatory Signatory { get; set; } // 签署方信息
public string SigAlgType { get; set; } // 签署算法 RSA SM2
public string FileName { get; set; }
}
public class Signatory
{
public string BizId { get; set; } // 业务Id
public string TenantType { get; set; } // 数据签名签署方类型PERSONAL个人、COMPANY企业
public Seal Seal { get; set; } // 印章信息
public Company Company { get; set; } // 公司信息
public Operator Operator { get; set; } // 签署人信息
}
public enum TenantType
{
PERSONAL, // 个人
COMPANY // 企业
}
public class Seal
{
public long Id { get; set; } // 印章ID
public string Name { get; set; } // 印章名称
}
public class Company
{
public long Id { get; set; } // 公司ID
public string Name { get; set; } // 公司名称
}
public class Operator
{
public string Name { get; set; } // 签署人姓名
public string Contact { get; set; } // 签署人联系方式
}
// 封装数据签名响应
public class SignatureResponse
{
public int Code { get; set; } // 响应码
public CustomDataSignResponse Result { get; set; } // 无校验签署结果
public string Message { get; set; } // 响应消息
}
public class CustomDataSignResponse
{
public long Id { get; set; } // id
public string BusinessId { get; set; } // 业务id
public string SealImgBase64 { get; set; } // 签名图片base64
public string TimestampImgBase64 { get; set; } // 时间戳图片base64
public string Result { get; set; } // 签名结果
}
// 封装获取数据签名详细信息请求
public class DetailRequest
{
public string BizId { get; set; } // 业务Id
public long? Id { get; set; } // 数据签名Id
}
// 封装获取数据签名详细信息响应
public class DetailResponse
{
public int Code { get; set; } // 响应码
public string Message { get; set; } // 响应信息
public DataSignBean Result { get; set; } // 数据签章信息
}
public class DataSignBean
{
public long Id { get; set; } // 数据签名ID
public Seal Seal { get; set; } // 印章信息
public Company Company { get; set; } // 公司信息
public Operator Operator { get; set; } // 签署人信息
public VerifyResult VerifyResult { get; set; } // 签名结果
public string SealImgBase64 { get; set; } // 签名图片base64
public string TimestampImgBase64 { get; set; } // 时间戳图片base64
}
public class VerifyResult
{
public string SignResult { get; set; } // 签名后数据
public string StrAlgName { get; set; } // 签名所用算法
public string SerialNumber { get; set; } // 签名证书编号
public string Organization { get; set; } // 证书颁发机构
public string Signatory { get; set; } // 签署方信息
public string CertDateFrom { get; set; } // 证书有效期开始
public string CertDateTo { get; set; } // 证书有效期结束
public string SignDate { get; set; } // 签署时间
}
// 封装下载数据签名原文请求
public class DownloadRequest
{
public string BizId { get; set; } // 业务Id
public long Id { get; set; } // 数据签名Id
}
// 封装下载存证报告请求
public class EvidenceDownloadRequest
{
public long ContractId { get; set; } // 合同id
public string BizId { get; set; } // 业务Id
}
}

View File

@ -374,6 +374,68 @@ namespace DocumentManagement
&& (x as XTextInputFieldElement).ID == "field14").FirstOrDefault(); && (x as XTextInputFieldElement).ID == "field14").FirstOrDefault();
patientId.Text = (num > 0 ? num.ToString() : ""); patientId.Text = (num > 0 ? num.ToString() : "");
} }
else if (XmlFileName == "压疮风险评估表")
{
int num = 0;
var asa = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "麻醉方式与手术体位" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (asa != null)
{
num += int.Parse(asa.FormulaValue);
var field6 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field6").FirstOrDefault();
field6.Text = asa.FormulaValue;
}
var hf = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "体型(BMI)" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (hf != null)
{
num += int.Parse(hf.FormulaValue);
var field7 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field7").FirstOrDefault();
field7.Text = hf.FormulaValue;
}
var age = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "年龄" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (age != null)
{
num += int.Parse(age.FormulaValue);
var field8 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field8").FirstOrDefault();
field8.Text = age.FormulaValue;
}
var pf = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "皮肤" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (pf != null)
{
num += int.Parse(pf.FormulaValue);
var field8 = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field9").FirstOrDefault();
field8.Text = pf.FormulaValue;
}
var sssj = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "预计手术时间" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (sssj != null)
{
num += int.Parse(sssj.FormulaValue);
var field = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field10").FirstOrDefault();
field.Text = sssj.FormulaValue;
}
var gwjb = Document.RadioBoxes.ToArray().Where(x => x is XTextRadioBoxElement
&& (x as XTextRadioBoxElement).GroupName == "手术施压" && (x as XTextRadioBoxElement).Checked == true).FirstOrDefault();
if (gwjb != null)
{
num += int.Parse(gwjb.FormulaValue);
var field = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field11").FirstOrDefault();
field.Text = gwjb.FormulaValue;
}
var patientId = Document.Fields.ToArray().Where(x => x is XTextInputFieldElement
&& (x as XTextInputFieldElement).ID == "field12").FirstOrDefault();
patientId.Text = (num > 0 ? num.ToString() : "");
}
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@ -1,13 +1,19 @@
using DCSoft.Writer; using AIMS.Infrastructure.CA;
using AIMSExtension;
using DCSoft.Writer;
using DCSoft.Writer.Controls; using DCSoft.Writer.Controls;
using DCSoft.Writer.Dom; using DCSoft.Writer.Dom;
using DocumentManagement.UI; using DocumentManagement.UI;
using HelperDB; using HelperDB;
using System; using System;
using System.CodeDom.Compiler; using System.CodeDom.Compiler;
using System.Data;
using System.Drawing; using System.Drawing;
using System.IO;
using System.Linq; using System.Linq;
using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Xml.Linq;
namespace DocumentManagement namespace DocumentManagement
{ {
@ -44,7 +50,7 @@ namespace DocumentManagement
var element = (eventSender as XTextDocument).CurrentInputField; var element = (eventSender as XTextDocument).CurrentInputField;
if (element != null) if (element != null)
{ {
element.Text = element.Text.Replace("\r", "").Replace("\n",""); element.Text = element.Text.Replace("\r", "").Replace("\n", "");
} }
} }
} }
@ -148,19 +154,33 @@ namespace DocumentManagement
else else
{ {
frmSelectPersonDoc personDoc = new frmSelectPersonDoc(); frmSelectPersonDoc personDoc = new frmSelectPersonDoc();
personDoc.PersonType = (eventSender as XTextImageElement).Alt == "" ? "麻醉医生" : (eventSender as XTextImageElement).Alt; personDoc.PersonType = (eventSender as XTextImageElement).Alt == null ? "麻醉医生" : (eventSender as XTextImageElement).Alt;
personDoc.ShowDialog(); personDoc.ShowDialog();
if (personDoc.SelectPersonData > 0) if (personDoc.SelectPersonData > 0)
{ {
int PersonId = personDoc.SelectPersonData; int PersonId = personDoc.SelectPersonData;
string SignatureStr = GetSignatureStr(PersonId); DataTable Person = GetPerson(PersonId);
if (Person != null && Person.Rows.Count > 0)
{
string Id = Person.Rows[0][3].ToString();
string Name = Person.Rows[0][0].ToString();
string Contact = Person.Rows[0][1].ToString();
string SignatureStr = Person.Rows[0][2].ToString();
if (SignatureStr == null || SignatureStr == "")
SignatureStr = new SignManage().GetSignStr(args.WriterControl.SaveDocumentToString("txt"), args.WriterControl.Document.FileName,Id, Name, Contact);
if (SignatureStr != null && SignatureStr != "")
{
DCSoft.Drawing.XImageValue img = new DCSoft.Drawing.XImageValue(); DCSoft.Drawing.XImageValue img = new DCSoft.Drawing.XImageValue();
img.ImageDataBase64String = SignatureStr; img.ImageDataBase64String = SignatureStr;
(eventSender as XTextImageElement).Image = img; (eventSender as XTextImageElement).Image = img;
(eventSender as XTextImageElement).Alt = "麻醉医生"; //(eventSender as XTextImageElement).Alt = "麻醉医生";
(eventSender as XTextImageElement).Title = PersonId.ToString(); (eventSender as XTextImageElement).Title = PersonId.ToString();
(eventSender as XTextImageElement).EditorRefreshView(); (eventSender as XTextImageElement).EditorRefreshView();
} }
}
else else
{ {
//清空图片 //清空图片
@ -169,6 +189,7 @@ namespace DocumentManagement
(eventSender as XTextImageElement).Title = ""; (eventSender as XTextImageElement).Title = "";
(eventSender as XTextImageElement).EditorRefreshView(); (eventSender as XTextImageElement).EditorRefreshView();
} }
}
//属性赋值判断 //属性赋值判断
// (eventSender as XTextImageElement).Image.Value==null 判断是否有图片 是否签名 // (eventSender as XTextImageElement).Image.Value==null 判断是否有图片 是否签名
@ -179,12 +200,12 @@ namespace DocumentManagement
} }
eet.MouseDblClick += Eet_MouseDblClick; eet.MouseDblClick += Eet_MouseDblClick;
} }
public string GetSignatureStr(int SelectPersonData) public DataTable GetPerson(int SelectPersonData)
{ {
string SignatureStr = ""; DataTable Person = new DataTable();
string sql = "select SignatureStr from Person where id=" + SelectPersonData; string sql = "select Name,SignatureIndex,SignatureStr,id from Person where id=" + SelectPersonData;
SignatureStr = DBHelper.ExecuteScalar(sql).ToString(); Person = DBHelper.GetDataTable(sql);
return SignatureStr; return Person;
} }
} }
} }

View File

@ -47,9 +47,16 @@
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
<HintPath>..\AIMS\Extensions\Microsoft.Office.Interop.Excel.dll</HintPath> <HintPath>..\AIMS\Extensions\Microsoft.Office.Interop.Excel.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Net.Http">
<HintPath>..\AIMS\Extensions\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
@ -120,7 +127,6 @@
<Compile Include="GoldPrinter\Title.cs" /> <Compile Include="GoldPrinter\Title.cs" />
<Compile Include="GoldPrinter\Top.cs" /> <Compile Include="GoldPrinter\Top.cs" />
<Compile Include="GoldPrinter\VAlignFlag.cs" /> <Compile Include="GoldPrinter\VAlignFlag.cs" />
<Compile Include="GoldPrinter\WebPrinterPageSetting.cs" />
<Compile Include="GoldPrinter\WinPrinterPageSetting.cs" /> <Compile Include="GoldPrinter\WinPrinterPageSetting.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">

View File

@ -35,10 +35,10 @@ namespace GoldPrinter
{ {
this._printerPageSetting = new WinPrinterPageSetting(); this._printerPageSetting = new WinPrinterPageSetting();
} }
else if (this._printModeFlag == PrintModeFlag.Web) //else if (this._printModeFlag == PrintModeFlag.Web)
{ //{
this._printerPageSetting = new WebPrinterPageSetting(); // this._printerPageSetting = new WebPrinterPageSetting();
} //}
} }
} }

View File

@ -12,7 +12,7 @@ namespace DocumentManagement
/// 医生 麻醉医生 麻醉护士 /// 医生 麻醉医生 麻醉护士
/// </summary> /// </summary>
public string PersonType = ""; public string PersonType = "";
public int SelectPersonData ; public int SelectPersonData;
public frmSelectPersonDoc() public frmSelectPersonDoc()
{ {
@ -28,7 +28,7 @@ namespace DocumentManagement
for (int i = 0; i < dgvSelectPerson.Rows.Count; i++) for (int i = 0; i < dgvSelectPerson.Rows.Count; i++)
{ {
if (SelectPersonData==int.Parse(dgvSelectPerson.Rows[i].Cells["IdColumn"].Value.ToString())) if (SelectPersonData == int.Parse(dgvSelectPerson.Rows[i].Cells["IdColumn"].Value.ToString()))
{ {
dgvSelectPerson.Rows[i].Cells["CheckBoxColumn"].Value = true; dgvSelectPerson.Rows[i].Cells["CheckBoxColumn"].Value = true;
} }
@ -48,14 +48,14 @@ namespace DocumentManagement
private void txtHelpCode_TextChanged(object sender, EventArgs e) private void txtHelpCode_TextChanged(object sender, EventArgs e)
{ {
dgvSelectPerson.DataSource = GetPersonDataTableByDepId( txtHelpCode.Text.Trim(), PersonType); dgvSelectPerson.DataSource = GetPersonDataTableByDepId(txtHelpCode.Text.Trim(), txtHelpCode.Text == "" ? PersonType : "");
} }
private void dgvSelectPerson_CellClick(object sender, DataGridViewCellEventArgs e) private void dgvSelectPerson_CellClick(object sender, DataGridViewCellEventArgs e)
{ {
if (Convert.ToBoolean(dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].EditedFormattedValue) == false) if (Convert.ToBoolean(dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].EditedFormattedValue) == false)
{ {
SelectPersonData=int.Parse(dgvSelectPerson.CurrentRow.Cells["IdColumn"].Value.ToString()); SelectPersonData = int.Parse(dgvSelectPerson.CurrentRow.Cells["IdColumn"].Value.ToString());
dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].Value = true; dgvSelectPerson.CurrentRow.Cells["CheckBoxColumn"].Value = true;
} }
else else
@ -74,7 +74,7 @@ namespace DocumentManagement
dgv.BackgroundColor = System.Drawing.Color.Snow; dgv.BackgroundColor = System.Drawing.Color.Snow;
} }
public static DataTable GetPersonDataTableByDepId( string HelpCode, string PersonType) public static DataTable GetPersonDataTableByDepId(string HelpCode, string PersonType)
{ {
string strSql = ""; string strSql = "";
@ -86,24 +86,28 @@ namespace DocumentManagement
{ {
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
} }
if (PersonType == "麻醉医生") else if (PersonType == "麻醉医生")
{ {
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉医生' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
} }
if (PersonType == "麻醉护士") else if (PersonType == "麻醉护士")
{ {
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='麻醉护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
} }
if (PersonType == "手术室护士") else if (PersonType == "手术室护士")
{ {
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='手术室护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType ='手术室护士' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
} }
if (PersonType == "护士") else if (PersonType == "护士")
{ {
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType like '%护士%' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')"; strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND p.PersonType like '%护士%' AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
} }
else
{
strSql = "SELECT p.Id,p.Name,p.[No] FROM Person p WHERE p.IsValid=1 AND (p.Name LIKE '%" + HelpCode + "%' OR p.HelpCode LIKE '%" + HelpCode + "%')";
}
return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString()); return HelperDB.DbHelperSQL.GetDataTable(strSql.ToString());
} }

View File

@ -686,52 +686,52 @@ namespace DocumentManagement
//} //}
} }
private void mXML2RTF_Click(object sender, EventArgs e) //private void mXML2RTF_Click(object sender, EventArgs e)
{ //{
MessageBox.Show("此处演示在后台将XDesigner.Writer格式的XML文档转换为RTF文档不显示用户界面可以运用在ASP.NET或Service程序中。"); // MessageBox.Show("此处演示在后台将XDesigner.Writer格式的XML文档转换为RTF文档不显示用户界面可以运用在ASP.NET或Service程序中。");
string sourceFileName = null; // string sourceFileName = null;
string descFileName = null; // string descFileName = null;
using (OpenFileDialog dlg = new OpenFileDialog()) // using (OpenFileDialog dlg = new OpenFileDialog())
{ // {
dlg.Filter = "XML文件|*.xml"; // dlg.Filter = "XML文件|*.xml";
dlg.CheckFileExists = true; // dlg.CheckFileExists = true;
dlg.ShowReadOnly = false; // dlg.ShowReadOnly = false;
dlg.Title = "请选择一个XDesigner.Writer程序保存的XML文件"; // dlg.Title = "请选择一个XDesigner.Writer程序保存的XML文件";
if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{ // {
sourceFileName = dlg.FileName; // sourceFileName = dlg.FileName;
} // }
else // else
{ // {
return; // return;
} // }
} // }
using (SaveFileDialog dlg = new SaveFileDialog()) // using (SaveFileDialog dlg = new SaveFileDialog())
{ // {
dlg.Filter = "RTF文件(*.rtf)|*.rtf"; // dlg.Filter = "RTF文件(*.rtf)|*.rtf";
dlg.CheckPathExists = true; // dlg.CheckPathExists = true;
dlg.OverwritePrompt = true; // dlg.OverwritePrompt = true;
if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{ // {
descFileName = dlg.FileName; // descFileName = dlg.FileName;
} // }
else // else
{ // {
return; // return;
} // }
} // }
XTextDocument document = new XTextDocument(); // XTextDocument document = new XTextDocument();
document.Load(sourceFileName, "xml"); // document.Load(sourceFileName, "xml");
using (System.Drawing.Graphics g = document.CreateGraphics()) // using (System.Drawing.Graphics g = document.CreateGraphics())
{ // {
document.RefreshSize(g); // document.RefreshSize(g);
document.ExecuteLayout(); // document.ExecuteLayout();
document.RefreshPages(); // document.RefreshPages();
document.Save(descFileName, "rtf"); // document.Save(descFileName, "rtf");
} // }
MessageBox.Show(string.Format("成功的将“{0}”转换为“{1}”。", sourceFileName, descFileName)); // MessageBox.Show(string.Format("成功的将“{0}”转换为“{1}”。", sourceFileName, descFileName));
} //}
/// <summary> /// <summary>
/// 文档内容发生改变事件 /// 文档内容发生改变事件
@ -1245,46 +1245,46 @@ namespace DocumentManagement
myEditControl.ExecuteCommand("InsertInputField", false, field); myEditControl.ExecuteCommand("InsertInputField", false, field);
} }
private void mPrintMultiDocument_Click(object sender, EventArgs e) //private void mPrintMultiDocument_Click(object sender, EventArgs e)
{ //{
using (DCSoft.Writer.Printing.WriterPrintDocument pd = new DCSoft.Writer.Printing.WriterPrintDocument()) // using (DCSoft.Writer.Printing.WriterPrintDocument pd = new DCSoft.Writer.Printing.WriterPrintDocument())
{ // {
while (true) // while (true)
{ // {
using (OpenFileDialog dlg = new OpenFileDialog()) // using (OpenFileDialog dlg = new OpenFileDialog())
{ // {
dlg.Filter = "*.xml|*.xml"; // dlg.Filter = "*.xml|*.xml";
dlg.CheckFileExists = true; // dlg.CheckFileExists = true;
if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK) // if (dlg.ShowDialog(this) == System.Windows.Forms.DialogResult.OK)
{ // {
XTextDocument doc = new XTextDocument(); // XTextDocument doc = new XTextDocument();
doc.Load(dlg.FileName, "xml"); // doc.Load(dlg.FileName, "xml");
using (Graphics g = doc.CreateGraphics()) // using (Graphics g = doc.CreateGraphics())
{ // {
doc.RefreshSize(g); // doc.RefreshSize(g);
} // }
doc.ExecuteLayout(); // doc.ExecuteLayout();
doc.RefreshPages(); // doc.RefreshPages();
pd.Documents.Add(doc); // pd.Documents.Add(doc);
} // }
else // else
{ // {
break; // break;
} // }
} // }
} // }
if (pd.Documents.Count > 0) // if (pd.Documents.Count > 0)
{ // {
using (PrintPreviewDialog dlg = new PrintPreviewDialog()) // using (PrintPreviewDialog dlg = new PrintPreviewDialog())
{ // {
dlg.Document = pd; // dlg.Document = pd;
pd.UpdateDocumentsState(); // pd.UpdateDocumentsState();
dlg.ShowDialog(this); // dlg.ShowDialog(this);
pd.RestoreDocumentsState(); // pd.RestoreDocumentsState();
} // }
} // }
} // }
} //}
private void mPrintDocumentBackground_Click(object sender, EventArgs e) private void mPrintDocumentBackground_Click(object sender, EventArgs e)
{ {

View File

@ -547,7 +547,7 @@ namespace DrawGraph
return DateTime.Now; return DateTime.Now;
} }
} }
catch (Exception ex) catch (Exception)
{ {
return DateTime.Now; return DateTime.Now;
} }

View File

@ -54,7 +54,7 @@ namespace DrawGraph
} }
} }
public float EndY public new float EndY
{ {
get get
{ {
@ -66,7 +66,7 @@ namespace DrawGraph
} }
} }
public float EndX public new float EndX
{ {
get get
{ {
@ -79,7 +79,7 @@ namespace DrawGraph
} }
[JsonIgnore] [JsonIgnore]
private float RealEndY private new float RealEndY
{ {
get get
{ {
@ -94,7 +94,7 @@ namespace DrawGraph
} }
[JsonIgnore] [JsonIgnore]
private float RealEndX private new float RealEndX
{ {
get get
{ {

View File

@ -77,11 +77,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath> <HintPath>..\AIMS\Extensions\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="PdfiumViewer, Version=2.13.0.0, Culture=neutral, PublicKeyToken=91e4789cfb0609e0, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\PdfiumViewer.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="ReachFramework" /> <Reference Include="ReachFramework" />
<Reference Include="System" /> <Reference Include="System" />

View File

@ -381,7 +381,6 @@
#endregion #endregion
private System.Windows.Forms.ComboBox cmbManageList;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtManageName; private System.Windows.Forms.TextBox txtManageName;

View File

@ -7,7 +7,7 @@ namespace DrawGraphManagement.MyUserControl
{ {
public class UCAttrib : UCBase public class UCAttrib : UCBase
{ {
PackObjBase selectPoB = null; //PackObjBase selectPoB = null;
public UCAttrib(PackObjBase pob) public UCAttrib(PackObjBase pob)
{ {