From 2c7f4cdab2f69c5f404d1ef6fb7f746127a5bf30 Mon Sep 17 00:00:00 2001 From: leomon Date: Wed, 16 Nov 2022 23:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E5=8D=95=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=B7=A6=E6=96=9C=E6=9D=A0=20=E5=99=A8?= =?UTF-8?q?=E6=A2=B0=E6=B8=85=E7=82=B9=E5=8D=95=E5=BA=94=E7=94=A8=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/FormMainManage.cs | 68 +- .../frmAnasRecordInstrument.Designer.cs | 922 +++++++++--------- .../AnasRecordBill/frmAnasRecordInstrument.cs | 2 +- .../frmAnasRecordInstrument2.Designer.cs | 82 +- .../frmSelectPatientGoodsBill.cs | 2 +- .../frmOperationSchedulePlan.cs | 101 +- .../frmOperationSchedulePlan.resx | 2 +- .../UCOperationGoodsBill5.designer.cs | 36 +- DrawGraph/AreaManage/InstrumentDataManage.cs | 52 +- DrawGraph/Graph/ZUtil.cs | 13 + 10 files changed, 679 insertions(+), 601 deletions(-) diff --git a/AIMS/FormMainManage.cs b/AIMS/FormMainManage.cs index f9fc776..4eb1bb9 100644 --- a/AIMS/FormMainManage.cs +++ b/AIMS/FormMainManage.cs @@ -1,10 +1,13 @@ using AIMS.DocManager; +using AIMS.OperationDoing.AnasRecordBill; using AIMS.OperationDoing.AnasRecordBill.UI; using AIMSBLL; using AIMSModel; using DCSoftDotfuscate; using DevComponents.DotNetBar; +using DevComponents.DotNetBar.Controls; using DocumentManagement; +using DrawGraph; using System; using System.Collections.Generic; using System.Data; @@ -194,22 +197,38 @@ namespace AIMS this.sideNav1.Items.Add(sideNavItem); } - Task.Factory.StartNew(() => - { + LoadDataRescue(); + } + private System.Windows.Forms.Timer timerLoadRescue; + + public void LoadDataRescue() + { + timerLoadRescue = new System.Windows.Forms.Timer(components); + 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) + { + timerLoadRescue.Dispose(); + + //Task.Factory.StartNew(() => + //{ BindOperationsList(lv1, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")), DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(1), labTa, true); BindOperationsList(lv3, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(1), DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(2), labTo, true); BindOperationsList(lv5, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(-7), DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddDays(1), labWeek, true, true); - }); + //}); - Task.Factory.StartNew(() => - { + //Task.Factory.StartNew(() => + //{ BindOperationsListChart(); BindOperationsListChart2(); BindfrmNoticeMain(); - }); + //}); } - public void BindOperationsList(DevComponents.DotNetBar.Controls.DataGridViewX lvex, DateTime beginTime, DateTime endTime, DevComponents.DotNetBar.LabelX labCount, bool isLoginPerson, bool isEnOpe = false) { lvex.Rows.Clear(); @@ -294,17 +313,28 @@ namespace AIMS string path = menu.Path; if (path.Length > 0) { - Form frm = GetForm(path); - if (menu.IsAloneOpen == 1) - sideNav1.IsMenuExpanded = false; - frm.TopLevel = false; - //frm.Dock = DockStyle.Fill; - frm.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - frm.WindowState = FormWindowState.Maximized; - sideNavItem.Panel.Controls.Clear(); - sideNavItem.Panel.Controls.Add(frm); - frm.Show(); - frm.BringToFront(); + try + { + Form frm = GetForm(path); + if (menu.IsAloneOpen == 1) + sideNav1.IsMenuExpanded = false; + frm.TopLevel = false; + frm.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + frm.WindowState = FormWindowState.Maximized; + sideNavItem.Panel.Controls.Clear(); + sideNavItem.Panel.Controls.Add(frm); + frm.Show(); + frm.BringToFront(); + } + catch (Exception ex) + { + if (path.Contains("MainFormManage")) + { + MainFormManage frm = new MainFormManage(); + frm.Show(); + frm.BringToFront(); + } + } } } public Form GetForm(string Path) @@ -406,7 +436,7 @@ namespace AIMS private void buttonX3_Click(object sender, EventArgs e) { AIMS.OperationFront.UI.frmOperationApplyDetail frmOperationApplyDetail = new AIMS.OperationFront.UI.frmOperationApplyDetail(); - frmOperationApplyDetail.State = AIMSExtension.EditState.ADD; + frmOperationApplyDetail.State = AIMSExtension.EditState.ADD; frmOperationApplyDetail.FormClosed += (ee, err) => { BindOperationsList(lv1, DateTime.Now, DateTime.Now.AddDays(1), labTa, true); diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs index 052ce80..d7ab11d 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs @@ -71,35 +71,6 @@ this.superTabMain = new DevComponents.DotNetBar.SuperTabControl(); this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel(); this.panelExZKZB = new DevComponents.DotNetBar.PanelEx(); - this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); - this.panelQX = new System.Windows.Forms.Panel(); - this.plBottom = new System.Windows.Forms.Panel(); - this.panelButton = new System.Windows.Forms.Panel(); - this.txtRemark = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.label18 = new System.Windows.Forms.Label(); - this.label26 = new System.Windows.Forms.Label(); - this.label27 = new System.Windows.Forms.Label(); - this.txtTourNurse = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.txtInstrumentNurse = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.panelQXList = new System.Windows.Forms.Panel(); - this.plTital = new System.Windows.Forms.Panel(); - this.panel15 = new System.Windows.Forms.Panel(); - this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.panel16 = new System.Windows.Forms.Panel(); - this.label65 = new System.Windows.Forms.Label(); - this.label57 = new System.Windows.Forms.Label(); - this.label59 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label66 = new System.Windows.Forms.Label(); - this.label58 = new System.Windows.Forms.Label(); - this.plTop = new System.Windows.Forms.Panel(); - this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); - this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); this.spTabQXQDD = new DevComponents.DotNetBar.SuperTabItem(); this.panel7 = new System.Windows.Forms.Panel(); this.panel21 = new System.Windows.Forms.Panel(); @@ -129,6 +100,35 @@ this.picInRoom = new System.Windows.Forms.PictureBox(); this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.panel8 = new AIMS.PublicUI.UI.DrawPanel(); + this.panelQX = new System.Windows.Forms.Panel(); + this.plBottom = new System.Windows.Forms.Panel(); + this.panelButton = new System.Windows.Forms.Panel(); + this.txtRemark = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label18 = new System.Windows.Forms.Label(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.txtTourNurse = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.txtInstrumentNurse = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelQXList = new System.Windows.Forms.Panel(); + this.plTital = new System.Windows.Forms.Panel(); + this.panel15 = new System.Windows.Forms.Panel(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.panel16 = new System.Windows.Forms.Panel(); + this.label65 = new System.Windows.Forms.Label(); + this.label57 = new System.Windows.Forms.Label(); + this.label59 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.label66 = new System.Windows.Forms.Label(); + this.label58 = new System.Windows.Forms.Label(); + this.plTop = new System.Windows.Forms.Panel(); + this.circularProgress1 = new DevComponents.DotNetBar.Controls.CircularProgress(); + this.zgcAnaesRecord = new DrawGraph.ZedGraphControl(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -138,13 +138,6 @@ this.superTabMain.SuspendLayout(); this.superTabControlPanel1.SuspendLayout(); this.panelExZKZB.SuspendLayout(); - this.panel8.SuspendLayout(); - this.panelQX.SuspendLayout(); - this.plBottom.SuspendLayout(); - this.panelButton.SuspendLayout(); - this.plTital.SuspendLayout(); - this.panel15.SuspendLayout(); - this.panel16.SuspendLayout(); this.panel7.SuspendLayout(); this.panel21.SuspendLayout(); this.plTitleEventTime.SuspendLayout(); @@ -160,6 +153,13 @@ this.panel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).BeginInit(); + this.panel8.SuspendLayout(); + this.panelQX.SuspendLayout(); + this.plBottom.SuspendLayout(); + this.panelButton.SuspendLayout(); + this.plTital.SuspendLayout(); + this.panel15.SuspendLayout(); + this.panel16.SuspendLayout(); this.SuspendLayout(); // // panel2 @@ -168,7 +168,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1924, 10); + this.panel2.Size = new System.Drawing.Size(1711, 10); this.panel2.TabIndex = 1; this.panel2.Visible = false; // @@ -180,7 +180,7 @@ this.panel3.Font = new System.Drawing.Font("瀹嬩綋", 12F); this.panel3.Location = new System.Drawing.Point(0, 10); 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; // // panel14 @@ -203,7 +203,7 @@ this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Location = new System.Drawing.Point(0, 0); 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; // // button9 @@ -517,9 +517,9 @@ this.panel4.Controls.Add(this.btnsbwh); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("瀹嬩綋", 10.5F); - this.panel4.Location = new System.Drawing.Point(1764, 10); + this.panel4.Location = new System.Drawing.Point(1551, 10); 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; // // lblSpo2 @@ -709,7 +709,7 @@ this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; this.btnsjzx.Image = global::AIMS.Properties.Resources.宸ヤ綔鍒楄〃; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnsjzx.Location = new System.Drawing.Point(0, 882); + this.btnsjzx.Location = new System.Drawing.Point(0, 781); this.btnsjzx.Name = "btnsjzx"; this.btnsjzx.Size = new System.Drawing.Size(160, 50); this.btnsjzx.TabIndex = 22; @@ -729,7 +729,7 @@ this.btndptz.ForeColor = System.Drawing.Color.DimGray; this.btndptz.Image = global::AIMS.Properties.Resources.鏂囦功鐘舵; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btndptz.Location = new System.Drawing.Point(0, 932); + this.btndptz.Location = new System.Drawing.Point(0, 831); this.btndptz.Name = "btndptz"; this.btndptz.Size = new System.Drawing.Size(160, 50); this.btndptz.TabIndex = 19; @@ -749,7 +749,7 @@ this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; this.btnsbwh.Image = global::AIMS.Properties.Resources.鑰楁潗绠＄悊; 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.Size = new System.Drawing.Size(160, 50); this.btnsbwh.TabIndex = 16; @@ -766,7 +766,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1924, 1042); + this.panel1.Size = new System.Drawing.Size(1711, 941); this.panel1.TabIndex = 0; // // panel5 @@ -779,7 +779,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1604, 1032); + this.panel5.Size = new System.Drawing.Size(1391, 931); this.panel5.TabIndex = 4; // // superTabMain @@ -806,7 +806,7 @@ this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.SelectedTabFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabIndex = 0; - this.superTabMain.Size = new System.Drawing.Size(1602, 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.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -819,7 +819,7 @@ this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904); + this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.spTabQXQDD; // @@ -832,7 +832,7 @@ this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1602, 904); + this.panelExZKZB.Size = new System.Drawing.Size(1389, 803); this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -842,403 +842,6 @@ this.panelExZKZB.Style.GradientAngle = 90; this.panelExZKZB.TabIndex = 0; // - // panel8 - // - this.panel8.AutoScroll = true; - this.panel8.BackColor = System.Drawing.Color.White; - this.panel8.Controls.Add(this.panelQX); - 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(1602, 904); - this.panel8.TabIndex = 2; - this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); - // - // panelQX - // - this.panelQX.BackColor = System.Drawing.Color.White; - this.panelQX.Controls.Add(this.plBottom); - this.panelQX.Controls.Add(this.plTop); - this.panelQX.Location = new System.Drawing.Point(217, 213); - this.panelQX.Margin = new System.Windows.Forms.Padding(0); - this.panelQX.Name = "panelQX"; - this.panelQX.Size = new System.Drawing.Size(1238, 562); - this.panelQX.TabIndex = 12; - this.panelQX.Visible = false; - // - // plBottom - // - this.plBottom.BackColor = System.Drawing.Color.White; - this.plBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.plBottom.Controls.Add(this.panelButton); - this.plBottom.Controls.Add(this.panelQXList); - this.plBottom.Controls.Add(this.plTital); - this.plBottom.Dock = System.Windows.Forms.DockStyle.Fill; - this.plBottom.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.plBottom.Location = new System.Drawing.Point(0, 2); - this.plBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.plBottom.Name = "plBottom"; - this.plBottom.Size = new System.Drawing.Size(1238, 560); - this.plBottom.TabIndex = 1355; - // - // panelButton - // - this.panelButton.Controls.Add(this.txtRemark); - this.panelButton.Controls.Add(this.label18); - this.panelButton.Controls.Add(this.label26); - this.panelButton.Controls.Add(this.label27); - this.panelButton.Controls.Add(this.txtTourNurse); - this.panelButton.Controls.Add(this.txtInstrumentNurse); - this.panelButton.Dock = System.Windows.Forms.DockStyle.Top; - this.panelButton.Location = new System.Drawing.Point(0, 425); - this.panelButton.Name = "panelButton"; - this.panelButton.Size = new System.Drawing.Size(1236, 141); - this.panelButton.TabIndex = 1351; - // - // txtRemark - // - this.txtRemark.BackColor = System.Drawing.Color.White; - // - // - // - this.txtRemark.Border.BackColor = System.Drawing.SystemColors.Desktop; - this.txtRemark.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtRemark.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); - this.txtRemark.Border.BorderBottomWidth = 1; - this.txtRemark.Border.BorderColor = System.Drawing.SystemColors.Desktop; - this.txtRemark.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtRemark.Border.BorderLeftWidth = 1; - this.txtRemark.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtRemark.Border.BorderRightWidth = 1; - this.txtRemark.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtRemark.Border.BorderTopWidth = 1; - this.txtRemark.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtRemark.DisabledBackColor = System.Drawing.Color.White; - this.txtRemark.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F); - this.txtRemark.ForeColor = System.Drawing.Color.Black; - this.txtRemark.Location = new System.Drawing.Point(103, 25); - this.txtRemark.Multiline = true; - this.txtRemark.Name = "txtRemark"; - this.txtRemark.Size = new System.Drawing.Size(722, 75); - this.txtRemark.TabIndex = 849; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); - this.label18.Location = new System.Drawing.Point(37, 48); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(42, 21); - this.label18.TabIndex = 851; - this.label18.Text = "澶囨敞"; - // - // label26 - // - this.label26.AutoSize = true; - this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); - this.label26.Location = new System.Drawing.Point(873, 25); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(74, 21); - this.label26.TabIndex = 851; - this.label26.Text = "宸″洖鎶ゅ＋"; - // - // label27 - // - this.label27.AutoSize = true; - this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); - this.label27.Location = new System.Drawing.Point(873, 78); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(74, 21); - this.label27.TabIndex = 850; - this.label27.Text = "鍣ㄦ鎶ゅ＋"; - // - // txtTourNurse - // - this.txtTourNurse.BackColor = System.Drawing.Color.White; - // - // - // - this.txtTourNurse.Border.BackColor = System.Drawing.SystemColors.Desktop; - this.txtTourNurse.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtTourNurse.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); - this.txtTourNurse.Border.BorderBottomWidth = 1; - this.txtTourNurse.Border.BorderColor = System.Drawing.SystemColors.Desktop; - this.txtTourNurse.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtTourNurse.Border.BorderLeftWidth = 1; - this.txtTourNurse.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtTourNurse.Border.BorderRightWidth = 1; - this.txtTourNurse.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtTourNurse.Border.BorderTopWidth = 1; - this.txtTourNurse.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtTourNurse.DisabledBackColor = System.Drawing.Color.White; - this.txtTourNurse.ForeColor = System.Drawing.Color.Black; - this.txtTourNurse.Location = new System.Drawing.Point(953, 24); - this.txtTourNurse.Name = "txtTourNurse"; - this.txtTourNurse.Size = new System.Drawing.Size(116, 22); - this.txtTourNurse.TabIndex = 847; - this.txtTourNurse.Click += new System.EventHandler(this.txtTourNurse_Click); - // - // txtInstrumentNurse - // - this.txtInstrumentNurse.BackColor = System.Drawing.Color.White; - // - // - // - this.txtInstrumentNurse.Border.BackColor = System.Drawing.SystemColors.Desktop; - this.txtInstrumentNurse.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtInstrumentNurse.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); - this.txtInstrumentNurse.Border.BorderBottomWidth = 1; - this.txtInstrumentNurse.Border.BorderColor = System.Drawing.SystemColors.Desktop; - this.txtInstrumentNurse.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtInstrumentNurse.Border.BorderLeftWidth = 1; - this.txtInstrumentNurse.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtInstrumentNurse.Border.BorderRightWidth = 1; - this.txtInstrumentNurse.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; - this.txtInstrumentNurse.Border.BorderTopWidth = 1; - this.txtInstrumentNurse.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.txtInstrumentNurse.DisabledBackColor = System.Drawing.Color.White; - this.txtInstrumentNurse.ForeColor = System.Drawing.Color.Black; - this.txtInstrumentNurse.Location = new System.Drawing.Point(953, 77); - this.txtInstrumentNurse.Name = "txtInstrumentNurse"; - this.txtInstrumentNurse.Size = new System.Drawing.Size(116, 22); - this.txtInstrumentNurse.TabIndex = 848; - this.txtInstrumentNurse.Click += new System.EventHandler(this.txtInstrumentNurse_Click); - // - // panelQXList - // - this.panelQXList.Dock = System.Windows.Forms.DockStyle.Top; - this.panelQXList.Location = new System.Drawing.Point(0, 47); - this.panelQXList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panelQXList.Name = "panelQXList"; - this.panelQXList.Size = new System.Drawing.Size(1236, 378); - this.panelQXList.TabIndex = 1350; - // - // plTital - // - this.plTital.BackColor = System.Drawing.SystemColors.Control; - this.plTital.Controls.Add(this.panel15); - this.plTital.Controls.Add(this.panel16); - this.plTital.Dock = System.Windows.Forms.DockStyle.Top; - this.plTital.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.plTital.Location = new System.Drawing.Point(0, 0); - this.plTital.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.plTital.Name = "plTital"; - this.plTital.Size = new System.Drawing.Size(1236, 47); - this.plTital.TabIndex = 1349; - // - // panel15 - // - this.panel15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel15.Controls.Add(this.label11); - this.panel15.Controls.Add(this.label12); - this.panel15.Controls.Add(this.label13); - this.panel15.Controls.Add(this.label14); - this.panel15.Controls.Add(this.label17); - this.panel15.Controls.Add(this.label15); - this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel15.Location = new System.Drawing.Point(618, 0); - this.panel15.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(618, 47); - this.panel15.TabIndex = 13; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label11.Location = new System.Drawing.Point(73, 5); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(32, 34); - this.label11.TabIndex = 9; - this.label11.Text = "鍣ㄦ\r\n鍚嶇О"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label12.Location = new System.Drawing.Point(174, 5); - this.label12.Margin = new System.Windows.Forms.Padding(0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(32, 34); - this.label12.TabIndex = 10; - this.label12.Text = "鏈墠\r\n娓呯偣"; - this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(273, 5); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(32, 34); - this.label13.TabIndex = 12; - this.label13.Text = "鏈腑\r\n鍔犳暟"; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(360, 5); - this.label14.Margin = new System.Windows.Forms.Padding(0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(32, 34); - this.label14.TabIndex = 8; - this.label14.Text = "鍏充綋\r\n鑵斿墠"; - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(532, 5); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(32, 34); - this.label17.TabIndex = 11; - this.label17.Text = "缂濆悎\r\n鐨悗"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(444, 5); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(32, 34); - this.label15.TabIndex = 11; - this.label15.Text = "鍏充綋\r\n鑵斿悗"; - // - // panel16 - // - this.panel16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel16.Controls.Add(this.label65); - this.panel16.Controls.Add(this.label57); - this.panel16.Controls.Add(this.label59); - this.panel16.Controls.Add(this.label16); - this.panel16.Controls.Add(this.label66); - this.panel16.Controls.Add(this.label58); - this.panel16.Dock = System.Windows.Forms.DockStyle.Left; - this.panel16.Location = new System.Drawing.Point(0, 0); - this.panel16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.panel16.Name = "panel16"; - this.panel16.Size = new System.Drawing.Size(618, 47); - this.panel16.TabIndex = 11; - // - // label65 - // - this.label65.AutoSize = true; - this.label65.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label65.Location = new System.Drawing.Point(74, 5); - this.label65.Name = "label65"; - this.label65.Size = new System.Drawing.Size(32, 34); - this.label65.TabIndex = 9; - this.label65.Text = "鍣ㄦ\r\n鍚嶇О"; - // - // label57 - // - this.label57.AutoSize = true; - this.label57.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label57.Location = new System.Drawing.Point(175, 5); - this.label57.Margin = new System.Windows.Forms.Padding(0); - this.label57.Name = "label57"; - this.label57.Size = new System.Drawing.Size(32, 34); - this.label57.TabIndex = 10; - this.label57.Text = "鏈墠\r\n娓呯偣"; - this.label57.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label59 - // - this.label59.AutoSize = true; - this.label59.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label59.Location = new System.Drawing.Point(355, 5); - this.label59.Margin = new System.Windows.Forms.Padding(0); - this.label59.Name = "label59"; - this.label59.Size = new System.Drawing.Size(32, 34); - this.label59.TabIndex = 8; - this.label59.Text = "鍏充綋\r\n鑵斿墠"; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(539, 5); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(32, 34); - this.label16.TabIndex = 11; - this.label16.Text = "缂濆悎\r\n鐨悗"; - // - // label66 - // - this.label66.AutoSize = true; - this.label66.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label66.Location = new System.Drawing.Point(452, 5); - this.label66.Name = "label66"; - this.label66.Size = new System.Drawing.Size(32, 34); - this.label66.TabIndex = 11; - this.label66.Text = "鍏充綋\r\n鑵斿悗"; - // - // label58 - // - this.label58.AutoSize = true; - this.label58.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label58.Location = new System.Drawing.Point(268, 5); - this.label58.Name = "label58"; - this.label58.Size = new System.Drawing.Size(32, 34); - this.label58.TabIndex = 12; - this.label58.Text = "鏈腑\r\n鍔犳暟"; - // - // plTop - // - this.plTop.BackColor = System.Drawing.Color.White; - this.plTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.plTop.Dock = System.Windows.Forms.DockStyle.Top; - this.plTop.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.plTop.Location = new System.Drawing.Point(0, 0); - this.plTop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.plTop.Name = "plTop"; - this.plTop.Size = new System.Drawing.Size(1238, 2); - this.plTop.TabIndex = 22; - // - // 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 // this.spTabQXQDD.AttachedControl = this.superTabControlPanel1; @@ -1255,9 +858,9 @@ this.panel7.Controls.Add(this.labOperatorName); this.panel7.Controls.Add(this.label19); 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.Size = new System.Drawing.Size(1602, 40); + this.panel7.Size = new System.Drawing.Size(1389, 40); this.panel7.TabIndex = 1; // // panel21 @@ -1267,7 +870,7 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1261, 0); + this.panel21.Location = new System.Drawing.Point(1048, 0); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.TabIndex = 10; @@ -1366,7 +969,7 @@ this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Name = "plTitleEventTime"; - this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58); + this.plTitleEventTime.Size = new System.Drawing.Size(1389, 58); this.plTitleEventTime.TabIndex = 0; // // panel13 @@ -1748,10 +1351,407 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // + // panel8 + // + this.panel8.AutoScroll = true; + this.panel8.BackColor = System.Drawing.Color.White; + this.panel8.Controls.Add(this.panelQX); + 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); + // + // panelQX + // + this.panelQX.BackColor = System.Drawing.Color.White; + this.panelQX.Controls.Add(this.plBottom); + this.panelQX.Controls.Add(this.plTop); + this.panelQX.Location = new System.Drawing.Point(217, 213); + this.panelQX.Margin = new System.Windows.Forms.Padding(0); + this.panelQX.Name = "panelQX"; + this.panelQX.Size = new System.Drawing.Size(952, 562); + this.panelQX.TabIndex = 12; + this.panelQX.Visible = false; + // + // plBottom + // + this.plBottom.BackColor = System.Drawing.Color.White; + this.plBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.plBottom.Controls.Add(this.panelButton); + this.plBottom.Controls.Add(this.panelQXList); + this.plBottom.Controls.Add(this.plTital); + this.plBottom.Dock = System.Windows.Forms.DockStyle.Fill; + this.plBottom.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.plBottom.Location = new System.Drawing.Point(0, 2); + this.plBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.plBottom.Name = "plBottom"; + this.plBottom.Size = new System.Drawing.Size(952, 560); + this.plBottom.TabIndex = 1355; + // + // panelButton + // + this.panelButton.Controls.Add(this.txtRemark); + this.panelButton.Controls.Add(this.label18); + this.panelButton.Controls.Add(this.label26); + this.panelButton.Controls.Add(this.label27); + this.panelButton.Controls.Add(this.txtTourNurse); + this.panelButton.Controls.Add(this.txtInstrumentNurse); + this.panelButton.Dock = System.Windows.Forms.DockStyle.Top; + this.panelButton.Location = new System.Drawing.Point(0, 425); + this.panelButton.Name = "panelButton"; + this.panelButton.Size = new System.Drawing.Size(950, 141); + this.panelButton.TabIndex = 1351; + // + // txtRemark + // + this.txtRemark.BackColor = System.Drawing.Color.White; + // + // + // + this.txtRemark.Border.BackColor = System.Drawing.SystemColors.Desktop; + this.txtRemark.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtRemark.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); + this.txtRemark.Border.BorderBottomWidth = 1; + this.txtRemark.Border.BorderColor = System.Drawing.SystemColors.Desktop; + this.txtRemark.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtRemark.Border.BorderLeftWidth = 1; + this.txtRemark.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtRemark.Border.BorderRightWidth = 1; + this.txtRemark.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtRemark.Border.BorderTopWidth = 1; + this.txtRemark.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtRemark.DisabledBackColor = System.Drawing.Color.White; + this.txtRemark.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F); + this.txtRemark.ForeColor = System.Drawing.Color.Black; + this.txtRemark.Location = new System.Drawing.Point(103, 25); + this.txtRemark.Multiline = true; + this.txtRemark.Name = "txtRemark"; + this.txtRemark.Size = new System.Drawing.Size(722, 75); + this.txtRemark.TabIndex = 849; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); + this.label18.Location = new System.Drawing.Point(37, 48); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(42, 21); + this.label18.TabIndex = 851; + this.label18.Text = "澶囨敞"; + // + // label26 + // + this.label26.AutoSize = true; + this.label26.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); + this.label26.Location = new System.Drawing.Point(37, 105); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(74, 21); + this.label26.TabIndex = 851; + this.label26.Text = "宸″洖鎶ゅ＋"; + // + // label27 + // + this.label27.AutoSize = true; + this.label27.Font = new System.Drawing.Font("寰蒋闆呴粦", 12F); + this.label27.Location = new System.Drawing.Point(519, 105); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(74, 21); + this.label27.TabIndex = 850; + this.label27.Text = "鍣ㄦ鎶ゅ＋"; + // + // txtTourNurse + // + this.txtTourNurse.BackColor = System.Drawing.Color.White; + // + // + // + this.txtTourNurse.Border.BackColor = System.Drawing.SystemColors.Desktop; + this.txtTourNurse.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtTourNurse.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); + this.txtTourNurse.Border.BorderBottomWidth = 1; + this.txtTourNurse.Border.BorderColor = System.Drawing.SystemColors.Desktop; + this.txtTourNurse.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtTourNurse.Border.BorderLeftWidth = 1; + this.txtTourNurse.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtTourNurse.Border.BorderRightWidth = 1; + this.txtTourNurse.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtTourNurse.Border.BorderTopWidth = 1; + this.txtTourNurse.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtTourNurse.DisabledBackColor = System.Drawing.Color.White; + this.txtTourNurse.ForeColor = System.Drawing.Color.Black; + this.txtTourNurse.Location = new System.Drawing.Point(129, 106); + this.txtTourNurse.Name = "txtTourNurse"; + this.txtTourNurse.Size = new System.Drawing.Size(120, 22); + this.txtTourNurse.TabIndex = 847; + this.txtTourNurse.Click += new System.EventHandler(this.txtTourNurse_Click); + // + // txtInstrumentNurse + // + this.txtInstrumentNurse.BackColor = System.Drawing.Color.White; + // + // + // + this.txtInstrumentNurse.Border.BackColor = System.Drawing.SystemColors.Desktop; + this.txtInstrumentNurse.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtInstrumentNurse.Border.BorderBottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(227)))), ((int)(((byte)(231))))); + this.txtInstrumentNurse.Border.BorderBottomWidth = 1; + this.txtInstrumentNurse.Border.BorderColor = System.Drawing.SystemColors.Desktop; + this.txtInstrumentNurse.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtInstrumentNurse.Border.BorderLeftWidth = 1; + this.txtInstrumentNurse.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtInstrumentNurse.Border.BorderRightWidth = 1; + this.txtInstrumentNurse.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid; + this.txtInstrumentNurse.Border.BorderTopWidth = 1; + this.txtInstrumentNurse.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.txtInstrumentNurse.DisabledBackColor = System.Drawing.Color.White; + this.txtInstrumentNurse.ForeColor = System.Drawing.Color.Black; + this.txtInstrumentNurse.Location = new System.Drawing.Point(599, 106); + this.txtInstrumentNurse.Name = "txtInstrumentNurse"; + this.txtInstrumentNurse.Size = new System.Drawing.Size(120, 22); + this.txtInstrumentNurse.TabIndex = 848; + this.txtInstrumentNurse.Click += new System.EventHandler(this.txtInstrumentNurse_Click); + // + // panelQXList + // + this.panelQXList.Dock = System.Windows.Forms.DockStyle.Top; + this.panelQXList.Location = new System.Drawing.Point(0, 47); + this.panelQXList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelQXList.Name = "panelQXList"; + this.panelQXList.Size = new System.Drawing.Size(950, 378); + this.panelQXList.TabIndex = 1350; + // + // plTital + // + this.plTital.BackColor = System.Drawing.SystemColors.Control; + this.plTital.Controls.Add(this.panel15); + this.plTital.Controls.Add(this.panel16); + this.plTital.Dock = System.Windows.Forms.DockStyle.Top; + this.plTital.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.plTital.Location = new System.Drawing.Point(0, 0); + this.plTital.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.plTital.Name = "plTital"; + this.plTital.Size = new System.Drawing.Size(950, 47); + this.plTital.TabIndex = 1349; + // + // panel15 + // + this.panel15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel15.Controls.Add(this.label11); + this.panel15.Controls.Add(this.label12); + this.panel15.Controls.Add(this.label13); + this.panel15.Controls.Add(this.label14); + this.panel15.Controls.Add(this.label17); + this.panel15.Controls.Add(this.label15); + this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel15.Location = new System.Drawing.Point(477, 0); + this.panel15.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel15.Name = "panel15"; + this.panel15.Size = new System.Drawing.Size(473, 47); + this.panel15.TabIndex = 13; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label11.Location = new System.Drawing.Point(42, 5); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(32, 34); + this.label11.TabIndex = 9; + this.label11.Text = "鍣ㄦ\r\n鍚嶇О"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label12.Location = new System.Drawing.Point(140, 5); + this.label12.Margin = new System.Windows.Forms.Padding(0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(32, 34); + this.label12.TabIndex = 10; + this.label12.Text = "鏈墠\r\n娓呯偣"; + this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label13.Location = new System.Drawing.Point(208, 5); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(32, 34); + this.label13.TabIndex = 12; + this.label13.Text = "鏈腑\r\n鍔犳暟"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label14.Location = new System.Drawing.Point(276, 5); + this.label14.Margin = new System.Windows.Forms.Padding(0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(32, 34); + this.label14.TabIndex = 8; + this.label14.Text = "鍏充綋\r\n鑵斿墠"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label17.Location = new System.Drawing.Point(412, 5); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(32, 34); + this.label17.TabIndex = 11; + this.label17.Text = "缂濆悎\r\n鐨悗"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label15.Location = new System.Drawing.Point(344, 5); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(32, 34); + this.label15.TabIndex = 11; + this.label15.Text = "鍏充綋\r\n鑵斿悗"; + // + // panel16 + // + this.panel16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel16.Controls.Add(this.label65); + this.panel16.Controls.Add(this.label57); + this.panel16.Controls.Add(this.label59); + this.panel16.Controls.Add(this.label16); + this.panel16.Controls.Add(this.label66); + this.panel16.Controls.Add(this.label58); + this.panel16.Dock = System.Windows.Forms.DockStyle.Left; + this.panel16.Location = new System.Drawing.Point(0, 0); + this.panel16.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel16.Name = "panel16"; + this.panel16.Size = new System.Drawing.Size(477, 47); + this.panel16.TabIndex = 11; + // + // label65 + // + this.label65.AutoSize = true; + this.label65.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label65.Location = new System.Drawing.Point(46, 5); + this.label65.Name = "label65"; + this.label65.Size = new System.Drawing.Size(32, 34); + this.label65.TabIndex = 9; + this.label65.Text = "鍣ㄦ\r\n鍚嶇О"; + // + // label57 + // + this.label57.AutoSize = true; + this.label57.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label57.Location = new System.Drawing.Point(139, 5); + this.label57.Margin = new System.Windows.Forms.Padding(0); + this.label57.Name = "label57"; + this.label57.Size = new System.Drawing.Size(32, 34); + this.label57.TabIndex = 10; + this.label57.Text = "鏈墠\r\n娓呯偣"; + this.label57.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label59 + // + this.label59.AutoSize = true; + this.label59.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label59.Location = new System.Drawing.Point(277, 5); + this.label59.Margin = new System.Windows.Forms.Padding(0); + this.label59.Name = "label59"; + this.label59.Size = new System.Drawing.Size(32, 34); + this.label59.TabIndex = 8; + this.label59.Text = "鍏充綋\r\n鑵斿墠"; + // + // label16 + // + this.label16.AutoSize = true; + this.label16.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label16.Location = new System.Drawing.Point(415, 5); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(32, 34); + this.label16.TabIndex = 11; + this.label16.Text = "缂濆悎\r\n鐨悗"; + // + // label66 + // + this.label66.AutoSize = true; + this.label66.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label66.Location = new System.Drawing.Point(346, 5); + this.label66.Name = "label66"; + this.label66.Size = new System.Drawing.Size(32, 34); + this.label66.TabIndex = 11; + this.label66.Text = "鍏充綋\r\n鑵斿悗"; + // + // label58 + // + this.label58.AutoSize = true; + this.label58.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label58.Location = new System.Drawing.Point(208, 5); + this.label58.Name = "label58"; + this.label58.Size = new System.Drawing.Size(32, 34); + this.label58.TabIndex = 12; + this.label58.Text = "鏈腑\r\n鍔犳暟"; + // + // plTop + // + this.plTop.BackColor = System.Drawing.Color.White; + this.plTop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.plTop.Dock = System.Windows.Forms.DockStyle.Top; + this.plTop.Font = new System.Drawing.Font("寰蒋闆呴粦", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.plTop.Location = new System.Drawing.Point(0, 0); + this.plTop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.plTop.Name = "plTop"; + this.plTop.Size = new System.Drawing.Size(952, 2); + this.plTop.TabIndex = 22; + // + // 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); + // // frmAnasRecordInstrument // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1924, 1042); + this.ClientSize = new System.Drawing.Size(1711, 941); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmAnasRecordInstrument"; @@ -1770,16 +1770,6 @@ this.superTabMain.ResumeLayout(false); this.superTabControlPanel1.ResumeLayout(false); this.panelExZKZB.ResumeLayout(false); - this.panel8.ResumeLayout(false); - this.panelQX.ResumeLayout(false); - this.plBottom.ResumeLayout(false); - this.panelButton.ResumeLayout(false); - this.panelButton.PerformLayout(); - this.plTital.ResumeLayout(false); - this.panel15.ResumeLayout(false); - this.panel15.PerformLayout(); - this.panel16.ResumeLayout(false); - this.panel16.PerformLayout(); this.panel7.ResumeLayout(false); this.panel7.PerformLayout(); this.panel21.ResumeLayout(false); @@ -1796,6 +1786,16 @@ this.panel6.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txtInRoom)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picInRoom)).EndInit(); + this.panel8.ResumeLayout(false); + this.panelQX.ResumeLayout(false); + this.plBottom.ResumeLayout(false); + this.panelButton.ResumeLayout(false); + this.panelButton.PerformLayout(); + this.plTital.ResumeLayout(false); + this.panel15.ResumeLayout(false); + this.panel15.PerformLayout(); + this.panel16.ResumeLayout(false); + this.panel16.PerformLayout(); this.ResumeLayout(false); } diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs index c5f4027..54e3c72 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs @@ -1807,7 +1807,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI private void button9_Click(object sender, EventArgs e) { - TextBoxAddEventSources(panelQX, @"\"); + TextBoxAddEventSources(panelQX, @"/"); } private void TextBoxAddEventSources(Control _panel, string TextValue) diff --git a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs index 404f288..51eb569 100644 --- a/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs +++ b/AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs @@ -33,6 +33,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel14 = new System.Windows.Forms.Panel(); + this.button9 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); @@ -199,7 +200,6 @@ this.picInRoom = new System.Windows.Forms.PictureBox(); this.txtInRoom1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.button9 = new System.Windows.Forms.Button(); this.panel3.SuspendLayout(); this.panel14.SuspendLayout(); this.panel4.SuspendLayout(); @@ -252,7 +252,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1924, 10); + this.panel2.Size = new System.Drawing.Size(1711, 10); this.panel2.TabIndex = 1; this.panel2.Visible = false; // @@ -264,7 +264,7 @@ this.panel3.Font = new System.Drawing.Font("瀹嬩綋", 12F); this.panel3.Location = new System.Drawing.Point(0, 10); 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; // // panel14 @@ -287,9 +287,29 @@ this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Location = new System.Drawing.Point(0, 0); 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; // + // button9 + // + this.button9.BackColor = System.Drawing.Color.Transparent; + this.button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.button9.Cursor = System.Windows.Forms.Cursors.Hand; + this.button9.Dock = System.Windows.Forms.DockStyle.Top; + this.button9.FlatAppearance.BorderSize = 0; + this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button9.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); + this.button9.ForeColor = System.Drawing.Color.DimGray; + this.button9.Image = global::AIMS.Properties.Resources.鎵嬫湳鐢宠; + this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button9.Location = new System.Drawing.Point(0, 650); + this.button9.Name = "button9"; + this.button9.Size = new System.Drawing.Size(160, 50); + this.button9.TabIndex = 17; + this.button9.Text = " 榛樿"; + this.button9.UseVisualStyleBackColor = false; + this.button9.Click += new System.EventHandler(this.button9_Click); + // // button1 // this.button1.BackColor = System.Drawing.Color.Transparent; @@ -578,9 +598,9 @@ this.panel4.Controls.Add(this.label1); this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Font = new System.Drawing.Font("瀹嬩綋", 10.5F); - this.panel4.Location = new System.Drawing.Point(1764, 10); + this.panel4.Location = new System.Drawing.Point(1551, 10); 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; // // btnChage @@ -595,7 +615,7 @@ this.btnChage.ForeColor = System.Drawing.Color.DimGray; this.btnChage.Image = global::AIMS.Properties.Resources.楹婚唹鍖诲槺; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnChage.Location = new System.Drawing.Point(0, 832); + this.btnChage.Location = new System.Drawing.Point(0, 731); this.btnChage.Name = "btnChage"; this.btnChage.Size = new System.Drawing.Size(160, 50); this.btnChage.TabIndex = 24; @@ -671,7 +691,7 @@ this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; this.btnsjzx.Image = global::AIMS.Properties.Resources.宸ヤ綔鍒楄〃; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnsjzx.Location = new System.Drawing.Point(0, 882); + this.btnsjzx.Location = new System.Drawing.Point(0, 781); this.btnsjzx.Name = "btnsjzx"; this.btnsjzx.Size = new System.Drawing.Size(160, 50); this.btnsjzx.TabIndex = 22; @@ -691,7 +711,7 @@ this.btndptz.ForeColor = System.Drawing.Color.DimGray; this.btndptz.Image = global::AIMS.Properties.Resources.鏂囦功鐘舵; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btndptz.Location = new System.Drawing.Point(0, 932); + this.btndptz.Location = new System.Drawing.Point(0, 831); this.btndptz.Name = "btndptz"; this.btndptz.Size = new System.Drawing.Size(160, 50); this.btndptz.TabIndex = 19; @@ -711,7 +731,7 @@ this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; this.btnsbwh.Image = global::AIMS.Properties.Resources.鑰楁潗绠＄悊; 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.Size = new System.Drawing.Size(160, 50); this.btnsbwh.TabIndex = 16; @@ -848,7 +868,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1924, 1042); + this.panel1.Size = new System.Drawing.Size(1711, 941); this.panel1.TabIndex = 0; // // panel5 @@ -861,7 +881,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1604, 1032); + this.panel5.Size = new System.Drawing.Size(1391, 931); this.panel5.TabIndex = 4; // // superTabMain @@ -889,7 +909,7 @@ this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.SelectedTabFont = new System.Drawing.Font("瀹嬩綋", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabIndex = 0; - this.superTabMain.Size = new System.Drawing.Size(1602, 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.TabIndex = 14; this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -903,7 +923,7 @@ this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Name = "superTabControlPanel1"; - this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904); + this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803); this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabItem = this.spTabQXQDD; // @@ -916,7 +936,7 @@ this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Name = "panelExZKZB"; - this.panelExZKZB.Size = new System.Drawing.Size(1602, 904); + this.panelExZKZB.Size = new System.Drawing.Size(1389, 803); this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -936,7 +956,7 @@ 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(1602, 904); + this.panel8.Size = new System.Drawing.Size(1389, 803); this.panel8.TabIndex = 2; this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); // @@ -2137,9 +2157,9 @@ this.panel7.Controls.Add(this.labOperatorName); this.panel7.Controls.Add(this.label19); 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.Size = new System.Drawing.Size(1602, 40); + this.panel7.Size = new System.Drawing.Size(1389, 40); this.panel7.TabIndex = 1; // // panel21 @@ -2149,7 +2169,7 @@ this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plRefresh); this.panel21.Dock = System.Windows.Forms.DockStyle.Right; - this.panel21.Location = new System.Drawing.Point(1261, 0); + this.panel21.Location = new System.Drawing.Point(1048, 0); this.panel21.Name = "panel21"; this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.TabIndex = 10; @@ -2248,7 +2268,7 @@ this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Name = "plTitleEventTime"; - this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58); + this.plTitleEventTime.Size = new System.Drawing.Size(1389, 58); this.plTitleEventTime.TabIndex = 0; // // panel13 @@ -2630,30 +2650,10 @@ this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.TabIndex = 0; // - // button9 - // - this.button9.BackColor = System.Drawing.Color.Transparent; - this.button9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.button9.Cursor = System.Windows.Forms.Cursors.Hand; - this.button9.Dock = System.Windows.Forms.DockStyle.Top; - this.button9.FlatAppearance.BorderSize = 0; - this.button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button9.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); - this.button9.ForeColor = System.Drawing.Color.DimGray; - this.button9.Image = global::AIMS.Properties.Resources.鎵嬫湳鐢宠; - this.button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button9.Location = new System.Drawing.Point(0, 650); - this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(160, 50); - this.button9.TabIndex = 17; - this.button9.Text = " 榛樿"; - this.button9.UseVisualStyleBackColor = false; - this.button9.Click += new System.EventHandler(this.button9_Click); - // // frmAnasRecordInstrument2 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1924, 1042); + this.ClientSize = new System.Drawing.Size(1711, 941); this.Controls.Add(this.panel1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmAnasRecordInstrument2"; diff --git a/AIMS/OperationDoing/oldSystemCode/frmSelectPatientGoodsBill.cs b/AIMS/OperationDoing/oldSystemCode/frmSelectPatientGoodsBill.cs index d52a0c1..7bec467 100644 --- a/AIMS/OperationDoing/oldSystemCode/frmSelectPatientGoodsBill.cs +++ b/AIMS/OperationDoing/oldSystemCode/frmSelectPatientGoodsBill.cs @@ -407,7 +407,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI //鍒ゆ柇褰撳墠瀛楃涓叉槸鍚︿负姝ｇ‘IP鍦板潃 if (PublicMethod.IsRightIP(IPadd.ToString())) { - if (room.Ip == IPadd.ToString()) + if (room.Ip == IPadd.ToString() || room.Ip2 == IPadd.ToString() || room.Ip3 == IPadd.ToString()) { return room; } diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.cs b/AIMS/OperationFront/frmOperationSchedulePlan.cs index a8b06ce..87c39e0 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.cs +++ b/AIMS/OperationFront/frmOperationSchedulePlan.cs @@ -486,6 +486,7 @@ namespace AIMS.OperationFront.UI this.colTourNurse = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.colRemarks = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.colDel = new DevComponents.DotNetBar.SuperGrid.GridColumn(); + this.gridColumn2 = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.btnWorkPlan = new System.Windows.Forms.Button(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -578,7 +579,6 @@ namespace AIMS.OperationFront.UI this.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.gridColumn2 = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.navigationPane1.SuspendLayout(); this.navigationPanePanel1.SuspendLayout(); this.groupBoxsel.SuspendLayout(); @@ -2103,7 +2103,6 @@ namespace AIMS.OperationFront.UI // // panlemian // - this.panlemian.Controls.Add(this.lblcount); this.panlemian.Controls.Add(this.label15); this.panlemian.Controls.Add(this.label3); this.panlemian.Controls.Add(this.label14); @@ -2121,14 +2120,13 @@ namespace AIMS.OperationFront.UI // this.lblcount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblcount.AutoSize = true; - this.lblcount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblcount.Location = new System.Drawing.Point(177, 256); + this.lblcount.Font = new System.Drawing.Font("微软雅黑", 15F); + this.lblcount.Location = new System.Drawing.Point(548, 5); this.lblcount.Name = "lblcount"; - this.lblcount.Size = new System.Drawing.Size(35, 21); + this.lblcount.Size = new System.Drawing.Size(45, 27); this.lblcount.TabIndex = 501; this.lblcount.Text = "0/0"; this.lblcount.TextAlign = System.Drawing.ContentAlignment.BottomCenter; - this.lblcount.Visible = false; // // label15 // @@ -2207,8 +2205,8 @@ namespace AIMS.OperationFront.UI // // dgvDetail // - this.dgvDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.dgvDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.dgvDetail.BackColor = System.Drawing.SystemColors.Control; this.dgvDetail.ContextMenuStrip = this.ctsThisRoom; @@ -2422,9 +2420,15 @@ namespace AIMS.OperationFront.UI this.colDel.Name = "Del"; this.colDel.Width = 30; // + // gridColumn2 + // + this.gridColumn2.Name = "state"; + this.gridColumn2.Visible = false; + // // panel1 // this.panel1.BackColor = System.Drawing.Color.Transparent; + this.panel1.Controls.Add(this.lblcount); this.panel1.Controls.Add(this.btnWorkPlan); this.panel1.Controls.Add(this.button3); this.panel1.Controls.Add(this.label2); @@ -3415,11 +3419,6 @@ namespace AIMS.OperationFront.UI this.dataGridViewTextBoxColumn48.HeaderText = "类别"; this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48"; // - // gridColumn2 - // - this.gridColumn2.Name = "state"; - this.gridColumn2.Visible = false; - // // frmOperationSchedulePlan // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -3457,6 +3456,7 @@ namespace AIMS.OperationFront.UI this.panlemian.PerformLayout(); this.ctsThisRoom.ResumeLayout(false); this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); this.tcOperationRoomsPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.tabScheduling)).EndInit(); @@ -3598,17 +3598,27 @@ namespace AIMS.OperationFront.UI { try { - FirstLoad(); - + dtpSearchTime.Value = DateTime.Now; + string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString(); + labelWeek.Text = week; if (sysPass.IsValid == 1 && sysPass.Value == "1") { btnpass.Visible = true; label1.Visible = true; } else { btnpass.Visible = false; label1.Visible = false; } - navigationPane1.ShowMoreButtons(); - dgvApplyOrDoctor.ClearSelection(); - dtpSearchTime.Focus(); - dtpSearchTime.ValueChanged += new EventHandler(dtpSearchTime_ValueChanged); - this.VisibleChanged += new EventHandler(frmOperationSchedulePlan_VisibleChanged); + + operationRooms = BOperationRoom.Select(" IsValid=1 and Site='手术室' order by [RoomOrder]", null, RecursiveType.None, 0); + + SSSDept = BDepartment.Select(" NAME ='手术室' and IsValid=1 ", null, RecursiveType.None, 0); + MZKDept = BDepartment.Select(" NAME ='麻醉科' and IsValid=1 ", null, RecursiveType.None, 0); + if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept; + + + txtQuery.Visible = true; + comboBoxExRoom.Visible = false; + RoomCardManage.SelectDgv = dgvApplyOrDoctor; + RoomCardManage.OnDataSaved = marksManager_OnDataSaved; + + FirstLoad(); } catch (Exception ex) { @@ -3625,23 +3635,21 @@ namespace AIMS.OperationFront.UI #endregion #region 加载手术室页面中控件的数量 + private System.Windows.Forms.Timer timerLoadRescue; + public void FirstLoad() { - dtpSearchTime.Value = DateTime.Now; - string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString(); - labelWeek.Text = week; + timerLoadRescue = new System.Windows.Forms.Timer(components); + timerLoadRescue.Enabled = true;//调试时设置为FALSE ， + timerLoadRescue.Interval = 100; + timerLoadRescue.Tick -= timerLoadRescue_Tick; + timerLoadRescue.Tick += timerLoadRescue_Tick; + timerLoadRescue.Start(); + } + private void timerLoadRescue_Tick(object sender, EventArgs e) + { + timerLoadRescue.Dispose(); - operationRooms = BOperationRoom.Select(" IsValid=1 and Site='手术室' order by [RoomOrder]", null, RecursiveType.None, 0); - - SSSDept = BDepartment.Select(" NAME ='手术室' and IsValid=1 ", null, RecursiveType.None, 0); - MZKDept = BDepartment.Select(" NAME ='麻醉科' and IsValid=1 ", null, RecursiveType.None, 0); - if ((MZKDept == null || MZKDept.Count <= 0) && SSSDept != null) MZKDept = SSSDept; - - - txtQuery.Visible = true; - comboBoxExRoom.Visible = false; - RoomCardManage.SelectDgv = dgvApplyOrDoctor; - RoomCardManage.OnDataSaved = marksManager_OnDataSaved; //目前先加载单手术室 后期扩展 //0.加载手术间列表 1 //1.加载选项卡手术间对应手术记录1 @@ -3654,6 +3662,12 @@ namespace AIMS.OperationFront.UI LoadSelectDate(""); LoadOperationRooms(); tabScheduling_SelectedTabChanged(null, null); + + navigationPane1.ShowMoreButtons(); + dgvApplyOrDoctor.ClearSelection(); + dtpSearchTime.Focus(); + dtpSearchTime.ValueChanged += new EventHandler(dtpSearchTime_ValueChanged); + this.VisibleChanged += new EventHandler(frmOperationSchedulePlan_VisibleChanged); } private void tabScheduling_SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e) { @@ -3781,7 +3795,7 @@ namespace AIMS.OperationFront.UI if (RoomCardManage.SelectDgv.Name == "dgvApplyOrDoctor") { LoadSelectDate(txtQuery.Text.Trim()); - //lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; + lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; } else FullWorkerDgv(""); @@ -3822,7 +3836,7 @@ namespace AIMS.OperationFront.UI //Task.Factory.StartNew(() => //{ // lock (_Sync) - // { + // { foreach (ucPlanOperationRoomCard item in ucOpeRooms) { item.PlanOperationTime = dtpSearchTime.Value; @@ -3891,6 +3905,7 @@ namespace AIMS.OperationFront.UI } } dgvApplyOrDoctor.ClearSelection(); + OpeCount = NowPatientDataTable.Rows.Count; } #endregion @@ -3905,14 +3920,14 @@ namespace AIMS.OperationFront.UI RoomCardManage.lastSelectOpeRoom = null; LoadSelectDate(txtQuery.Text.Trim()); LoadOperationInfo(); - //lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; + lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; } private void txtQuery_TextChanged(object sender, EventArgs e) { RoomCardManage.SelectDgv = dgvApplyOrDoctor; LoadSelectDate(txtQuery.Text.Trim()); - //lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; + lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; } private void btnBeforeDay_Click(object sender, EventArgs e) @@ -4102,9 +4117,9 @@ namespace AIMS.OperationFront.UI dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); } } - selApply=null; + selApply = null; RoomCardManage.SelectIds = null; - //lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; + lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; }; frmOperationApplyDetail.ShowDialog(); } @@ -4154,13 +4169,13 @@ namespace AIMS.OperationFront.UI if (selApply == null || selApply == "") return; try { - OperationApply opeapply = BOperationApply.SelectSingle( int.Parse(selApply) , RecursiveType.None, 0); + OperationApply opeapply = BOperationApply.SelectSingle(int.Parse(selApply), RecursiveType.None, 0); if (opeapply.State > 5) { MessageBox.Show("该申请已手术 请于术中切换手术间！"); return; } OperationRoom opeRoom = (sender as ToolStripItem).Tag as OperationRoom; BOperationApply.UpdateApplyRoom(int.Parse(selApply), opeRoom.Id.Value, dtpSearchTime.Value); BOperationApply.UpdteOperationOrder(dtpSearchTime.Value, RoomCardManage.lastSelectOpeRoom.operationRoom.Id.Value); outMsg = string.Format("{2} 更换 患者:{0} 手术间{1} 成功！", grCurrentSub.Cells["Patient"].Value, opeRoom, RoomCardManage.lastSelectOpeRoom.operationRoom.Name); - RoomCardManage.WriteMsg(rtbLog, outMsg); + RoomCardManage.WriteMsg(rtbLog, outMsg); LoadOperationInfo(opeRoom.Id.Value); LoadOperationInfoDgv(CurrentRoom); dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); @@ -4261,7 +4276,7 @@ namespace AIMS.OperationFront.UI } RoomCardManage.lastSelectOpeRoom.ShowDetial(RoomCardManage.lastSelectOpeRoom); //manager.OnDataSaved(null, manager.lastSelectOpeRoom.OpeRoom, true, 1); - //lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + (OpeCount++) + "条"; + lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; } #region 选中下一条手术申请并让其可见 diff --git a/AIMS/OperationFront/frmOperationSchedulePlan.resx b/AIMS/OperationFront/frmOperationSchedulePlan.resx index 9351358..e875429 100644 --- a/AIMS/OperationFront/frmOperationSchedulePlan.resx +++ b/AIMS/OperationFront/frmOperationSchedulePlan.resx @@ -251,7 +251,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ - CAAAAk1TRnQBSQFMAgEBAgEAAZQBEwGUARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAZwBEwGcARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs b/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs index 383dfd7..0d3274e 100644 --- a/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs +++ b/AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs @@ -41,12 +41,12 @@ this.lblGoodsName.BackColor = System.Drawing.Color.Azure; this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left; - this.lblGoodsName.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.lblGoodsName.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.lblGoodsName.Location = new System.Drawing.Point(0, 0); this.lblGoodsName.Multiline = true; this.lblGoodsName.Name = "lblGoodsName"; this.lblGoodsName.ReadOnly = true; - this.lblGoodsName.Size = new System.Drawing.Size(140, 34); + this.lblGoodsName.Size = new System.Drawing.Size(127, 27); this.lblGoodsName.TabIndex = 1; this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); @@ -55,13 +55,13 @@ // this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left; - this.txtCloseLast.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.txtCloseLast.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.txtCloseLast.Location = new System.Drawing.Point(431, 0); + this.txtCloseLast.Location = new System.Drawing.Point(337, 0); this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseLast.Name = "txtCloseLast"; this.txtCloseLast.ShortcutsEnabled = false; - this.txtCloseLast.Size = new System.Drawing.Size(93, 34); + this.txtCloseLast.Size = new System.Drawing.Size(70, 27); this.txtCloseLast.TabIndex = 5; this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -69,13 +69,13 @@ // this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left; - this.txtCloseFront.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.txtCloseFront.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.txtCloseFront.Location = new System.Drawing.Point(334, 0); + this.txtCloseFront.Location = new System.Drawing.Point(267, 0); this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseFront.Name = "txtCloseFront"; this.txtCloseFront.ShortcutsEnabled = false; - this.txtCloseFront.Size = new System.Drawing.Size(97, 34); + this.txtCloseFront.Size = new System.Drawing.Size(70, 27); this.txtCloseFront.TabIndex = 4; this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -83,13 +83,13 @@ // this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left; - this.txtDoing.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.txtDoing.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.txtDoing.Location = new System.Drawing.Point(237, 0); + this.txtDoing.Location = new System.Drawing.Point(197, 0); this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtDoing.Name = "txtDoing"; this.txtDoing.ShortcutsEnabled = false; - this.txtDoing.Size = new System.Drawing.Size(97, 34); + this.txtDoing.Size = new System.Drawing.Size(70, 27); this.txtDoing.TabIndex = 3; this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -97,12 +97,12 @@ // this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtFront.Dock = System.Windows.Forms.DockStyle.Left; - this.txtFront.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.txtFront.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.txtFront.Location = new System.Drawing.Point(140, 0); + this.txtFront.Location = new System.Drawing.Point(127, 0); this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtFront.Name = "txtFront"; - this.txtFront.Size = new System.Drawing.Size(97, 34); + this.txtFront.Size = new System.Drawing.Size(70, 27); this.txtFront.TabIndex = 2; this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -110,13 +110,13 @@ // this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left; - this.txtSkinCloseLast.Font = new System.Drawing.Font("寰蒋闆呴粦", 15F); + this.txtSkinCloseLast.Font = new System.Drawing.Font("寰蒋闆呴粦", 11F); this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.txtSkinCloseLast.Location = new System.Drawing.Point(524, 0); + this.txtSkinCloseLast.Location = new System.Drawing.Point(407, 0); this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtSkinCloseLast.Name = "txtSkinCloseLast"; this.txtSkinCloseLast.ShortcutsEnabled = false; - this.txtSkinCloseLast.Size = new System.Drawing.Size(94, 34); + this.txtSkinCloseLast.Size = new System.Drawing.Size(70, 27); this.txtSkinCloseLast.TabIndex = 6; this.txtSkinCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); // @@ -134,7 +134,7 @@ 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.Name = "UCOperationGoodsBill5"; - this.Size = new System.Drawing.Size(618, 34); + this.Size = new System.Drawing.Size(477, 27); this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/DrawGraph/AreaManage/InstrumentDataManage.cs b/DrawGraph/AreaManage/InstrumentDataManage.cs index e24e54b..d4a89eb 100644 --- a/DrawGraph/AreaManage/InstrumentDataManage.cs +++ b/DrawGraph/AreaManage/InstrumentDataManage.cs @@ -15,7 +15,6 @@ namespace DrawGraph { private OperationRecord myOpeRecord = null; - private bool valChang = false; //鍊间笉鍙 public TextPackObj txtObj; public TablePackObj tablePackObj; public TablePackObj tablePackObj1; @@ -68,6 +67,7 @@ namespace DrawGraph { if (tablePackObj == null) return; int Columns = int.Parse(tablePackObj1.Columns.ToString()); + double span = tablePackObj.RealX - 0.005; for (int i = 0; i < tablePackObj.Rows * 3 + 1; i++) { DelAddObj("ApplianceRecordList" + i); @@ -84,17 +84,27 @@ namespace DrawGraph double y = tablePackObj.RealY + chaY * index; ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "")// && ApplianceRecordList[index].OpeFront != @"\" + if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "" && ApplianceRecordList[index].OpeFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeFront, tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "")// && ApplianceRecordList[index].OpeDoing != @"\" + else + ZUtil.DrawLine1(tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); + if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "" && ApplianceRecordList[index].OpeDoing != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeDoing, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "")//&& ApplianceRecordList[index].CloseFront != @"\" + else + ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); + if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "" && ApplianceRecordList[index].CloseFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseFront, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "")//&& ApplianceRecordList[index].CloseLast != @"\" + else + ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); + if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "" && ApplianceRecordList[index].CloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseLast, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black, fontsize, false); + else + ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); if (Columns == 5) - if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "")//&& ApplianceRecordList[index].SkinCloseLast != @"\" + if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "" && ApplianceRecordList[index].SkinCloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false); + else + ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 5 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); continue; } @@ -106,17 +116,27 @@ namespace DrawGraph double y = tablePackObj.RealY + (chaY * (index - tablePackObj.Rows)); ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, (tablePackObj.EndX - tablePackObj.X) / 2 + tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "")//&& ApplianceRecordList[index].OpeFront != @"\" + if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "" && ApplianceRecordList[index].OpeFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeFront, tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "")//&& ApplianceRecordList[index].OpeDoing != @"\" + else + ZUtil.DrawLine1(tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); + if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "" && ApplianceRecordList[index].OpeDoing != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeDoing, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "")//&& ApplianceRecordList[index].CloseFront != @"\" + else + ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); + if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "" && ApplianceRecordList[index].CloseFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseFront, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black, fontsize, false); - if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "")// && ApplianceRecordList[index].CloseLast != @"\" + else + ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); + if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "" && ApplianceRecordList[index].CloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseLast, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black, fontsize, false); + else + ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); if (Columns == 5) - if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "")// && ApplianceRecordList[index].SkinCloseLast != @"\" + if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "" && ApplianceRecordList[index].SkinCloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false); + else + ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 5 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); continue; } @@ -130,16 +150,16 @@ namespace DrawGraph // double y = tablePackObj.RealY + (chaY * (index + 2 - tablePackObj.Rows * 2)); // ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, (tablePackObj.EndX - tablePackObj.X) / 3 * 2 + tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); - // if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "")//&& ApplianceRecordList[index].OpeFront != @"\" + // if (ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != ""&& ApplianceRecordList[index].OpeFront != @"/") // ZUtil.DrawText(ApplianceRecordList[index].OpeFront, tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black, fontsize, false); - // if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "")//&& ApplianceRecordList[index].OpeDoing != @"\" + // if (ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != ""&& ApplianceRecordList[index].OpeDoing != @"/") // ZUtil.DrawText(ApplianceRecordList[index].OpeDoing, (tablePackObj3.EndX - tablePackObj3.X) / Columns * 1 + tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black, fontsize, false); - // if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "")//&& ApplianceRecordList[index].CloseFront != @"\" + // if (ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != ""&& ApplianceRecordList[index].CloseFront != @"/") // ZUtil.DrawText(ApplianceRecordList[index].CloseFront, (tablePackObj3.EndX - tablePackObj3.X) / Columns * 2 + tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black, fontsize, false); - // if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "")// && ApplianceRecordList[index].CloseLast != @"\" + // if (ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "" && ApplianceRecordList[index].CloseLast != @"/") // ZUtil.DrawText(ApplianceRecordList[index].CloseLast, (tablePackObj3.EndX - tablePackObj3.X) / Columns * 3 + tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black, fontsize, false); // if (Columns == 5) - // if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "")// && ApplianceRecordList[index].SkinCloseLast != @"\" + // if (ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "" && ApplianceRecordList[index].SkinCloseLast != @"/") // ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj3.EndX - tablePackObj3.X) / Columns * 4 + tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false); // continue; diff --git a/DrawGraph/Graph/ZUtil.cs b/DrawGraph/Graph/ZUtil.cs index ba9e2e7..e0aaa29 100644 --- a/DrawGraph/Graph/ZUtil.cs +++ b/DrawGraph/Graph/ZUtil.cs @@ -137,6 +137,19 @@ namespace DrawGraph zedGraph.MasterPane.GraphObjList.Add(text); } + public static void DrawLine1(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) + { + LineObj line = new LineObj(LineColor, x1, y1, x2, y2); + line.Line.Width = 1; + line.IsVisible = true; + line.ZOrder = ZOrder.A_InFront; + line.Location.AlignH = AlignH.Left; + line.Location.AlignV = AlignV.Top; + line.Location.CoordinateFrame = CoordType.PaneFraction; + line.Tag = tag; + line.Line.Style = DashStyle.Solid; + zedGraph.MasterPane.GraphObjList.Add(line); + } public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) {