AIMSBS/AIMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

器械单默认打印左斜杠

Browse Source 
器械清点单应用调试
This commit is contained in:
leomon 2022-11-16 23:11:59 +08:00
parent 69be80fcc1
commit 2c7f4cdab2
10 changed files with 679 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
AIMS/FormMainManage.cs
View File

@ -1,10 +1,13 @@
using AIMS.DocManager; using AIMS.DocManager;
using AIMS.OperationDoing.AnasRecordBill;
using AIMS.OperationDoing.AnasRecordBill.UI; using AIMS.OperationDoing.AnasRecordBill.UI;
using AIMSBLL; using AIMSBLL;
using AIMSModel; using AIMSModel;
using DCSoftDotfuscate; using DCSoftDotfuscate;
using DevComponents.DotNetBar; using DevComponents.DotNetBar;
using DevComponents.DotNetBar.Controls;
using DocumentManagement; using DocumentManagement;
using DrawGraph;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -194,22 +197,38 @@ namespace AIMS
this.sideNav1.Items.Add(sideNavItem); 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(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(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); 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(); BindOperationsListChart();
BindOperationsListChart2(); BindOperationsListChart2();
BindfrmNoticeMain(); BindfrmNoticeMain();
}); //});
} }
public void BindOperationsList(DevComponents.DotNetBar.Controls.DataGridViewX lvex, DateTime beginTime, DateTime endTime, DevComponents.DotNetBar.LabelX labCount, bool isLoginPerson, bool isEnOpe = false) public void BindOperationsList(DevComponents.DotNetBar.Controls.DataGridViewX lvex, DateTime beginTime, DateTime endTime, DevComponents.DotNetBar.LabelX labCount, bool isLoginPerson, bool isEnOpe = false)
{ {
lvex.Rows.Clear(); lvex.Rows.Clear();
@ -294,17 +313,28 @@ namespace AIMS
string path = menu.Path; string path = menu.Path;
if (path.Length > 0) if (path.Length > 0)
{ {
Form frm = GetForm(path); try
if (menu.IsAloneOpen == 1) {
sideNav1.IsMenuExpanded = false; Form frm = GetForm(path);
frm.TopLevel = false; if (menu.IsAloneOpen == 1)
//frm.Dock = DockStyle.Fill; sideNav1.IsMenuExpanded = false;
frm.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; frm.TopLevel = false;
frm.WindowState = FormWindowState.Maximized; frm.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
sideNavItem.Panel.Controls.Clear(); frm.WindowState = FormWindowState.Maximized;
sideNavItem.Panel.Controls.Add(frm); sideNavItem.Panel.Controls.Clear();
frm.Show(); sideNavItem.Panel.Controls.Add(frm);
frm.BringToFront(); frm.Show();
frm.BringToFront();
}
catch (Exception ex)
{
if (path.Contains("MainFormManage"))
{
MainFormManage frm = new MainFormManage();
frm.Show();
frm.BringToFront();
}
}
} }
} }
public Form GetForm(string Path) public Form GetForm(string Path)
@ -406,7 +436,7 @@ namespace AIMS
private void buttonX3_Click(object sender, EventArgs e) private void buttonX3_Click(object sender, EventArgs e)
{ {
AIMS.OperationFront.UI.frmOperationApplyDetail frmOperationApplyDetail = new AIMS.OperationFront.UI.frmOperationApplyDetail(); AIMS.OperationFront.UI.frmOperationApplyDetail frmOperationApplyDetail = new AIMS.OperationFront.UI.frmOperationApplyDetail();
frmOperationApplyDetail.State = AIMSExtension.EditState.ADD; frmOperationApplyDetail.State = AIMSExtension.EditState.ADD;
frmOperationApplyDetail.FormClosed += (ee, err) => frmOperationApplyDetail.FormClosed += (ee, err) =>
{ {
BindOperationsList(lv1, DateTime.Now, DateTime.Now.AddDays(1), labTa, true); BindOperationsList(lv1, DateTime.Now, DateTime.Now.AddDays(1), labTa, true);

922
AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument.cs
View File

@ -1807,7 +1807,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
private void button9_Click(object sender, EventArgs e) private void button9_Click(object sender, EventArgs e)
{ {
TextBoxAddEventSources(panelQX, @"\"); TextBoxAddEventSources(panelQX, @"/");
} }
private void TextBoxAddEventSources(Control _panel, string TextValue) private void TextBoxAddEventSources(Control _panel, string TextValue)

82
AIMS/OperationDoing/AnasRecordBill/frmAnasRecordInstrument2.Designer.cs generated
View File

@ -33,6 +33,7 @@
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.panel14 = 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.button1 = new System.Windows.Forms.Button();
this.button8 = new System.Windows.Forms.Button(); this.button8 = new System.Windows.Forms.Button();
this.button7 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button();
@ -199,7 +200,6 @@
this.picInRoom = new System.Windows.Forms.PictureBox(); this.picInRoom = new System.Windows.Forms.PictureBox();
this.txtInRoom1 = new System.Windows.Forms.Button(); this.txtInRoom1 = new System.Windows.Forms.Button();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.button9 = new System.Windows.Forms.Button();
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.panel14.SuspendLayout(); this.panel14.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
@ -252,7 +252,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2"; this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1924, 10); this.panel2.Size = new System.Drawing.Size(1711, 10);
this.panel2.TabIndex = 1; this.panel2.TabIndex = 1;
this.panel2.Visible = false; this.panel2.Visible = false;
// //
@ -264,7 +264,7 @@
this.panel3.Font = new System.Drawing.Font("宋体", 12F); this.panel3.Font = new System.Drawing.Font("宋体", 12F);
this.panel3.Location = new System.Drawing.Point(0, 10); this.panel3.Location = new System.Drawing.Point(0, 10);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(160, 1032); this.panel3.Size = new System.Drawing.Size(160, 931);
this.panel3.TabIndex = 2; this.panel3.TabIndex = 2;
// //
// panel14 // panel14
@ -287,9 +287,29 @@
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill; this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel14.Location = new System.Drawing.Point(0, 0); this.panel14.Location = new System.Drawing.Point(0, 0);
this.panel14.Name = "panel14"; this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(160, 1032); this.panel14.Size = new System.Drawing.Size(160, 931);
this.panel14.TabIndex = 5; this.panel14.TabIndex = 5;
// //
// 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 // button1
// //
this.button1.BackColor = System.Drawing.Color.Transparent; this.button1.BackColor = System.Drawing.Color.Transparent;
@ -578,9 +598,9 @@
this.panel4.Controls.Add(this.label1); this.panel4.Controls.Add(this.label1);
this.panel4.Dock = System.Windows.Forms.DockStyle.Right; this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
this.panel4.Font = new System.Drawing.Font("宋体", 10.5F); this.panel4.Font = new System.Drawing.Font("宋体", 10.5F);
this.panel4.Location = new System.Drawing.Point(1764, 10); this.panel4.Location = new System.Drawing.Point(1551, 10);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(160, 1032); this.panel4.Size = new System.Drawing.Size(160, 931);
this.panel4.TabIndex = 3; this.panel4.TabIndex = 3;
// //
// btnChage // btnChage
@ -595,7 +615,7 @@
this.btnChage.ForeColor = System.Drawing.Color.DimGray; this.btnChage.ForeColor = System.Drawing.Color.DimGray;
this.btnChage.Image = global::AIMS.Properties.Resources.麻醉医嘱; this.btnChage.Image = global::AIMS.Properties.Resources.麻醉医嘱;
this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnChage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnChage.Location = new System.Drawing.Point(0, 832); this.btnChage.Location = new System.Drawing.Point(0, 731);
this.btnChage.Name = "btnChage"; this.btnChage.Name = "btnChage";
this.btnChage.Size = new System.Drawing.Size(160, 50); this.btnChage.Size = new System.Drawing.Size(160, 50);
this.btnChage.TabIndex = 24; this.btnChage.TabIndex = 24;
@ -671,7 +691,7 @@
this.btnsjzx.ForeColor = System.Drawing.Color.DimGray; this.btnsjzx.ForeColor = System.Drawing.Color.DimGray;
this.btnsjzx.Image = global::AIMS.Properties.Resources.工作列表; this.btnsjzx.Image = global::AIMS.Properties.Resources.工作列表;
this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsjzx.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnsjzx.Location = new System.Drawing.Point(0, 882); this.btnsjzx.Location = new System.Drawing.Point(0, 781);
this.btnsjzx.Name = "btnsjzx"; this.btnsjzx.Name = "btnsjzx";
this.btnsjzx.Size = new System.Drawing.Size(160, 50); this.btnsjzx.Size = new System.Drawing.Size(160, 50);
this.btnsjzx.TabIndex = 22; this.btnsjzx.TabIndex = 22;
@ -691,7 +711,7 @@
this.btndptz.ForeColor = System.Drawing.Color.DimGray; this.btndptz.ForeColor = System.Drawing.Color.DimGray;
this.btndptz.Image = global::AIMS.Properties.Resources.文书状态; this.btndptz.Image = global::AIMS.Properties.Resources.文书状态;
this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btndptz.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btndptz.Location = new System.Drawing.Point(0, 932); this.btndptz.Location = new System.Drawing.Point(0, 831);
this.btndptz.Name = "btndptz"; this.btndptz.Name = "btndptz";
this.btndptz.Size = new System.Drawing.Size(160, 50); this.btndptz.Size = new System.Drawing.Size(160, 50);
this.btndptz.TabIndex = 19; this.btndptz.TabIndex = 19;
@ -711,7 +731,7 @@
this.btnsbwh.ForeColor = System.Drawing.Color.DimGray; this.btnsbwh.ForeColor = System.Drawing.Color.DimGray;
this.btnsbwh.Image = global::AIMS.Properties.Resources.耗材管理; this.btnsbwh.Image = global::AIMS.Properties.Resources.耗材管理;
this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnsbwh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnsbwh.Location = new System.Drawing.Point(0, 982); this.btnsbwh.Location = new System.Drawing.Point(0, 881);
this.btnsbwh.Name = "btnsbwh"; this.btnsbwh.Name = "btnsbwh";
this.btnsbwh.Size = new System.Drawing.Size(160, 50); this.btnsbwh.Size = new System.Drawing.Size(160, 50);
this.btnsbwh.TabIndex = 16; this.btnsbwh.TabIndex = 16;
@ -848,7 +868,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1924, 1042); this.panel1.Size = new System.Drawing.Size(1711, 941);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// panel5 // panel5
@ -861,7 +881,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(160, 10); this.panel5.Location = new System.Drawing.Point(160, 10);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1604, 1032); this.panel5.Size = new System.Drawing.Size(1391, 931);
this.panel5.TabIndex = 4; this.panel5.TabIndex = 4;
// //
// superTabMain // superTabMain
@ -889,7 +909,7 @@
this.superTabMain.ReorderTabsEnabled = true; this.superTabMain.ReorderTabsEnabled = true;
this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold); this.superTabMain.SelectedTabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold);
this.superTabMain.SelectedTabIndex = 0; this.superTabMain.SelectedTabIndex = 0;
this.superTabMain.Size = new System.Drawing.Size(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.TabFont = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.superTabMain.TabIndex = 14; this.superTabMain.TabIndex = 14;
this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] { this.superTabMain.Tabs.AddRange(new DevComponents.DotNetBar.BaseItem[] {
@ -903,7 +923,7 @@
this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.superTabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28); this.superTabControlPanel1.Location = new System.Drawing.Point(0, 28);
this.superTabControlPanel1.Name = "superTabControlPanel1"; this.superTabControlPanel1.Name = "superTabControlPanel1";
this.superTabControlPanel1.Size = new System.Drawing.Size(1602, 904); this.superTabControlPanel1.Size = new System.Drawing.Size(1389, 803);
this.superTabControlPanel1.TabIndex = 1; this.superTabControlPanel1.TabIndex = 1;
this.superTabControlPanel1.TabItem = this.spTabQXQDD; this.superTabControlPanel1.TabItem = this.spTabQXQDD;
// //
@ -916,7 +936,7 @@
this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExZKZB.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExZKZB.Location = new System.Drawing.Point(0, 0); this.panelExZKZB.Location = new System.Drawing.Point(0, 0);
this.panelExZKZB.Name = "panelExZKZB"; this.panelExZKZB.Name = "panelExZKZB";
this.panelExZKZB.Size = new System.Drawing.Size(1602, 904); this.panelExZKZB.Size = new System.Drawing.Size(1389, 803);
this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelExZKZB.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelExZKZB.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; this.panelExZKZB.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
@ -936,7 +956,7 @@
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 0); this.panel8.Location = new System.Drawing.Point(0, 0);
this.panel8.Name = "panel8"; this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(1602, 904); this.panel8.Size = new System.Drawing.Size(1389, 803);
this.panel8.TabIndex = 2; this.panel8.TabIndex = 2;
this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll); this.panel8.Scroll += new System.Windows.Forms.ScrollEventHandler(this.panel8_Scroll);
// //
@ -2137,9 +2157,9 @@
this.panel7.Controls.Add(this.labOperatorName); this.panel7.Controls.Add(this.labOperatorName);
this.panel7.Controls.Add(this.label19); this.panel7.Controls.Add(this.label19);
this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel7.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel7.Location = new System.Drawing.Point(0, 990); this.panel7.Location = new System.Drawing.Point(0, 889);
this.panel7.Name = "panel7"; this.panel7.Name = "panel7";
this.panel7.Size = new System.Drawing.Size(1602, 40); this.panel7.Size = new System.Drawing.Size(1389, 40);
this.panel7.TabIndex = 1; this.panel7.TabIndex = 1;
// //
// panel21 // panel21
@ -2149,7 +2169,7 @@
this.panel21.Controls.Add(this.plPrint); this.panel21.Controls.Add(this.plPrint);
this.panel21.Controls.Add(this.plRefresh); this.panel21.Controls.Add(this.plRefresh);
this.panel21.Dock = System.Windows.Forms.DockStyle.Right; this.panel21.Dock = System.Windows.Forms.DockStyle.Right;
this.panel21.Location = new System.Drawing.Point(1261, 0); this.panel21.Location = new System.Drawing.Point(1048, 0);
this.panel21.Name = "panel21"; this.panel21.Name = "panel21";
this.panel21.Size = new System.Drawing.Size(341, 40); this.panel21.Size = new System.Drawing.Size(341, 40);
this.panel21.TabIndex = 10; this.panel21.TabIndex = 10;
@ -2248,7 +2268,7 @@
this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top; this.plTitleEventTime.Dock = System.Windows.Forms.DockStyle.Top;
this.plTitleEventTime.Location = new System.Drawing.Point(0, 0); this.plTitleEventTime.Location = new System.Drawing.Point(0, 0);
this.plTitleEventTime.Name = "plTitleEventTime"; this.plTitleEventTime.Name = "plTitleEventTime";
this.plTitleEventTime.Size = new System.Drawing.Size(1602, 58); this.plTitleEventTime.Size = new System.Drawing.Size(1389, 58);
this.plTitleEventTime.TabIndex = 0; this.plTitleEventTime.TabIndex = 0;
// //
// panel13 // panel13
@ -2630,30 +2650,10 @@
this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71); this.flowLayoutPanel1.Size = new System.Drawing.Size(147, 71);
this.flowLayoutPanel1.TabIndex = 0; this.flowLayoutPanel1.TabIndex = 0;
// //
// 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 // frmAnasRecordInstrument2
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; 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.Controls.Add(this.panel1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmAnasRecordInstrument2"; this.Name = "frmAnasRecordInstrument2";

2
AIMS/OperationDoing/oldSystemCode/frmSelectPatientGoodsBill.cs
View File

@ -407,7 +407,7 @@ namespace AIMS.OperationDoing.AnasRecordBill.UI
//判断当前字符串是否为正确IP地址 //判断当前字符串是否为正确IP地址
if (PublicMethod.IsRightIP(IPadd.ToString())) 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; return room;
} }

101
AIMS/OperationFront/frmOperationSchedulePlan.cs
View File

@ -486,6 +486,7 @@ namespace AIMS.OperationFront.UI
this.colTourNurse = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.colTourNurse = new DevComponents.DotNetBar.SuperGrid.GridColumn();
this.colRemarks = new DevComponents.DotNetBar.SuperGrid.GridColumn(); this.colRemarks = new DevComponents.DotNetBar.SuperGrid.GridColumn();
this.colDel = 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.panel1 = new System.Windows.Forms.Panel();
this.btnWorkPlan = new System.Windows.Forms.Button(); this.btnWorkPlan = new System.Windows.Forms.Button();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); 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.dataGridViewTextBoxColumn46 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn48 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gridColumn2 = new DevComponents.DotNetBar.SuperGrid.GridColumn();
this.navigationPane1.SuspendLayout(); this.navigationPane1.SuspendLayout();
this.navigationPanePanel1.SuspendLayout(); this.navigationPanePanel1.SuspendLayout();
this.groupBoxsel.SuspendLayout(); this.groupBoxsel.SuspendLayout();
@ -2103,7 +2103,6 @@ namespace AIMS.OperationFront.UI
// //
// panlemian // panlemian
// //
this.panlemian.Controls.Add(this.lblcount);
this.panlemian.Controls.Add(this.label15); this.panlemian.Controls.Add(this.label15);
this.panlemian.Controls.Add(this.label3); this.panlemian.Controls.Add(this.label3);
this.panlemian.Controls.Add(this.label14); 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.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblcount.AutoSize = true; this.lblcount.AutoSize = true;
this.lblcount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblcount.Font = new System.Drawing.Font("微软雅黑", 15F);
this.lblcount.Location = new System.Drawing.Point(177, 256); this.lblcount.Location = new System.Drawing.Point(548, 5);
this.lblcount.Name = "lblcount"; 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.TabIndex = 501;
this.lblcount.Text = "0/0"; this.lblcount.Text = "0/0";
this.lblcount.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.lblcount.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.lblcount.Visible = false;
// //
// label15 // label15
// //
@ -2207,8 +2205,8 @@ namespace AIMS.OperationFront.UI
// //
// dgvDetail // dgvDetail
// //
this.dgvDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 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.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.dgvDetail.BackColor = System.Drawing.SystemColors.Control; this.dgvDetail.BackColor = System.Drawing.SystemColors.Control;
this.dgvDetail.ContextMenuStrip = this.ctsThisRoom; this.dgvDetail.ContextMenuStrip = this.ctsThisRoom;
@ -2422,9 +2420,15 @@ namespace AIMS.OperationFront.UI
this.colDel.Name = "Del"; this.colDel.Name = "Del";
this.colDel.Width = 30; this.colDel.Width = 30;
// //
// gridColumn2
//
this.gridColumn2.Name = "state";
this.gridColumn2.Visible = false;
//
// panel1 // panel1
// //
this.panel1.BackColor = System.Drawing.Color.Transparent; this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.Controls.Add(this.lblcount);
this.panel1.Controls.Add(this.btnWorkPlan); this.panel1.Controls.Add(this.btnWorkPlan);
this.panel1.Controls.Add(this.button3); this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label2);
@ -3415,11 +3419,6 @@ namespace AIMS.OperationFront.UI
this.dataGridViewTextBoxColumn48.HeaderText = "类别"; this.dataGridViewTextBoxColumn48.HeaderText = "类别";
this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48"; this.dataGridViewTextBoxColumn48.Name = "dataGridViewTextBoxColumn48";
// //
// gridColumn2
//
this.gridColumn2.Name = "state";
this.gridColumn2.Visible = false;
//
// frmOperationSchedulePlan // frmOperationSchedulePlan
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@ -3457,6 +3456,7 @@ namespace AIMS.OperationFront.UI
this.panlemian.PerformLayout(); this.panlemian.PerformLayout();
this.ctsThisRoom.ResumeLayout(false); this.ctsThisRoom.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
this.tcOperationRoomsPage.ResumeLayout(false); this.tcOperationRoomsPage.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabScheduling)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabScheduling)).EndInit();
@ -3598,17 +3598,27 @@ namespace AIMS.OperationFront.UI
{ {
try 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") if (sysPass.IsValid == 1 && sysPass.Value == "1")
{ btnpass.Visible = true; label1.Visible = true; } { btnpass.Visible = true; label1.Visible = true; }
else else
{ btnpass.Visible = false; label1.Visible = false; } { btnpass.Visible = false; label1.Visible = false; }
navigationPane1.ShowMoreButtons();
dgvApplyOrDoctor.ClearSelection(); operationRooms = BOperationRoom.Select(" IsValid=1 and Site='手术室' order by [RoomOrder]", null, RecursiveType.None, 0);
dtpSearchTime.Focus();
dtpSearchTime.ValueChanged += new EventHandler(dtpSearchTime_ValueChanged); SSSDept = BDepartment.Select(" NAME ='手术室' and IsValid=1 ", null, RecursiveType.None, 0);
this.VisibleChanged += new EventHandler(frmOperationSchedulePlan_VisibleChanged); 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) catch (Exception ex)
{ {
@ -3625,23 +3635,21 @@ namespace AIMS.OperationFront.UI
#endregion #endregion
#region 加载手术室页面中控件的数量 #region 加载手术室页面中控件的数量
private System.Windows.Forms.Timer timerLoadRescue;
public void FirstLoad() public void FirstLoad()
{ {
dtpSearchTime.Value = DateTime.Now; timerLoadRescue = new System.Windows.Forms.Timer(components);
string week = Day[Convert.ToInt32(dtpSearchTime.Value.DayOfWeek.ToString("d"))].ToString(); timerLoadRescue.Enabled = true;//调试时设置为FALSE ，
labelWeek.Text = week; 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 //0.加载手术间列表 1
//1.加载选项卡手术间对应手术记录1 //1.加载选项卡手术间对应手术记录1
@ -3654,6 +3662,12 @@ namespace AIMS.OperationFront.UI
LoadSelectDate(""); LoadSelectDate("");
LoadOperationRooms(); LoadOperationRooms();
tabScheduling_SelectedTabChanged(null, null); 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) private void tabScheduling_SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
{ {
@ -3781,7 +3795,7 @@ namespace AIMS.OperationFront.UI
if (RoomCardManage.SelectDgv.Name == "dgvApplyOrDoctor") if (RoomCardManage.SelectDgv.Name == "dgvApplyOrDoctor")
{ {
LoadSelectDate(txtQuery.Text.Trim()); LoadSelectDate(txtQuery.Text.Trim());
//lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条";
} }
else FullWorkerDgv(""); else FullWorkerDgv("");
@ -3822,7 +3836,7 @@ namespace AIMS.OperationFront.UI
//Task.Factory.StartNew(() => //Task.Factory.StartNew(() =>
//{ //{
// lock (_Sync) // lock (_Sync)
// { // {
foreach (ucPlanOperationRoomCard item in ucOpeRooms) foreach (ucPlanOperationRoomCard item in ucOpeRooms)
{ {
item.PlanOperationTime = dtpSearchTime.Value; item.PlanOperationTime = dtpSearchTime.Value;
@ -3891,6 +3905,7 @@ namespace AIMS.OperationFront.UI
} }
} }
dgvApplyOrDoctor.ClearSelection(); dgvApplyOrDoctor.ClearSelection();
OpeCount = NowPatientDataTable.Rows.Count;
} }
#endregion #endregion
@ -3905,14 +3920,14 @@ namespace AIMS.OperationFront.UI
RoomCardManage.lastSelectOpeRoom = null; RoomCardManage.lastSelectOpeRoom = null;
LoadSelectDate(txtQuery.Text.Trim()); LoadSelectDate(txtQuery.Text.Trim());
LoadOperationInfo(); LoadOperationInfo();
//lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条";
} }
private void txtQuery_TextChanged(object sender, EventArgs e) private void txtQuery_TextChanged(object sender, EventArgs e)
{ {
RoomCardManage.SelectDgv = dgvApplyOrDoctor; RoomCardManage.SelectDgv = dgvApplyOrDoctor;
LoadSelectDate(txtQuery.Text.Trim()); LoadSelectDate(txtQuery.Text.Trim());
//lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条";
} }
private void btnBeforeDay_Click(object sender, EventArgs e) private void btnBeforeDay_Click(object sender, EventArgs e)
@ -4102,9 +4117,9 @@ namespace AIMS.OperationFront.UI
dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub);
} }
} }
selApply=null; selApply = null;
RoomCardManage.SelectIds = null; RoomCardManage.SelectIds = null;
//lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条"; lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条";
}; };
frmOperationApplyDetail.ShowDialog(); frmOperationApplyDetail.ShowDialog();
} }
@ -4154,13 +4169,13 @@ namespace AIMS.OperationFront.UI
if (selApply == null || selApply == "") return; if (selApply == null || selApply == "") return;
try 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; } if (opeapply.State > 5) { MessageBox.Show("该申请已手术 请于术中切换手术间！"); return; }
OperationRoom opeRoom = (sender as ToolStripItem).Tag as OperationRoom; OperationRoom opeRoom = (sender as ToolStripItem).Tag as OperationRoom;
BOperationApply.UpdateApplyRoom(int.Parse(selApply), opeRoom.Id.Value, dtpSearchTime.Value); BOperationApply.UpdateApplyRoom(int.Parse(selApply), opeRoom.Id.Value, dtpSearchTime.Value);
BOperationApply.UpdteOperationOrder(dtpSearchTime.Value, RoomCardManage.lastSelectOpeRoom.operationRoom.Id.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); 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); LoadOperationInfo(opeRoom.Id.Value);
LoadOperationInfoDgv(CurrentRoom); LoadOperationInfoDgv(CurrentRoom);
dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub); dgvDetail.PrimaryGrid.Rows.Remove(grCurrentSub);
@ -4261,7 +4276,7 @@ namespace AIMS.OperationFront.UI
} }
RoomCardManage.lastSelectOpeRoom.ShowDetial(RoomCardManage.lastSelectOpeRoom); RoomCardManage.lastSelectOpeRoom.ShowDetial(RoomCardManage.lastSelectOpeRoom);
//manager.OnDataSaved(null, manager.lastSelectOpeRoom.OpeRoom, true, 1); //manager.OnDataSaved(null, manager.lastSelectOpeRoom.OpeRoom, true, 1);
//lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + (OpeCount++) + "条"; lblcount.Text = "当前" + dgvApplyOrDoctor.Rows.Count + "\\" + OpeCount + "条";
} }
#region 选中下一条手术申请并让其可见 #region 选中下一条手术申请并让其可见

2
AIMS/OperationFront/frmOperationSchedulePlan.resx
View File

@ -251,7 +251,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+
CAAAAk1TRnQBSQFMAgEBAgEAAZQBEwGUARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CAAAAk1TRnQBSQFMAgEBAgEAAZwBEwGcARMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

36
AIMS/OremrUserControl/UCOperationGoodsBill5.designer.cs generated
View File

@ -41,12 +41,12 @@
this.lblGoodsName.BackColor = System.Drawing.Color.Azure; this.lblGoodsName.BackColor = System.Drawing.Color.Azure;
this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lblGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left; this.lblGoodsName.Dock = System.Windows.Forms.DockStyle.Left;
this.lblGoodsName.Font = new System.Drawing.Font("微软雅黑", 15F); this.lblGoodsName.Font = new System.Drawing.Font("微软雅黑", 11F);
this.lblGoodsName.Location = new System.Drawing.Point(0, 0); this.lblGoodsName.Location = new System.Drawing.Point(0, 0);
this.lblGoodsName.Multiline = true; this.lblGoodsName.Multiline = true;
this.lblGoodsName.Name = "lblGoodsName"; this.lblGoodsName.Name = "lblGoodsName";
this.lblGoodsName.ReadOnly = true; this.lblGoodsName.ReadOnly = true;
this.lblGoodsName.Size = new System.Drawing.Size(140, 34); this.lblGoodsName.Size = new System.Drawing.Size(127, 27);
this.lblGoodsName.TabIndex = 1; this.lblGoodsName.TabIndex = 1;
this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.lblGoodsName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.lblGoodsName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
@ -55,13 +55,13 @@
// //
this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left; this.txtCloseLast.Dock = System.Windows.Forms.DockStyle.Left;
this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 15F); this.txtCloseLast.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtCloseLast.Location = new System.Drawing.Point(431, 0); this.txtCloseLast.Location = new System.Drawing.Point(337, 0);
this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtCloseLast.Name = "txtCloseLast"; this.txtCloseLast.Name = "txtCloseLast";
this.txtCloseLast.ShortcutsEnabled = false; this.txtCloseLast.ShortcutsEnabled = false;
this.txtCloseLast.Size = new System.Drawing.Size(93, 34); this.txtCloseLast.Size = new System.Drawing.Size(70, 27);
this.txtCloseLast.TabIndex = 5; this.txtCloseLast.TabIndex = 5;
this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -69,13 +69,13 @@
// //
this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCloseFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left; this.txtCloseFront.Dock = System.Windows.Forms.DockStyle.Left;
this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 15F); this.txtCloseFront.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtCloseFront.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtCloseFront.Location = new System.Drawing.Point(334, 0); this.txtCloseFront.Location = new System.Drawing.Point(267, 0);
this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtCloseFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtCloseFront.Name = "txtCloseFront"; this.txtCloseFront.Name = "txtCloseFront";
this.txtCloseFront.ShortcutsEnabled = false; this.txtCloseFront.ShortcutsEnabled = false;
this.txtCloseFront.Size = new System.Drawing.Size(97, 34); this.txtCloseFront.Size = new System.Drawing.Size(70, 27);
this.txtCloseFront.TabIndex = 4; this.txtCloseFront.TabIndex = 4;
this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtCloseFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -83,13 +83,13 @@
// //
this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtDoing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left; this.txtDoing.Dock = System.Windows.Forms.DockStyle.Left;
this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 15F); this.txtDoing.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtDoing.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtDoing.Location = new System.Drawing.Point(237, 0); this.txtDoing.Location = new System.Drawing.Point(197, 0);
this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtDoing.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtDoing.Name = "txtDoing"; this.txtDoing.Name = "txtDoing";
this.txtDoing.ShortcutsEnabled = false; this.txtDoing.ShortcutsEnabled = false;
this.txtDoing.Size = new System.Drawing.Size(97, 34); this.txtDoing.Size = new System.Drawing.Size(70, 27);
this.txtDoing.TabIndex = 3; this.txtDoing.TabIndex = 3;
this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtDoing.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -97,12 +97,12 @@
// //
this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtFront.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtFront.Dock = System.Windows.Forms.DockStyle.Left; this.txtFront.Dock = System.Windows.Forms.DockStyle.Left;
this.txtFront.Font = new System.Drawing.Font("微软雅黑", 15F); this.txtFront.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtFront.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtFront.Location = new System.Drawing.Point(140, 0); this.txtFront.Location = new System.Drawing.Point(127, 0);
this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtFront.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtFront.Name = "txtFront"; this.txtFront.Name = "txtFront";
this.txtFront.Size = new System.Drawing.Size(97, 34); this.txtFront.Size = new System.Drawing.Size(70, 27);
this.txtFront.TabIndex = 2; this.txtFront.TabIndex = 2;
this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); this.txtFront.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown);
// //
@ -110,13 +110,13 @@
// //
this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSkinCloseLast.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left; this.txtSkinCloseLast.Dock = System.Windows.Forms.DockStyle.Left;
this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 15F); this.txtSkinCloseLast.Font = new System.Drawing.Font("微软雅黑", 11F);
this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.txtSkinCloseLast.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.txtSkinCloseLast.Location = new System.Drawing.Point(524, 0); this.txtSkinCloseLast.Location = new System.Drawing.Point(407, 0);
this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txtSkinCloseLast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txtSkinCloseLast.Name = "txtSkinCloseLast"; this.txtSkinCloseLast.Name = "txtSkinCloseLast";
this.txtSkinCloseLast.ShortcutsEnabled = false; this.txtSkinCloseLast.ShortcutsEnabled = false;
this.txtSkinCloseLast.Size = new System.Drawing.Size(94, 34); this.txtSkinCloseLast.Size = new System.Drawing.Size(70, 27);
this.txtSkinCloseLast.TabIndex = 6; this.txtSkinCloseLast.TabIndex = 6;
this.txtSkinCloseLast.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFront_KeyDown); 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.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UCOperationGoodsBill5"; this.Name = "UCOperationGoodsBill5";
this.Size = new System.Drawing.Size(618, 34); this.Size = new System.Drawing.Size(477, 27);
this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load); this.Load += new System.EventHandler(this.UCOperationGoodsBill5_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

52
DrawGraph/AreaManage/InstrumentDataManage.cs
View File

@ -15,7 +15,6 @@ namespace DrawGraph
{ {
private OperationRecord myOpeRecord = null; private OperationRecord myOpeRecord = null;
private bool valChang = false; //值不变
public TextPackObj txtObj; public TextPackObj txtObj;
public TablePackObj tablePackObj; public TablePackObj tablePackObj;
public TablePackObj tablePackObj1; public TablePackObj tablePackObj1;
@ -68,6 +67,7 @@ namespace DrawGraph
{ {
if (tablePackObj == null) return; if (tablePackObj == null) return;
int Columns = int.Parse(tablePackObj1.Columns.ToString()); int Columns = int.Parse(tablePackObj1.Columns.ToString());
double span = tablePackObj.RealX - 0.005;
for (int i = 0; i < tablePackObj.Rows * 3 + 1; i++) for (int i = 0; i < tablePackObj.Rows * 3 + 1; i++)
{ {
DelAddObj("ApplianceRecordList" + i); DelAddObj("ApplianceRecordList" + i);
@ -84,17 +84,27 @@ namespace DrawGraph
double y = tablePackObj.RealY + chaY * index; double y = tablePackObj.RealY + chaY * index;
ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); 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); 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); 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); 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); 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 (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); 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; continue;
} }
@ -106,17 +116,27 @@ namespace DrawGraph
double y = tablePackObj.RealY + (chaY * (index - tablePackObj.Rows)); 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); 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); 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); 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); 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); 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 (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); 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; continue;
} }
@ -130,16 +150,16 @@ namespace DrawGraph
// double y = tablePackObj.RealY + (chaY * (index + 2 - tablePackObj.Rows * 2)); // 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); // 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); // 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); // 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); // 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); // 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 (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); // ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj3.EndX - tablePackObj3.X) / Columns * 4 + tablePackObj3.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false);
// continue; // continue;

13
DrawGraph/Graph/ZUtil.cs
View File

@ -137,6 +137,19 @@ namespace DrawGraph
zedGraph.MasterPane.GraphObjList.Add(text); 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) public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor)
{ {