InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整打印界面

master
songnan.zhang 2 years ago
parent
81ac05189a
commit
8293ac4dba
2 changed files with 21 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
  2. 10
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

69
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
View File

@ -68,9 +68,7 @@
this.cbPlanFilter = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label();
this.cbListRowcount = new System.Windows.Forms.ComboBox();
this.cbRefreshRate = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
@ -131,7 +129,7 @@
this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10;
this.dgvPlan.RowTemplate.Height = 23;
this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvPlan.Size = new System.Drawing.Size(1777, 341);
this.dgvPlan.Size = new System.Drawing.Size(1319, 341);
this.dgvPlan.TabIndex = 7;
this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint);
this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged);
@ -253,7 +251,7 @@
this.tpContent.Location = new System.Drawing.Point(5, 55);
this.tpContent.Name = "tpContent";
this.tpContent.SelectedIndex = 0;
this.tpContent.Size = new System.Drawing.Size(1797, 481);
this.tpContent.Size = new System.Drawing.Size(1339, 481);
this.tpContent.TabIndex = 0;
//
// tpPlanList
@ -264,7 +262,7 @@
this.tpPlanList.Location = new System.Drawing.Point(4, 49);
this.tpPlanList.Name = "tpPlanList";
this.tpPlanList.Padding = new System.Windows.Forms.Padding(3);
this.tpPlanList.Size = new System.Drawing.Size(1789, 428);
this.tpPlanList.Size = new System.Drawing.Size(1331, 428);
this.tpPlanList.TabIndex = 0;
this.tpPlanList.Text = "计划列表";
this.tpPlanList.UseVisualStyleBackColor = true;
@ -282,7 +280,7 @@
this.tslblOrderCount});
this.toolStrip1.Location = new System.Drawing.Point(3, 355);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1783, 70);
this.toolStrip1.Size = new System.Drawing.Size(1325, 70);
this.toolStrip1.Stretch = true;
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
@ -402,7 +400,7 @@
"显示全部工单",
"隐藏挂起工单",
"只看挂起工单"});
this.cbPlanFilter.Location = new System.Drawing.Point(1276, 66);
this.cbPlanFilter.Location = new System.Drawing.Point(980, 66);
this.cbPlanFilter.Name = "cbPlanFilter";
this.cbPlanFilter.Size = new System.Drawing.Size(175, 33);
this.cbPlanFilter.TabIndex = 2;
@ -412,7 +410,7 @@
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.Location = new System.Drawing.Point(1208, 72);
this.label10.Location = new System.Drawing.Point(912, 72);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 20);
this.label10.TabIndex = 16;
@ -430,51 +428,22 @@
"40",
"50",
"100"});
this.cbListRowcount.Location = new System.Drawing.Point(1550, 66);
this.cbListRowcount.Location = new System.Drawing.Point(1254, 66);
this.cbListRowcount.Name = "cbListRowcount";
this.cbListRowcount.Size = new System.Drawing.Size(78, 33);
this.cbListRowcount.TabIndex = 3;
//
// cbRefreshRate
//
this.cbRefreshRate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cbRefreshRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbRefreshRate.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbRefreshRate.FormattingEnabled = true;
this.cbRefreshRate.Items.AddRange(new object[] {
"1s",
"2s",
"5s",
"10s",
"15s",
"20s"});
this.cbRefreshRate.Location = new System.Drawing.Point(1727, 66);
this.cbRefreshRate.Name = "cbRefreshRate";
this.cbRefreshRate.Size = new System.Drawing.Size(66, 33);
this.cbRefreshRate.TabIndex = 4;
//
// label8
//
this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(1454, 72);
this.label8.Location = new System.Drawing.Point(1158, 72);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(93, 20);
this.label8.TabIndex = 12;
this.label8.Text = "列表显示行数";
//
// label6
//
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(1631, 72);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(93, 20);
this.label6.TabIndex = 13;
this.label6.Text = "计划刷新频率";
//
// timer1
//
this.timer1.Enabled = true;
@ -487,7 +456,7 @@
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(1106, 64);
this.comboBox1.Location = new System.Drawing.Point(810, 64);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(91, 33);
this.comboBox1.TabIndex = 17;
@ -498,7 +467,7 @@
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(1033, 72);
this.label2.Location = new System.Drawing.Point(737, 72);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 20);
this.label2.TabIndex = 18;
@ -510,7 +479,7 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Location = new System.Drawing.Point(930, 64);
this.comboBox2.Location = new System.Drawing.Point(634, 64);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(91, 33);
this.comboBox2.TabIndex = 19;
@ -520,7 +489,7 @@
this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(856, 71);
this.label3.Location = new System.Drawing.Point(562, 71);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 20);
this.label3.TabIndex = 20;
@ -532,7 +501,7 @@
this.dtpCREATEDATEEND.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
this.dtpCREATEDATEEND.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpCREATEDATEEND.FormatString = "yyyy年MM月dd日";
this.dtpCREATEDATEEND.Location = new System.Drawing.Point(669, 66);
this.dtpCREATEDATEEND.Location = new System.Drawing.Point(398, 67);
this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND";
this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 26);
@ -546,7 +515,7 @@
this.dtpCREATEDATESTART.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
this.dtpCREATEDATESTART.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpCREATEDATESTART.FormatString = "yyyy年MM月dd日";
this.dtpCREATEDATESTART.Location = new System.Drawing.Point(471, 66);
this.dtpCREATEDATESTART.Location = new System.Drawing.Point(200, 67);
this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART";
this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 26);
@ -558,7 +527,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(395, 69);
this.label4.Location = new System.Drawing.Point(124, 70);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(69, 20);
this.label4.TabIndex = 21;
@ -568,7 +537,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(638, 69);
this.label5.Location = new System.Drawing.Point(367, 70);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(24, 20);
this.label5.TabIndex = 22;
@ -578,7 +547,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1805, 540);
this.ClientSize = new System.Drawing.Size(1347, 540);
this.Controls.Add(this.dtpCREATEDATEEND);
this.Controls.Add(this.dtpCREATEDATESTART);
this.Controls.Add(this.label4);
@ -590,9 +559,7 @@
this.Controls.Add(this.cbPlanFilter);
this.Controls.Add(this.label10);
this.Controls.Add(this.cbListRowcount);
this.Controls.Add(this.cbRefreshRate);
this.Controls.Add(this.label8);
this.Controls.Add(this.label6);
this.Controls.Add(this.cbRoutes);
this.Controls.Add(this.label1);
this.Controls.Add(this.tpContent);
@ -640,9 +607,7 @@
private System.Windows.Forms.ComboBox cbPlanFilter;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.ComboBox cbListRowcount;
private System.Windows.Forms.ComboBox cbRefreshRate;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label2;

10
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
View File

@ -80,11 +80,11 @@ namespace QMAPP.WinForm.Forms.TianJin
setting = Newtonsoft.Json.JsonConvert.DeserializeAnonymousType(settingstring, setting);
}
cbListRowcount.Text = setting.ListRowcount.ToString();
cbRefreshRate.Text = string.Format("{0}s", setting.RefreshRate);
//cbRefreshRate.Text = string.Format("{0}s", setting.RefreshRate);
cbPlanFilter.SelectedIndex = 1;
cbListRowcount.SelectedIndexChanged += new EventHandler(cbListRowcount_SelectedIndexChanged);
cbRefreshRate.SelectedIndexChanged += new EventHandler(cbRefreshRate_SelectedIndexChanged);
//cbRefreshRate.SelectedIndexChanged += new EventHandler(cbRefreshRate_SelectedIndexChanged);
cbPlanFilter.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
comboBox1.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
comboBox2.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
@ -156,7 +156,7 @@ namespace QMAPP.WinForm.Forms.TianJin
var setting = new
{
ListRowcount = int.Parse(cbListRowcount.Text),
RefreshRate = int.Parse(cbRefreshRate.Text.Trim('s')),
//RefreshRate = int.Parse(cbRefreshRate.Text.Trim('s')),
//PlanFilter = cbPlanFilter.SelectedIndex
};
string settingstring = Newtonsoft.Json.JsonConvert.SerializeObject(setting);
@ -168,11 +168,9 @@ namespace QMAPP.WinForm.Forms.TianJin
if (!tsbOrderOperation.DropDown.Visible)
{
timecounter += 1;
if (timecounter > int.Parse(cbRefreshRate.Text.Trim('s')))//计时达到刷新时间
if (timecounter > int.Parse("20"))//计时达到刷新时间
{
BindPlanView();
}
}
}

Write Preview
Loading…
Cancel
Save