1104测试文档开发修改

This commit is contained in:
leomo 2022-11-04 22:42:44 +08:00
parent c422f19da1
commit 7cbc28c624
18 changed files with 229 additions and 220 deletions

View File

@ -178,7 +178,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(2082, 10); this.panel2.Size = new System.Drawing.Size(1711, 10);
this.panel2.TabIndex = 1; this.panel2.TabIndex = 1;
this.panel2.Visible = false; this.panel2.Visible = false;
// //
@ -190,7 +190,7 @@
this.panel3.Font = new System.Drawing.Font("宋体", 12F); this.panel3.Font = new System.Drawing.Font("宋体", 12F);
this.panel3.Location = new System.Drawing.Point(0, 10); this.panel3.Location = new System.Drawing.Point(0, 10);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(160, 1032); this.panel3.Size = new System.Drawing.Size(160, 931);
this.panel3.TabIndex = 2; this.panel3.TabIndex = 2;
// //
// panel14 // panel14
@ -211,7 +211,7 @@
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel14.Location = new System.Drawing.Point(0, 0); this.panel14.Location = new System.Drawing.Point(0, 0);
this.panel14.Name = "panel14"; this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(160, 1032); this.panel14.Size = new System.Drawing.Size(160, 931);
this.panel14.TabIndex = 5; this.panel14.TabIndex = 5;
// //
// button8 // button8
@ -482,9 +482,9 @@
this.panel4.Controls.Add(this.label1); this.panel4.Controls.Add(this.label1);
this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Font = new System.Drawing.Font("宋体", 10.5F);
this.panel4.Location = new System.Drawing.Point(1922, 10); this.panel4.Location = new System.Drawing.Point(1551, 10);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.Size = new System.Drawing.Size(160, 931);
this.panel4.TabIndex = 3; this.panel4.TabIndex = 3;
// //
// btnChage // btnChage
@ -499,7 +499,7 @@
this.btnChage.ForeColor = System.Drawing.Color.DimGray; this.btnChage.ForeColor = System.Drawing.Color.DimGray;
this.btnChage.Image = global::AIMS.Properties.Resources.; this.btnChage.Image = global::AIMS.Properties.Resources.;
this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnChage.Location = new System.Drawing.Point(0, 682); this.btnChage.Location = new System.Drawing.Point(0, 581);
this.btnChage.Name = "btnChage"; this.btnChage.Name = "btnChage";
this.btnChage.Size = new System.Drawing.Size(160, 50); this.btnChage.Size = new System.Drawing.Size(160, 50);
this.btnChage.TabIndex = 32; this.btnChage.TabIndex = 32;
@ -520,7 +520,7 @@
this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; this.btnsjzx.ForeColor = System.Drawing.Color.DimGray;
this.btnsjzx.Image = global::AIMS.Properties.Resources.; this.btnsjzx.Image = global::AIMS.Properties.Resources.;
this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnsjzx.Location = new System.Drawing.Point(0, 732); this.btnsjzx.Location = new System.Drawing.Point(0, 631);
this.btnsjzx.Name = "btnsjzx"; this.btnsjzx.Name = "btnsjzx";
this.btnsjzx.Size = new System.Drawing.Size(160, 50); this.btnsjzx.Size = new System.Drawing.Size(160, 50);
this.btnsjzx.TabIndex = 30; this.btnsjzx.TabIndex = 30;
@ -540,7 +540,7 @@
this.btnyldj.ForeColor = System.Drawing.Color.DimGray; this.btnyldj.ForeColor = System.Drawing.Color.DimGray;
this.btnyldj.Image = global::AIMS.Properties.Resources.; this.btnyldj.Image = global::AIMS.Properties.Resources.;
this.btnyldj.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnyldj.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnyldj.Location = new System.Drawing.Point(0, 782); this.btnyldj.Location = new System.Drawing.Point(0, 681);
this.btnyldj.Name = "btnyldj"; this.btnyldj.Name = "btnyldj";
this.btnyldj.Size = new System.Drawing.Size(160, 50); this.btnyldj.Size = new System.Drawing.Size(160, 50);
this.btnyldj.TabIndex = 29; this.btnyldj.TabIndex = 29;
@ -560,7 +560,7 @@
this.btnzsk.ForeColor = System.Drawing.Color.DimGray; this.btnzsk.ForeColor = System.Drawing.Color.DimGray;
this.btnzsk.Image = global::AIMS.Properties.Resources.; this.btnzsk.Image = global::AIMS.Properties.Resources.;
this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnzsk.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnzsk.Location = new System.Drawing.Point(0, 832); this.btnzsk.Location = new System.Drawing.Point(0, 731);
this.btnzsk.Name = "btnzsk"; this.btnzsk.Name = "btnzsk";
this.btnzsk.Size = new System.Drawing.Size(160, 50); this.btnzsk.Size = new System.Drawing.Size(160, 50);
this.btnzsk.TabIndex = 28; this.btnzsk.TabIndex = 28;
@ -580,7 +580,7 @@
this.btndptz.ForeColor = System.Drawing.Color.DimGray; this.btndptz.ForeColor = System.Drawing.Color.DimGray;
this.btndptz.Image = global::AIMS.Properties.Resources.; this.btndptz.Image = global::AIMS.Properties.Resources.;
this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btndptz.Location = new System.Drawing.Point(0, 882); this.btndptz.Location = new System.Drawing.Point(0, 781);
this.btndptz.Name = "btndptz"; this.btndptz.Name = "btndptz";
this.btndptz.Size = new System.Drawing.Size(160, 50); this.btndptz.Size = new System.Drawing.Size(160, 50);
this.btndptz.TabIndex = 27; this.btndptz.TabIndex = 27;
@ -600,7 +600,7 @@
this.btnxldlx.ForeColor = System.Drawing.Color.DimGray; this.btnxldlx.ForeColor = System.Drawing.Color.DimGray;
this.btnxldlx.Image = global::AIMS.Properties.Resources._select; this.btnxldlx.Image = global::AIMS.Properties.Resources._select;
this.btnxldlx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnxldlx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnxldlx.Location = new System.Drawing.Point(0, 932); this.btnxldlx.Location = new System.Drawing.Point(0, 831);
this.btnxldlx.Name = "btnxldlx"; this.btnxldlx.Name = "btnxldlx";
this.btnxldlx.Size = new System.Drawing.Size(160, 50); this.btnxldlx.Size = new System.Drawing.Size(160, 50);
this.btnxldlx.TabIndex = 26; this.btnxldlx.TabIndex = 26;
@ -621,7 +621,7 @@
this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; this.btnsbwh.ForeColor = System.Drawing.Color.DimGray;
this.btnsbwh.Image = global::AIMS.Properties.Resources.; this.btnsbwh.Image = global::AIMS.Properties.Resources.;
this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnsbwh.Location = new System.Drawing.Point(0, 982); this.btnsbwh.Location = new System.Drawing.Point(0, 881);
this.btnsbwh.Name = "btnsbwh"; this.btnsbwh.Name = "btnsbwh";
this.btnsbwh.Size = new System.Drawing.Size(160, 50); this.btnsbwh.Size = new System.Drawing.Size(160, 50);
this.btnsbwh.TabIndex = 25; this.btnsbwh.TabIndex = 25;
@ -814,7 +814,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(2082, 1042); this.panel1.Size = new System.Drawing.Size(1711, 941);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// panel5 // panel5
@ -827,7 +827,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Location = new System.Drawing.Point(160, 10);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1762, 1032); this.panel5.Size = new System.Drawing.Size(1391, 931);
this.panel5.TabIndex = 4; this.panel5.TabIndex = 4;
// //
// superTabMain // superTabMain
@ -855,7 +855,7 @@
this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.ReorderTabsEnabled = true;
this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.superTabMain.SelectedTabIndex = 0; this.superTabMain.SelectedTabIndex = 0;
this.superTabMain.Size = new System.Drawing.Size(1760, 932); this.superTabMain.Size = new System.Drawing.Size(1389, 831);
this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.superTabMain.TabIndex = 14; this.superTabMain.TabIndex = 14;
this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] {
@ -869,7 +869,7 @@
this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28);
this.superTabControlPanel1.Name = "superTabControlPanel1"; this.superTabControlPanel1.Name = "superTabControlPanel1";
this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803);
this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabIndex = 1;
this.superTabControlPanel1.TabItem = this.spTabQXQDD; this.superTabControlPanel1.TabItem = this.spTabQXQDD;
// //
@ -882,7 +882,7 @@
this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Location = new System.Drawing.Point(0, 0);
this.panelExZKZB.Name = "panelExZKZB"; this.panelExZKZB.Name = "panelExZKZB";
this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); this.panelExZKZB.Size = new System.Drawing.Size(1389, 803);
this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -901,7 +901,7 @@
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8"; this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1760, 904); this.panel8.Size = new System.Drawing.Size(1389, 803);
this.panel8.TabIndex = 2; this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
// //
@ -1052,9 +1052,9 @@
this.panel7.Controls.Add(this.labOperatorName); this.panel7.Controls.Add(this.labOperatorName);
this.panel7.Controls.Add(this.label19); this.panel7.Controls.Add(this.label19);
this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Location = new System.Drawing.Point(0, 889);
this.panel7.Name = "panel7"; this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(1760, 40); this.panel7.Size = new System.Drawing.Size(1389, 40);
this.panel7.TabIndex = 1; this.panel7.TabIndex = 1;
// //
// panel21 // panel21
@ -1067,7 +1067,7 @@
this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plPrint);
this.panel21.Controls.Add(this.plRefresh); this.panel21.Controls.Add(this.plRefresh);
this.panel21.Dock = System.Windows.Forms.DockStyle.Right; this.panel21.Dock = System.Windows.Forms.DockStyle.Right;
this.panel21.Location = new System.Drawing.Point(1406, 0); this.panel21.Location = new System.Drawing.Point(1035, 0);
this.panel21.Name = "panel21"; this.panel21.Name = "panel21";
this.panel21.Size = new System.Drawing.Size(354, 40); this.panel21.Size = new System.Drawing.Size(354, 40);
this.panel21.TabIndex = 10; this.panel21.TabIndex = 10;
@ -1207,7 +1207,7 @@
this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top;
this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Location = new System.Drawing.Point(0, 0);
this.plTitleEventTime.Name = "plTitleEventTime"; this.plTitleEventTime.Name = "plTitleEventTime";
this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); this.plTitleEventTime.Size = new System.Drawing.Size(1389, 58);
this.plTitleEventTime.TabIndex = 0; this.plTitleEventTime.TabIndex = 0;
// //
// panel13 // panel13
@ -1961,7 +1961,7 @@
// frmAnasRecordBill2 // frmAnasRecordBill2
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(2082, 1042); this.ClientSize = new System.Drawing.Size(1711, 941);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmAnasRecordBill2"; this.Name = "frmAnasRecordBill2";

View File

@ -253,7 +253,6 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
private void PrintDocPane(PrintPageEventArgs e, ZedGraphControl zedGraph, TemplateManage template, bool InitChart) private void PrintDocPane(PrintPageEventArgs e, ZedGraphControl zedGraph, TemplateManage template, bool InitChart)
{ {
if (InitChart == false)
foreach (AreaManageBase area in template.ManageList) foreach (AreaManageBase area in template.ManageList)
{ {
area.setPrint(false); area.setPrint(false);
@ -324,6 +323,10 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.04); int LocationY = Convert.ToInt32(templateManage.ZedControl.Height * 0.04);
templateManage.LocationY = LocationY; templateManage.LocationY = LocationY;
templateManage.SetPYL(); templateManage.SetPYL();
foreach (AreaManageBase area in template.ManageList)
{
area.setPrint(true);
}
} }
} }
@ -1223,7 +1226,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
try try
{ {
//图表的对象 //图表的对象
TextPackObj janCePack = templateManage.GetPackObjectOTag<TextPackObj>("PhysioDataManage_TextPackObj_17"); TextPackObj janCePack = templateManage.GetPackObjectOTag<TextPackObj>("PhysioDataManage_TextPackObj_12");
LinePackObj H5pack = templateManage.GetPackObjectOTag<LinePackObj>("IconManage_LinePackObj_6"); LinePackObj H5pack = templateManage.GetPackObjectOTag<LinePackObj>("IconManage_LinePackObj_6");
foreach (FactBloodGasAnalysis analysis in _record.FactBloodGasAnalysisList) foreach (FactBloodGasAnalysis analysis in _record.FactBloodGasAnalysisList)
{ {

View File

@ -160,7 +160,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(2082, 10); this.panel2.Size = new System.Drawing.Size(1924, 10);
this.panel2.TabIndex = 1; this.panel2.TabIndex = 1;
this.panel2.Visible = false; this.panel2.Visible = false;
// //
@ -488,7 +488,7 @@
this.panel4.Controls.Add(this.label1); this.panel4.Controls.Add(this.label1);
this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Font = new System.Drawing.Font("宋体", 10.5F);
this.panel4.Location = new System.Drawing.Point(1922, 10); this.panel4.Location = new System.Drawing.Point(1764, 10);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.Size = new System.Drawing.Size(160, 1032);
this.panel4.TabIndex = 3; this.panel4.TabIndex = 3;
@ -758,7 +758,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(2082, 1042); this.panel1.Size = new System.Drawing.Size(1924, 1042);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// panel5 // panel5
@ -771,7 +771,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Location = new System.Drawing.Point(160, 10);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1762, 1032); this.panel5.Size = new System.Drawing.Size(1604, 1032);
this.panel5.TabIndex = 4; this.panel5.TabIndex = 4;
// //
// superTabMain // superTabMain
@ -798,7 +798,7 @@
this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.ReorderTabsEnabled = true;
this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.superTabMain.SelectedTabIndex = 0; this.superTabMain.SelectedTabIndex = 0;
this.superTabMain.Size = new System.Drawing.Size(1760, 932); this.superTabMain.Size = new System.Drawing.Size(1602, 932);
this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.superTabMain.TabIndex = 14; this.superTabMain.TabIndex = 14;
this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] {
@ -811,7 +811,7 @@
this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28);
this.superTabControlPanel1.Name = "superTabControlPanel1"; this.superTabControlPanel1.Name = "superTabControlPanel1";
this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904);
this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabIndex = 1;
this.superTabControlPanel1.TabItem = this.spTabQXQDD; this.superTabControlPanel1.TabItem = this.spTabQXQDD;
// //
@ -824,7 +824,7 @@
this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Location = new System.Drawing.Point(0, 0);
this.panelExZKZB.Name = "panelExZKZB"; this.panelExZKZB.Name = "panelExZKZB";
this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); this.panelExZKZB.Size = new System.Drawing.Size(1602, 904);
this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -844,7 +844,7 @@
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8"; this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1760, 904); this.panel8.Size = new System.Drawing.Size(1602, 904);
this.panel8.TabIndex = 2; this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
// //
@ -1125,7 +1125,7 @@
this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Location = new System.Drawing.Point(0, 990);
this.panel7.Name = "panel7"; this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(1760, 40); this.panel7.Size = new System.Drawing.Size(1602, 40);
this.panel7.TabIndex = 1; this.panel7.TabIndex = 1;
// //
// panel21 // panel21
@ -1135,7 +1135,7 @@
this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plPrint);
this.panel21.Controls.Add(this.plRefresh); this.panel21.Controls.Add(this.plRefresh);
this.panel21.Dock = System.Windows.Forms.DockStyle.Right; this.panel21.Dock = System.Windows.Forms.DockStyle.Right;
this.panel21.Location = new System.Drawing.Point(1419, 0); this.panel21.Location = new System.Drawing.Point(1261, 0);
this.panel21.Name = "panel21"; this.panel21.Name = "panel21";
this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.Size = new System.Drawing.Size(341, 40);
this.panel21.TabIndex = 10; this.panel21.TabIndex = 10;
@ -1234,7 +1234,7 @@
this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top;
this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Location = new System.Drawing.Point(0, 0);
this.plTitleEventTime.Name = "plTitleEventTime"; this.plTitleEventTime.Name = "plTitleEventTime";
this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58);
this.plTitleEventTime.TabIndex = 0; this.plTitleEventTime.TabIndex = 0;
// //
// panel13 // panel13
@ -1619,7 +1619,7 @@
// frmAnasRecordInstrument // frmAnasRecordInstrument
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(2082, 1042); this.ClientSize = new System.Drawing.Size(1924, 1042);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmAnasRecordInstrument"; this.Name = "frmAnasRecordInstrument";

View File

@ -1424,6 +1424,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
SendKeys.Send("{TAB}"); SendKeys.Send("{TAB}");
SendKeys.Send("{TAB}"); SendKeys.Send("{TAB}");
SendKeys.Send("{TAB}"); SendKeys.Send("{TAB}");
SendKeys.Send("{TAB}");
} }
} }
#endregion #endregion

View File

@ -251,7 +251,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(2082, 10); this.panel2.Size = new System.Drawing.Size(1924, 10);
this.panel2.TabIndex = 1; this.panel2.TabIndex = 1;
this.panel2.Visible = false; this.panel2.Visible = false;
// //
@ -576,7 +576,7 @@
this.panel4.Controls.Add(this.label1); this.panel4.Controls.Add(this.label1);
this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Font = new System.Drawing.Font("宋体", 10.5F);
this.panel4.Location = new System.Drawing.Point(1922, 10); this.panel4.Location = new System.Drawing.Point(1764, 10);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.Size = new System.Drawing.Size(160, 1032);
this.panel4.TabIndex = 3; this.panel4.TabIndex = 3;
@ -846,7 +846,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(2082, 1042); this.panel1.Size = new System.Drawing.Size(1924, 1042);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// panel5 // panel5
@ -859,7 +859,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Location = new System.Drawing.Point(160, 10);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1762, 1032); this.panel5.Size = new System.Drawing.Size(1604, 1032);
this.panel5.TabIndex = 4; this.panel5.TabIndex = 4;
// //
// superTabMain // superTabMain
@ -879,15 +879,15 @@
this.superTabMain.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.ControlBox.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
this.superTabMain.ControlBox.MenuBox, this.superTabMain.ControlBox.MenuBox,
this.superTabMain.ControlBox.CloseBox}); this.superTabMain.ControlBox.CloseBox});
this.superTabMain.Controls.Add(this.superTabControlPanel2);
this.superTabMain.Controls.Add(this.superTabControlPanel1); this.superTabMain.Controls.Add(this.superTabControlPanel1);
this.superTabMain.Controls.Add(this.superTabControlPanel2);
this.superTabMain.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.superTabMain.Location = new System.Drawing.Point(0, 58); this.superTabMain.Location = new System.Drawing.Point(0, 58);
this.superTabMain.Name = "superTabMain"; this.superTabMain.Name = "superTabMain";
this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.ReorderTabsEnabled = true;
this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.superTabMain.SelectedTabIndex = 0; this.superTabMain.SelectedTabIndex = 0;
this.superTabMain.Size = new System.Drawing.Size(1760, 932); this.superTabMain.Size = new System.Drawing.Size(1602, 932);
this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.superTabMain.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.superTabMain.TabIndex = 14; this.superTabMain.TabIndex = 14;
this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] {
@ -1768,7 +1768,7 @@
this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28);
this.superTabControlPanel1.Name = "superTabControlPanel1"; this.superTabControlPanel1.Name = "superTabControlPanel1";
this.superTabControlPanel1.Size = new System.Drawing.Size(1760, 904); this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904);
this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabIndex = 1;
this.superTabControlPanel1.TabItem = this.spTabQXQDD; this.superTabControlPanel1.TabItem = this.spTabQXQDD;
// //
@ -1781,7 +1781,7 @@
this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Location = new System.Drawing.Point(0, 0);
this.panelExZKZB.Name = "panelExZKZB"; this.panelExZKZB.Name = "panelExZKZB";
this.panelExZKZB.Size = new System.Drawing.Size(1760, 904); this.panelExZKZB.Size = new System.Drawing.Size(1602, 904);
this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -1801,7 +1801,7 @@
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8"; this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1760, 904); this.panel8.Size = new System.Drawing.Size(1602, 904);
this.panel8.TabIndex = 2; this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
// //
@ -2137,7 +2137,7 @@
this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Location = new System.Drawing.Point(0, 990);
this.panel7.Name = "panel7"; this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(1760, 40); this.panel7.Size = new System.Drawing.Size(1602, 40);
this.panel7.TabIndex = 1; this.panel7.TabIndex = 1;
// //
// panel21 // panel21
@ -2147,7 +2147,7 @@
this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plPrint);
this.panel21.Controls.Add(this.plRefresh); this.panel21.Controls.Add(this.plRefresh);
this.panel21.Dock = System.Windows.Forms.DockStyle.Right; this.panel21.Dock = System.Windows.Forms.DockStyle.Right;
this.panel21.Location = new System.Drawing.Point(1419, 0); this.panel21.Location = new System.Drawing.Point(1261, 0);
this.panel21.Name = "panel21"; this.panel21.Name = "panel21";
this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.Size = new System.Drawing.Size(341, 40);
this.panel21.TabIndex = 10; this.panel21.TabIndex = 10;
@ -2246,7 +2246,7 @@
this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top;
this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Location = new System.Drawing.Point(0, 0);
this.plTitleEventTime.Name = "plTitleEventTime"; this.plTitleEventTime.Name = "plTitleEventTime";
this.plTitleEventTime.Size = new System.Drawing.Size(1760, 58); this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58);
this.plTitleEventTime.TabIndex = 0; this.plTitleEventTime.TabIndex = 0;
// //
// panel13 // panel13
@ -2628,13 +2628,13 @@
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;
// //
// frmAnasRecordInstrument // frmAnasRecordInstrument2
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(2082, 1042); this.ClientSize = new System.Drawing.Size(1924, 1042);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmAnasRecordInstrument"; this.Name = "frmAnasRecordInstrument2";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "器械清点单"; this.Text = "器械清点单";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

View File

@ -96,15 +96,15 @@ namespace AIMS.OremrUserControl
set set
{ {
goodsNumber = value; goodsNumber = value;
this.txtDoing.Text = "0"; //this.txtDoing.Text = "0";
if (goodsNumber != "") //if (goodsNumber != "")
{ //{
this.txtFront.Text = goodsNumber; // this.txtFront.Text = goodsNumber;
this.txtCloseFront.Text = goodsNumber; // this.txtCloseFront.Text = goodsNumber;
this.txtCloseLast.Text = goodsNumber; // this.txtCloseLast.Text = goodsNumber;
this.txtSkinCloseLast.Text = goodsNumber; // this.txtSkinCloseLast.Text = goodsNumber;
} //}
} }
} }
public string OpeFront public string OpeFront

View File

@ -41,11 +41,12 @@
this.lblGoodsName.BackColor = System.Drawing.Color.Azure; this.lblGoodsName.BackColor = System.Drawing.Color.Azure;
this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left; this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left;
this.lblGoodsName.Font = new System.Drawing.Font("微软雅黑", 15F);
this.lblGoodsName.Location = new System.Drawing.Point(0, 0); this.lblGoodsName.Location = new System.Drawing.Point(0, 0);
this.lblGoodsName.Multiline = true; this.lblGoodsName.Multiline = true;
this.lblGoodsName.Name = "lblGoodsName"; this.lblGoodsName.Name = "lblGoodsName";
this.lblGoodsName.ReadOnly = true; this.lblGoodsName.ReadOnly = true;
this.lblGoodsName.Size = new System.Drawing.Size(140, 28); this.lblGoodsName.Size = new System.Drawing.Size(140, 43);
this.lblGoodsName.TabIndex = 1; this.lblGoodsName.TabIndex = 1;
this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
@ -54,13 +55,13 @@
// //
this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left; this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left;
this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 20F);
this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtCloseLast.Location = new System.Drawing.Point(431, 0); this.txtCloseLast.Location = new System.Drawing.Point(431, 0);
this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtCloseLast.Name = "txtCloseLast"; this.txtCloseLast.Name = "txtCloseLast";
this.txtCloseLast.ShortcutsEnabled = false; this.txtCloseLast.ShortcutsEnabled = false;
this.txtCloseLast.Size = new System.Drawing.Size(93, 26); this.txtCloseLast.Size = new System.Drawing.Size(93, 43);
this.txtCloseLast.TabIndex = 5; this.txtCloseLast.TabIndex = 5;
this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -68,13 +69,13 @@
// //
this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left; this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left;
this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 20F);
this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtCloseFront.Location = new System.Drawing.Point(334, 0); this.txtCloseFront.Location = new System.Drawing.Point(334, 0);
this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtCloseFront.Name = "txtCloseFront"; this.txtCloseFront.Name = "txtCloseFront";
this.txtCloseFront.ShortcutsEnabled = false; this.txtCloseFront.ShortcutsEnabled = false;
this.txtCloseFront.Size = new System.Drawing.Size(97, 26); this.txtCloseFront.Size = new System.Drawing.Size(97, 43);
this.txtCloseFront.TabIndex = 4; this.txtCloseFront.TabIndex = 4;
this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -82,13 +83,13 @@
// //
this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left; this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left;
this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 20F);
this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtDoing.Location = new System.Drawing.Point(237, 0); this.txtDoing.Location = new System.Drawing.Point(237, 0);
this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDoing.Name = "txtDoing"; this.txtDoing.Name = "txtDoing";
this.txtDoing.ShortcutsEnabled = false; this.txtDoing.ShortcutsEnabled = false;
this.txtDoing.Size = new System.Drawing.Size(97, 26); this.txtDoing.Size = new System.Drawing.Size(97, 43);
this.txtDoing.TabIndex = 3; this.txtDoing.TabIndex = 3;
this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -96,12 +97,12 @@
// //
this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtFront.Dock = System.Windows.Forms.DockStyle.Left; this.txtFront.Dock = System.Windows.Forms.DockStyle.Left;
this.txtFront.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtFront.Font = new System.Drawing.Font("微软雅黑", 20F);
this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtFront.Location = new System.Drawing.Point(140, 0); this.txtFront.Location = new System.Drawing.Point(140, 0);
this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtFront.Name = "txtFront"; this.txtFront.Name = "txtFront";
this.txtFront.Size = new System.Drawing.Size(97, 26); this.txtFront.Size = new System.Drawing.Size(97, 43);
this.txtFront.TabIndex = 2; this.txtFront.TabIndex = 2;
this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -109,13 +110,13 @@
// //
this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left; this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left;
this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 20F);
this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtSkinCloseLast.Location = new System.Drawing.Point(524, 0); this.txtSkinCloseLast.Location = new System.Drawing.Point(524, 0);
this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSkinCloseLast.Name = "txtSkinCloseLast"; this.txtSkinCloseLast.Name = "txtSkinCloseLast";
this.txtSkinCloseLast.ShortcutsEnabled = false; this.txtSkinCloseLast.ShortcutsEnabled = false;
this.txtSkinCloseLast.Size = new System.Drawing.Size(93, 26); this.txtSkinCloseLast.Size = new System.Drawing.Size(94, 43);
this.txtSkinCloseLast.TabIndex = 6; this.txtSkinCloseLast.TabIndex = 6;
// //
// UCOperationGoodsBill5 // UCOperationGoodsBill5
@ -132,7 +133,7 @@
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UCOperationGoodsBill5"; this.Name = "UCOperationGoodsBill5";
this.Size = new System.Drawing.Size(618, 28); this.Size = new System.Drawing.Size(618, 43);
this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load); this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

View File

@ -83,9 +83,9 @@ namespace DrawGraph
if (ableEdit != null) if (ableEdit != null)
{ {
//ableEdit.IsVisible = true;
if (ableEdit.ControlType == EControlType.RadioButtonList) if (ableEdit.ControlType == EControlType.RadioButtonList)
{ {
ableEdit.IsVisible = true;
Panel pan = ableEdit.CControl as Panel; Panel pan = ableEdit.CControl as Panel;
if (pan != null) if (pan != null)
{ {
@ -139,6 +139,7 @@ namespace DrawGraph
switch (ableEdit.ControlType) switch (ableEdit.ControlType)
{ {
case EControlType.RadioButtonList: case EControlType.RadioButtonList:
ableEdit.IsVisible = true;
foreach (Control conl in ableEdit.CControl.Controls) foreach (Control conl in ableEdit.CControl.Controls)
{ {
string spanT = span.Clone().ToString(); string spanT = span.Clone().ToString();
@ -313,6 +314,9 @@ namespace DrawGraph
AbleEditPackObj aEdit = pack as AbleEditPackObj; AbleEditPackObj aEdit = pack as AbleEditPackObj;
if (aEdit != null) if (aEdit != null)
{ {
if (aEdit.ControlType == EControlType.RadioButtonList)
aEdit.IsVisible = true;
else
aEdit.IsVisible = false; aEdit.IsVisible = false;
} }
} }
@ -557,6 +561,7 @@ namespace DrawGraph
//拿到数据源格式OperationRecord.PatientRef.Bed //拿到数据源格式OperationRecord.PatientRef.Bed
if (ableEdit.ControlType == EControlType.RadioButtonList) if (ableEdit.ControlType == EControlType.RadioButtonList)
{ {
ableEdit.IsVisible = true;
//SetAbleEditView(ableEdit,true); //SetAbleEditView(ableEdit,true);
if (sender is CheckBox) if (sender is CheckBox)
if ((sender as CheckBox).Checked == true) if ((sender as CheckBox).Checked == true)
@ -578,6 +583,9 @@ namespace DrawGraph
string value = ""; string value = "";
if (!updateOk) if (!updateOk)
{ {
if (ableEdit.ControlType == EControlType.RadioButtonList)
ableEdit.IsVisible = true;
else
ableEdit.IsVisible = !ableEdit.IsVisible; ableEdit.IsVisible = !ableEdit.IsVisible;
} }
else else
@ -585,7 +593,7 @@ namespace DrawGraph
if (ableEdit.ControlType == EControlType.RadioButtonList) if (ableEdit.ControlType == EControlType.RadioButtonList)
{ {
//设置属性的值 //设置属性的值
ableEdit.IsVisible = !ableEdit.IsVisible; ableEdit.IsVisible = true;
foreach (Control conl in ableEdit.CControl.Controls) foreach (Control conl in ableEdit.CControl.Controls)
{ {
string spanT = ""; string spanT = "";
@ -656,5 +664,31 @@ namespace DrawGraph
myOpeRecord.currentPage = (int)db + 1; myOpeRecord.currentPage = (int)db + 1;
if (myOpeRecord.currentPage == 0) myOpeRecord.currentPage = 1; if (myOpeRecord.currentPage == 0) myOpeRecord.currentPage = 1;
} }
//设置打印模式,组件不显示
public override void setPrint(bool isVisible)
{
//预览状态时所可编辑组件的组件隐藏
List<PackObjBase> ables = PackManage.ListPob.Where<PackObjBase>(s => s is AbleEditPackObj).ToList<PackObjBase>();
foreach (PackObjBase pack1 in ables)
{
AbleEditPackObj ableEdit = pack1 as AbleEditPackObj;
if (ableEdit.ControlType == EControlType.RadioButtonList)
if (ableEdit != null)
{
ableEdit.IsVisible = isVisible;
if (isVisible == true)
{
ableEdit.IsViewBoard = EIsBool.True;
}
else
{
ableEdit.IsViewBoard = EIsBool.False;
ableEdit.Draw();
}
}
}
}
} }
} }

View File

@ -1,4 +1,5 @@
using HelperDB; using AIMSExtension;
using HelperDB;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -156,7 +157,7 @@ namespace DrawGraph
} }
else if (items[1] == "OperationType") else if (items[1] == "OperationType")
{ {
i += UpdateApply (items[1] + "='" + value + "' where Id= " + _operationRecord.PatientId); i += UpdateApply(items[1] + "='" + value + "' where Id= " + _operationRecord.PatientId);
} }
else else
{ {
@ -442,6 +443,8 @@ namespace DrawGraph
{ {
if (Ids == null || Ids.Trim() == "") return ""; if (Ids == null || Ids.Trim() == "") return "";
string Explain = ""; string Explain = "";
try
{
string sql = ""; string sql = "";
switch (DictionaryName) switch (DictionaryName)
{ {
@ -478,6 +481,12 @@ namespace DrawGraph
Explain = dt.ToString(); Explain = dt.ToString();
} }
} }
}
catch (Exception ex)
{
PublicMethod.WriteLog(ex);
Explain = "";
}
return Explain; return Explain;
} }

View File

@ -130,6 +130,13 @@ namespace DrawGraph
delAddImg(TextPrefix.IM + this.EventName + this.EventId.ToString()); delAddImg(TextPrefix.IM + this.EventName + this.EventId.ToString());
} }
public override void clearDNAndDT(ZedGraphControl zgc)
{
if (zgcAnas == null || zgcAnas != zgc) zgcAnas = zgc;
delAddObj(TextPrefix.DN + this.EventName + this.EventId.ToString());
delAddObj(TextPrefix.DT + this.EventName + this.EventId.ToString());
//delAddObj(TextPrefix.IM + this.EventRef.Name + this.EventId.ToString());
}
/// <summary> /// <summary>
/// 根据事件对象重画图片 /// 根据事件对象重画图片
/// </summary> /// </summary>

View File

@ -1166,6 +1166,7 @@ namespace DrawGraph
public List<string> EventListstr = new List<string>(); public List<string> EventListstr = new List<string>();
public List<string> DrugsListstr = new List<string>(); public List<string> DrugsListstr = new List<string>();
public List<string> SapsListstr = new List<string>();
public List<string> AfterDrugsListstr = new List<string>(); public List<string> AfterDrugsListstr = new List<string>();
public List<string> FluidListstr = new List<string>(); public List<string> FluidListstr = new List<string>();
public List<string> PunctureAndIntubatio; public List<string> PunctureAndIntubatio;
@ -1346,6 +1347,7 @@ namespace DrawGraph
{ {
EventListstr = new List<string>(); EventListstr = new List<string>();
DrugsListstr = new List<string>(); DrugsListstr = new List<string>();
SapsListstr = new List<string>();
FluidListstr = new List<string>(); FluidListstr = new List<string>();
PunctureAndIntubatio = new List<string>(); PunctureAndIntubatio = new List<string>();
BeforeDrugs = ""; BeforeDrugs = "";

View File

@ -609,17 +609,10 @@ namespace DrawGraph
//如果值有效,则写文本 //如果值有效,则写文本
if (pd.Value != Double.MaxValue) if (pd.Value != Double.MaxValue)
{ {
//if ((this.YAisx == 0 && Enname == "SPO2"))
//{
// ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), (zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height) + 0.003, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true);
//}
//else
//{
if (showValue != -1)
{
//double y = 0.0135 + (5 - showValue) * 0.0103;
if (Enname == "MAC") if (Enname == "MAC")
{
ZUtil.DrawText((Math.Floor(pd.Value * 10) / 10).ToString(), getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); ZUtil.DrawText((Math.Floor(pd.Value * 10) / 10).ToString(), getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true);
}
else if (Enname == "Temp") else if (Enname == "Temp")
{ {
ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 4.2f, true); ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 4.2f, true);
@ -629,25 +622,6 @@ namespace DrawGraph
ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true); ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), showValue, zgcAnas, this.Enname + pd.RecordTime.ToString(), 5f, true);
} }
} }
else
{
if (YAisx == 0)
{
//ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 240, 200, 20), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true);
ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 240, 0), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true);
}
else if (YAisx == 1)
{
ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 105, 45), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true);
}
else if (YAisx == 2)
{
ZUtil.DrawText(viewValue, getXPositinByXDate(pd.RecordTime), getYPositinByValue(pd.Y, 42, 18), zgcAnas, this.Enname + pd.RecordTime.ToString(), 3f, true);
}
}
//}
}
} }
} }
/// <summary> /// <summary>
@ -685,7 +659,7 @@ namespace DrawGraph
private void onlyMoveText(PhysioData newPd, PhysioData oldPd = null) private void onlyMoveText(PhysioData newPd, PhysioData oldPd = null)
{ {
TextObj text = (TextObj)zgcAnas.MasterPane.GraphObjList[this.Enname + ((oldPd == null) ? newPd.RecordTime.ToString() : oldPd.RecordTime.ToString())]; TextObj text = (TextObj)zgcAnas.MasterPane.GraphObjList[this.Enname + ((oldPd == null) ? newPd.RecordTime.ToString() : oldPd.RecordTime.ToString())];
text.Location.Y = getYPositinByValue(newPd.Y, 240, 200, 20); text.Location.Y = showValue;
text.Text = ((int)newPd.Value).ToString(); text.Text = ((int)newPd.Value).ToString();
} }
public void ModItem(PhysioData oldPd, PhysioData newPd) public void ModItem(PhysioData oldPd, PhysioData newPd)
@ -803,11 +777,6 @@ namespace DrawGraph
return pd; return pd;
} }
} }
//maxPhysioData = PointPairToPhysioData(APhysioParams[0]);
//if (!pd.isEquert(maxPhysioData))
//{
// pd.RecordTime = maxPhysioData.RecordTime.AddMinutes(-this.X_MINOR_GRID_STEP);
//}
return pd; return pd;
} }
@ -884,7 +853,6 @@ namespace DrawGraph
{ {
if (zgcAnas == null) if (zgcAnas == null)
{ {
//MessageBox.Show("未传递窗体或传递的不是麻醉单窗体");
return; return;
} }
@ -896,19 +864,10 @@ namespace DrawGraph
curve.Label.IsVisible = this.isValid; curve.Label.IsVisible = this.isValid;
curve.Symbol.IsVisible = this.isValid; curve.Symbol.IsVisible = this.isValid;
curve.Line.IsVisible = isValidLine; curve.Line.IsVisible = isValidLine;
//if (this.isValid && showStyle == "显示数值")
//{
// curve.Symbol.IsVisible = false;
//}
curve.Label.FontSpec = new FontSpec("微软雅黑", 5.9f, System.Drawing.Color.Black, false, false, false); curve.Label.FontSpec = new FontSpec("微软雅黑", 5.9f, System.Drawing.Color.Black, false, false, false);
curve.Label.FontSpec.Border.IsVisible = false; curve.Label.FontSpec.Border.IsVisible = false;
curve.Label.FontSpec.Fill.IsVisible = false; curve.Label.FontSpec.Fill.IsVisible = false;
//if (!canClick)
//{
// curve.Label.FontSpec = new FontSpec("微软雅黑", 5.1f, Color.Gray, false, false, false);
// curve.Label.FontSpec.Border.IsVisible = false;
//}
} }
public PhysioData PointPairToPhysioData(PointPair pp) public PhysioData PointPairToPhysioData(PointPair pp)
@ -939,14 +898,8 @@ namespace DrawGraph
delAddObj(pd); delAddObj(pd);
} }
} }
//foreach (PointPair pp in APhysioParams)
//{
// PhysioData pd = PointPairToPhysioData(pp);
// if (pd != null && pd.Value == HighLimit) delAddObj(pd);
//}
if (APhysioParams == null || curve == null) return; if (APhysioParams == null || curve == null) return;
APhysioParams.Clear(); APhysioParams.Clear();
//APhysioParams = new PointPairList();
curve.Points = APhysioParams; curve.Points = APhysioParams;
} }
/// <summary> /// <summary>

View File

@ -75,6 +75,8 @@ namespace DrawGraph
chartPack = GetPackObjectOTag("PhysioDataManage_ChartPackObj_6") as ChartPackObj; chartPack = GetPackObjectOTag("PhysioDataManage_ChartPackObj_6") as ChartPackObj;
//自己要用的手术对象 //自己要用的手术对象
myOpeRecord = OpeRecord as OperationRecord; myOpeRecord = OpeRecord as OperationRecord;
//myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max;
//myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min;
} }
/// <summary> /// <summary>
@ -544,6 +546,8 @@ namespace DrawGraph
aSyncTip = TipBox.CreateInstance("async"); aSyncTip = TipBox.CreateInstance("async");
aSyncTip.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); aSyncTip.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN));
myOpeRecord.SAreaObj.maxnumber = ZedControl.GraphPane.YAxis.Scale.Max;
myOpeRecord.SAreaObj.minnumber = ZedControl.GraphPane.YAxis.Scale.Min;
DrawPhysioData(); DrawPhysioData();
} }
@ -637,7 +641,7 @@ namespace DrawGraph
int B = int.Parse(str[3].ToString()); int B = int.Parse(str[3].ToString());
pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B); pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B);
if (pp.IsDefalultShow == false) if (pp.IsDefalultShow == false || (pp.ShowImg == false && pp.ShowText == false))
{ {
pp.showStyle = "不显示"; pp.showStyle = "不显示";
pp.IsValid = false; pp.IsValid = false;
@ -654,6 +658,7 @@ namespace DrawGraph
pp.showStyle = "显示数值"; pp.showStyle = "显示数值";
pp.IsValid = true; pp.IsValid = true;
} }
} }
pp.ClearTagstr(ZedControl); pp.ClearTagstr(ZedControl);
//如果模板管理不为空 //如果模板管理不为空
@ -734,7 +739,7 @@ namespace DrawGraph
int B = int.Parse(str[3].ToString()); int B = int.Parse(str[3].ToString());
pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B); pp.ConveColor = System.Drawing.Color.FromArgb(A, R, G, B);
if (pp.IsDefalultShow == false) if (pp.IsDefalultShow == false || (pp.ShowImg == false && pp.ShowText == false))
{ {
pp.showStyle = "不显示"; pp.showStyle = "不显示";
pp.IsValid = false; pp.IsValid = false;

View File

@ -180,6 +180,8 @@ namespace DrawGraph
//用药备注 //用药备注
SetRemarkInfo(myOpeRecord.DrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); SetRemarkInfo(myOpeRecord.DrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength);
//液体备注
SetRemarkInfo(myOpeRecord.SapsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength);
//术后镇痛药备注 //术后镇痛药备注
SetRemarkInfo(myOpeRecord.AfterDrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength); SetRemarkInfo(myOpeRecord.AfterDrugsListstr, remarkRowscount, ref x, ref remarkRow, ref AllRemarkRow, fontsize, ref fontlength);

View File

@ -132,8 +132,8 @@ namespace DrawGraph
DateTime serverTime = DateTime.Now; DateTime serverTime = DateTime.Now;
if (curTimeTemp > serverTime) curTimeTemp = serverTime; if (curTimeTemp > serverTime) curTimeTemp = serverTime;
//超出的药画备注 镇痛药备注 //超出的药画备注 镇痛药备注
List<string> DrugListstr = new List<string>(); List<string> SapListstr = new List<string>();
DrugListstr.Add("【手术用药】"); SapListstr.Add("【手术用液】");
myOpeRecord.BeforeDrugs = ""; myOpeRecord.BeforeDrugs = "";
myOpeRecord.AnalgesiaDrug = ""; myOpeRecord.AnalgesiaDrug = "";
//当前时间段加药集合 //当前时间段加药集合
@ -186,7 +186,7 @@ namespace DrawGraph
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
temp.drawText(H3pack.RealX + 0.006f, drugsy); temp.drawText(H3pack.RealX + 0.006f, drugsy);
else else
ListAddDrugs(DrugListstr, i, temp); ListAddDrugs(SapListstr, i, temp);
foreach (FactDrug item in temp.ChildFactDrugList) foreach (FactDrug item in temp.ChildFactDrugList)
{ {
foreach (FactDrug addDrug1item in addDrug1.ChildFactDrugList) foreach (FactDrug addDrug1item in addDrug1.ChildFactDrugList)
@ -202,7 +202,7 @@ namespace DrawGraph
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
item.drawText(H3pack.RealX + 0.006f, drugsy); item.drawText(H3pack.RealX + 0.006f, drugsy);
else else
ListAddDrugs(DrugListstr, i, item); ListAddDrugs(SapListstr, i, item);
continue; continue;
} }
} }
@ -218,7 +218,7 @@ namespace DrawGraph
rowDrugsIndex++; rowDrugsIndex++;
} }
else else
ListAddDrugs(DrugListstr, i, temp); ListAddDrugs(SapListstr, i, temp);
if (temp.ChildFactDrugList.Count > 0) if (temp.ChildFactDrugList.Count > 0)
{ {
foreach (FactDrug sItem in temp.ChildFactDrugList) foreach (FactDrug sItem in temp.ChildFactDrugList)
@ -230,7 +230,7 @@ namespace DrawGraph
sItem.drawText(H3pack.RealX + 0.006f, drugsy); sItem.drawText(H3pack.RealX + 0.006f, drugsy);
rowDrugsIndex++; rowDrugsIndex++;
} }
else { ListAddDrugs(DrugListstr, i, sItem); } else { ListAddDrugs(SapListstr, i, sItem); }
} }
if (drugsy <= maxDrugsy) if (drugsy <= maxDrugsy)
DrawZuDragsLine(H3pack.RealX + 0.003f, drugsy, temp.nowY, temp); DrawZuDragsLine(H3pack.RealX + 0.003f, drugsy, temp.nowY, temp);
@ -238,7 +238,7 @@ namespace DrawGraph
} }
} }
myOpeRecord.DrugsListstr = DrugListstr; myOpeRecord.SapsListstr = SapListstr;
} }
catch (Exception ex) catch (Exception ex)

View File

@ -125,18 +125,10 @@ namespace DrawGraph
dgvZd.Columns[1].HeaderText = aEdit.ControlTitleText; dgvZd.Columns[1].HeaderText = aEdit.ControlTitleText;
System.Drawing.Point point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y + aEdit.CControl.Height); System.Drawing.Point point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y + aEdit.CControl.Height);
dgvZd.Size = new System.Drawing.Size(aEdit.CControl.Width < 150 ? 149 : aEdit.CControl.Width, dgvZd.Height); dgvZd.Size = new System.Drawing.Size(aEdit.CControl.Width < 200 ? 199 : aEdit.CControl.Width, dgvZd.Height);
if (_aEdit.RealEndY > 0.8) if (_aEdit.RealEndY > 0.8)
point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y - 300); point = new System.Drawing.Point(aEdit.CControl.Location.X, aEdit.CControl.Location.Y - 300);
dgvZd.Location = point; dgvZd.Location = point;
if (dgvZd.Size.Width < 150)
{
dgvZd.Columns[2].Visible = false;
}
else
{
dgvZd.Columns[2].Visible = true;
}
if (dgvZd.Parent == null) if (dgvZd.Parent == null)
aEdit.CControl.Parent.Controls.Add(dgvZd); aEdit.CControl.Parent.Controls.Add(dgvZd);

View File

@ -20,6 +20,10 @@ namespace DrawGraph
private float width = 0; private float width = 0;
private float height = 0; private float height = 0;
public double maxnumber = 300;
public double minnumber = 0;
private string tagName = TextPrefix.BT.ToString(); private string tagName = TextPrefix.BT.ToString();
private bool selected = false; private bool selected = false;
@ -42,7 +46,7 @@ namespace DrawGraph
{ {
startPD = value; startPD = value;
startPoint.X = (float)(getXPositinByXDate(startPD.RecordTime)); startPoint.X = (float)(getXPositinByXDate(startPD.RecordTime));
startPoint.Y = (float)(getYPositinByValue(startPD.Y, 240, 200, 20)); startPoint.Y = (float)(getYPositinByValue(startPD.Y, maxnumber, minnumber));
} }
} }
/// <summary> /// <summary>
@ -55,7 +59,7 @@ namespace DrawGraph
{ {
endPd = value; endPd = value;
endPoint.X = (float)(getXPositinByXDate(endPd.RecordTime)); endPoint.X = (float)(getXPositinByXDate(endPd.RecordTime));
endPoint.Y = (float)(getYPositinByValue(endPd.Y, 240, 200, 20)); endPoint.Y = (float)(getYPositinByValue(endPd.Y, maxnumber, minnumber));
width = endPoint.X - startPoint.X; width = endPoint.X - startPoint.X;
height = endPoint.Y - startPoint.Y; height = endPoint.Y - startPoint.Y;
} }

View File

@ -211,37 +211,33 @@ namespace DrawGraph
//xMaxDate - xMinDate 0.16666666651144624 ;xMinPF = 0.15 ??? //xMaxDate - xMinDate 0.16666666651144624 ;xMinPF = 0.15 ???
} }
/// <summary> ///// <summary>
/// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标 ///// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标
/// </summary> ///// </summary>
/// <param name="eDate">日期时间</param> ///// <param name="eDate">日期时间</param>
/// <returns>x</returns> ///// <returns>x</returns>
public double getYPositinByValue(double value, int ymax, int maxnumber, int minnumber) //public double getYPositinByValue(double value, int ymax, double maxnumber, double minnumber)
{ //{
//zgcAnas.GraphPane.Rect.Height = 1606; // double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976
//zgcAnas.GraphPane.Chart.Rect.Top=687.368 // double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674
//zgcAnas.GraphPane.Chart.Rect.Height=472.164 // double Minvalue = (yMaxPF - yMinPF) / ymax * ((ymax - maxnumber) / 2);// *(value - 50);
//height 50 // yMinPF = yMinPF + Minvalue;
double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976 // yMaxPF = yMaxPF - Minvalue;
double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674 // double endvalue = (yMaxPF - yMinPF) / maxnumber * (value - minnumber);
double Minvalue = (yMaxPF - yMinPF) / ymax * ((ymax - maxnumber) / 2);// *(value - 50); // return yMaxPF - endvalue - 0.004;
yMinPF = yMinPF + Minvalue; //}
yMaxPF = yMaxPF - Minvalue;
double endvalue = (yMaxPF - yMinPF) / maxnumber * (value - minnumber);
return yMaxPF - endvalue - 0.004;
}
/// <summary> /// <summary>
/// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标 /// 根据所给时间值计算其中在ZedGraph图中x的CoordType.PaneFraction浮点坐标
/// </summary> /// </summary>
/// <param name="eDate">日期时间</param> /// <param name="eDate">日期时间</param>
/// <returns>x</returns> /// <returns>x</returns>
public double getYPositinByValue(double value, int ymax, int minnumber) public double getYPositinByValue(double value, double ymax, double minnumber)
{ {
double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976 double yMinPF = zgcAnas.GraphPane.Chart.Rect.Top / zgcAnas.GraphPane.Rect.Height;//0.42799998814260976
double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674 double yMaxPF = (zgcAnas.GraphPane.Chart.Rect.Top + zgcAnas.GraphPane.Chart.Rect.Height) / zgcAnas.GraphPane.Rect.Height;//0.72199998905471674
double endvalue = (yMaxPF - yMinPF) / (ymax - minnumber) * (value - minnumber); double endvalue = (yMaxPF - yMinPF) / (ymax - minnumber) * (value - minnumber);
return yMaxPF - endvalue - 0.004; return yMaxPF - endvalue - 0.001;
} }
/// <summary> /// <summary>