细节调整

katway · Nov 2, 2012 · 18f5093 · 18f5093
1 parent bc216c8
commit 18f5093
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 71 deletions.
diff --git a/Application/frmAddItem.Designer.cs b/Application/frmAddItem.Designer.cs
diff --git a/Application/frmAddItem.resx b/Application/frmAddItem.resx
@@ -120,9 +120,6 @@
   <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="bkwItem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

diff --git a/Application/frmAddMachine.Designer.cs b/Application/frmAddMachine.Designer.cs
diff --git a/Application/frmAddPlanExamine.Designer.cs b/Application/frmAddPlanExamine.Designer.cs
diff --git a/Application/frmAddPlanExamine.resx b/Application/frmAddPlanExamine.resx
@@ -120,7 +120,4 @@
   <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="chkColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/Application/frmAddPlanToTask.Designer.cs b/Application/frmAddPlanToTask.Designer.cs
diff --git a/Application/frmAddPoint.Designer.cs b/Application/frmAddPoint.Designer.cs
diff --git a/Application/frmAddRoutName.Designer.cs b/Application/frmAddRoutName.Designer.cs
diff --git a/Application/frmAddRoutName.cs b/Application/frmAddRoutName.cs
@@ -21,9 +21,26 @@ public frmAddRoutName()
             InitializeComponent();
         }
 
+        private void cboinit()
+        {
+            DataSet dsCboinorder = SqlHelper.ExecuteDataset("Select Code,Meaning From Codes where purpose='CheckSequence' ");           
+            this.cboInOrder.DataSource = dsCboinorder.Tables[0];
+            this.cboInOrder.DisplayMember = "Meaning";
+            this.cboInOrder.ValueMember = "Code";
+            this.cboInOrder.SelectedIndex = this.cboInOrder.Items.Count > 0 ? 0 : -1;
+            dsCboinorder.Dispose();
+
+            DataSet dsCboSitearea = SqlHelper.ExecuteDataset("Select Id,Name From Site");
+            cboSiteArea.DataSource = dsCboSitearea.Tables[0];
+            cboSiteArea.DisplayMember = "Name";
+            cboSiteArea.ValueMember = "ID";
+            this.cboSiteArea.SelectedIndex = this.cboSiteArea.Items.Count > 0 ? 0 : -1;
+            dsCboSitearea.Dispose();
+        }
+
         private void frmAddRoutName_Load(object sender, EventArgs e)
         {
-            backgroundWorker1.RunWorkerAsync();
+            cboinit();
             if (isEdit)
             {
                 this.btnTrue.Text = "修改";
@@ -83,23 +100,12 @@ private void btnClose_Click(object sender, EventArgs e)
         DataSet dsCboinorder, dsCboSitearea;
         private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
         {
-            dsCboinorder = SqlHelper.ExecuteDataset("Select Code,Meaning From Codes where purpose='CheckSequence' ");
-            dsCboSitearea = SqlHelper.ExecuteDataset("Select Id,Name From Site");
+
         }
 
         private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            this.cboInOrder.DataSource = dsCboinorder.Tables[0];
-            this.cboInOrder.DisplayMember = "Meaning";
-            this.cboInOrder.ValueMember = "Code";
-            this.cboInOrder.SelectedIndex = this.cboInOrder.Items.Count > 0 ? 0 : -1;
-            dsCboinorder.Dispose();
-
-            cboSiteArea.DataSource = dsCboSitearea.Tables[0];
-            cboSiteArea.DisplayMember = "Name";
-            cboSiteArea.ValueMember = "ID";
-            this.cboSiteArea.SelectedIndex = this.cboSiteArea.Items.Count > 0 ? 0 : -1;
-            dsCboSitearea.Dispose();
+
         }
     }
 }
diff --git a/Application/frmAddRoutName.resx b/Application/frmAddRoutName.resx
@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="backgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
diff --git a/Application/frmAddRoute.Designer.cs b/Application/frmAddRoute.Designer.cs
diff --git a/Application/frmAddRoute.cs b/Application/frmAddRoute.cs
@@ -11,7 +11,6 @@
 
 namespace WorkStation
 {
-    public delegate void gg();
     public partial class frmAddRoute : Form
     {
         public frmAddRoute()
@@ -24,12 +23,21 @@ public frmAddRoute()
         List<TreeNode> listLogical = new List<TreeNode>();
         private void frmAddRoute_Load(object sender, EventArgs e)
         {
-            tvRouteInit(tvRoute);   
-
+            //tvRouteInit(this.tvRoute);
+            Thread th1 = new Thread(tvRouteInit);
+            th1.Start(this.tvRoute);
             Thread th2 = new Thread(new ThreadStart(getTvPhysicalPoint));
             th2.Start();
-            Thread th3 = new Thread(FM_Init);
-            th3.Start();          
+            //Thread th3 = new Thread(FM_Init);
+            //th3.Start();  
+
+            //chkRoute.Checked = wset.tvRoute;
+            //chkLogicalPoint.Checked = wset.tvLogicalPoint;
+            //chkPhysicalPoint.Checked = wset.tvPhysicalPoint;
+
+            //if (wset.tvRoute) tvRoute.ExpandAll(); else tvRoute.CollapseAll();
+            //if (wset.tvPhysicalPoint) tvPhysicalPoint.ExpandAll(); else tvPhysicalPoint.CollapseAll();
+            //if (wset.tvLogicalPoint) tvLogicalPoint.ExpandAll(); else tvLogicalPoint.CollapseAll();
 
         }
 
@@ -306,7 +314,7 @@ private void getTvPhysicalPoint()
 
         //获取路线
         public static void tvRouteInit(Object tvRoute)
-        {           
+        {
             ((TreeView)tvRoute).Nodes.Clear();
             SqlDataReader dr = SqlHelper.ExecuteReader("Select ID,Name From Company");
             while (dr.Read())
@@ -319,7 +327,11 @@ public static void tvRouteInit(Object tvRoute)
                 {
                     (tnode.Nodes)[i] = tvNodeAdd((tnode.Nodes)[i], "Select ID,Name,Sequence as Sequence from CheckRoute Where site_id=" + (tnode.Nodes)[i].Tag);
                 }
-                ((TreeView)tvRoute).Nodes.Add(tnode);
+                ((TreeView)tvRoute).BeginInvoke((Action)delegate 
+                {
+                    ((TreeView)tvRoute).Nodes.Add(tnode);
+                });
+
             }
             dr.Close();
 
@@ -517,15 +529,5 @@ private void toolStripMenuItem1_Click(object sender, EventArgs e)
             }
         }
 
-        private void bkwInit_DoWork(object sender, DoWorkEventArgs e)
-        {
-
-        }
-
-        private void bkwInit_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
-        {
-
-        }
-
     }
 }
diff --git a/Application/frmAddRoute.resx b/Application/frmAddRoute.resx
@@ -120,9 +120,6 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="bkwInit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>130, 17</value>
-  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/Application/frmMain.Designer.cs b/Application/frmMain.Designer.cs
diff --git a/Application/frmMain.cs b/Application/frmMain.cs
@@ -24,7 +24,7 @@ private void ShowProject(int CurrentRow)
         {
             for (int i = 0; i < this.tableLayoutPanel1.RowStyles.Count; i++)
             {
-                if (i == CurrentRow)
+                if (i == CurrentRow) 
                 {
                     this.tableLayoutPanel1.RowStyles[i].SizeType = SizeType.Percent;
                     this.tableLayoutPanel1.RowStyles[i].Height = 1;
@@ -195,17 +195,22 @@ private void tsmixinjian1_Click(object sender, EventArgs e)
             frmAddPlan frm = new frmAddPlan();
             frm.ShowDialog();
         }
-
+        //任务审核
         private void tsmishenhe1_Click(object sender, EventArgs e)
         {
             frmAddPlanExamine frm = new frmAddPlanExamine();
+            frm.Top = this.Top + (this.Height - frm.Height) / 2;
+            frm.Left = this.Left + (this.Width - frm.Width) / 2;
             frm.Show();
         }
 
+        //任务下发
         private void tsmixiafa1_Click(object sender, EventArgs e)
         {
-            frmAddPlanToTask add = new frmAddPlanToTask();
-            add.ShowDialog();
+            frmAddPlanToTask frm = new frmAddPlanToTask();
+            frm.Top = this.Top + (this.Height - frm.Height) / 2;
+            frm.Left = this.Left + (this.Width - frm.Width) / 2;
+            frm.ShowDialog();
         }
 
         private void tsmigangweiAdd_Click(object sender, EventArgs e)
@@ -399,13 +404,17 @@ private void tsmiDelMachine_Click(object sender, EventArgs e)
         private void tsmixunjiandian_Click_1(object sender, EventArgs e)
         {
             frmAddPoint point = new frmAddPoint();
+            point.Top = this.Top + (this.Height - point.Height) / 2;
+            point.Left = this.Left + (this.Width - point.Width) / 2;
             point.Show();
         }
 
         //巡检项
         private void tsmixunjianxiangs_Click_1(object sender, EventArgs e)
         {
             frmAddItem item = new frmAddItem();
+            item.Top = this.Top + (this.Height - item.Height) / 2;
+            item.Left = this.Left + (this.Width - item.Width) / 2;
             item.Show();
         }