Skip to content
This repository
Browse code

修正性提交

  • Loading branch information...
commit 0b7462b75bb03ff26bf2b01ab4b51c6960d8fd5b 1 parent 4ab8e8f
katway authored October 29, 2012
4  Application/Program.cs.orig
@@ -14,7 +14,11 @@ namespace WorkStation
14 14
         {
15 15
             Application.EnableVisualStyles();
16 16
             Application.SetCompatibleTextRenderingDefault(false);
  17
+<<<<<<< HEAD
17 18
             Application.Run(new frmMain());
  19
+=======
  20
+            Application.Run(new frmEditOrDeleteEmployee());
  21
+>>>>>>> hefangli/master
18 22
         }
19 23
     }
20 24
 }
18  Application/WorkStation.csproj
@@ -149,6 +149,18 @@
149 149
     </Compile>
150 150
     <Compile Include="Program.cs" />
151 151
     <Compile Include="Properties\AssemblyInfo.cs" />
  152
+    <Compile Include="SiteEditDelete.cs">
  153
+      <SubType>Form</SubType>
  154
+    </Compile>
  155
+    <Compile Include="SiteEditDelete.Designer.cs">
  156
+      <DependentUpon>SiteEditDelete.cs</DependentUpon>
  157
+    </Compile>
  158
+    <Compile Include="SiteNew.cs">
  159
+      <SubType>Form</SubType>
  160
+    </Compile>
  161
+    <Compile Include="SiteNew.Designer.cs">
  162
+      <DependentUpon>SiteNew.cs</DependentUpon>
  163
+    </Compile>
152 164
     <EmbeddedResource Include="frmAddCard.resx">
153 165
       <DependentUpon>frmAddCard.cs</DependentUpon>
154 166
     </EmbeddedResource>
@@ -207,6 +219,12 @@
207 219
       <DependentUpon>Resources.resx</DependentUpon>
208 220
       <DesignTime>True</DesignTime>
209 221
     </Compile>
  222
+    <EmbeddedResource Include="SiteEditDelete.resx">
  223
+      <DependentUpon>SiteEditDelete.cs</DependentUpon>
  224
+    </EmbeddedResource>
  225
+    <EmbeddedResource Include="SiteNew.resx">
  226
+      <DependentUpon>SiteNew.cs</DependentUpon>
  227
+    </EmbeddedResource>
210 228
     <None Include="app.config" />
211 229
     <None Include="Properties\Settings.settings">
212 230
       <Generator>PublicSettingsSingleFileGenerator</Generator>
8  Application/frmMain.Designer.cs
@@ -777,28 +777,28 @@ private void InitializeComponent()
777 777
             this.tsmixunjianluxian.Name = "tsmixunjianluxian";
778 778
             this.tsmixunjianluxian.Size = new System.Drawing.Size(154, 22);
779 779
             this.tsmixunjianluxian.Text = "巡检路线管理";
780  
-            this.tsmixunjianluxian.Click += new System.EventHandler(this.tsmixunjianluxian_Click);
  780
+            //this.tsmixunjianluxian.Click += new System.EventHandler(this.tsmixunjianluxian_Click);
781 781
             // 
782 782
             // tsmixunjiandian
783 783
             // 
784 784
             this.tsmixunjiandian.Name = "tsmixunjiandian";
785 785
             this.tsmixunjiandian.Size = new System.Drawing.Size(154, 22);
786 786
             this.tsmixunjiandian.Text = "巡检点管理";
787  
-            this.tsmixunjiandian.Click += new System.EventHandler(this.tsmixunjiandian_Click);
  787
+            //this.tsmixunjiandian.Click += new System.EventHandler(this.tsmixunjiandian_Click);
788 788
             // 
789 789
             // tsmixunjianxiangs
790 790
             // 
791 791
             this.tsmixunjianxiangs.Name = "tsmixunjianxiangs";
792 792
             this.tsmixunjianxiangs.Size = new System.Drawing.Size(154, 22);
793 793
             this.tsmixunjianxiangs.Text = "巡检项管理";
794  
-            this.tsmixunjianxiangs.Click += new System.EventHandler(this.tsmixunjianxiangs_Click);
  794
+            //this.tsmixunjianxiangs.Click += new System.EventHandler(this.tsmixunjianxiangs_Click);
795 795
             // 
796 796
             // tsmishebeixunjianxiang
797 797
             // 
798 798
             this.tsmishebeixunjianxiang.Name = "tsmishebeixunjianxiang";
799 799
             this.tsmishebeixunjianxiang.Size = new System.Drawing.Size(154, 22);
800 800
             this.tsmishebeixunjianxiang.Text = "设备巡检项管理";
801  
-            this.tsmishebeixunjianxiang.Click += new System.EventHandler(this.tsmishebeixunjianxiang_Click);
  801
+            //this.tsmishebeixunjianxiang.Click += new System.EventHandler(this.tsmishebeixunjianxiang_Click);
802 802
             // 
803 803
             // tsmjichu
804 804
             // 
24  Application/frmMain.cs
@@ -9,9 +9,9 @@
9 9
 
10 10
 namespace WorkStation
11 11
 {
12  
-    public partial class frmain : Form
  12
+    public partial class frmMain : Form
13 13
     {
14  
-        public frmain()
  14
+        public frmMain()
15 15
         {
16 16
             InitializeComponent();
17 17
         }
@@ -52,8 +52,8 @@ private void btnItem_Click(object sender, EventArgs e)
52 52
             root1.Nodes.Add(type_Edit);
53 53
 
54 54
             TreeNode type_Delete = new TreeNode("删除");
55  
-            root1.Nodes.Add(type_Delete);   
56  
-            root1.Toggle();           
  55
+            root1.Nodes.Add(type_Delete);
  56
+            root1.Toggle();
57 57
         }
58 58
 
59 59
         private void btnTask_Click(object sender, EventArgs e)
@@ -73,14 +73,14 @@ private void btnTask_Click(object sender, EventArgs e)
73 73
             TreeNode type_Delete = new TreeNode("删除");
74 74
             root1.Nodes.Add(type_Delete);
75 75
 
76  
-            TreeNode type_shenhe1= new TreeNode("审核");
  76
+            TreeNode type_shenhe1 = new TreeNode("审核");
77 77
             root1.Nodes.Add(type_shenhe1);
78 78
 
79  
-            TreeNode type_xiafa= new TreeNode("下发");
  79
+            TreeNode type_xiafa = new TreeNode("下发");
80 80
             root1.Nodes.Add(type_xiafa);
81 81
 
82 82
             TreeNode type_Exits = new TreeNode("退出");
83  
-            root1.Nodes.Add(type_Exits);                    
  83
+            root1.Nodes.Add(type_Exits);
84 84
 
85 85
         }
86 86
 
@@ -102,7 +102,7 @@ private void btnReport_Click(object sender, EventArgs e)
102 102
             root1.Nodes.Add(type_chuqin);
103 103
 
104 104
             TreeNode type_dianjian = new TreeNode("点检异常统计");
105  
-            root1.Nodes.Add(type_dianjian); 
  105
+            root1.Nodes.Add(type_dianjian);
106 106
 
107 107
         }
108 108
 
@@ -171,7 +171,7 @@ private void btnCard_Click(object sender, EventArgs e)
171 171
             root1.Nodes.Add(type_yongtu);
172 172
 
173 173
             TreeNode type_zhuxiaokapian = new TreeNode("注销卡片");
174  
-            root1.Nodes.Add(type_zhuxiaokapian);           
  174
+            root1.Nodes.Add(type_zhuxiaokapian);
175 175
 
176 176
         }
177 177
 
@@ -182,7 +182,7 @@ private void tsmixinjian_Click(object sender, EventArgs e)
182 182
 
183 183
         private void tsmichangquguanli_Click(object sender, EventArgs e)
184 184
         {
185  
-            SiteNew s1=new SiteNew();
  185
+            SiteNew s1 = new SiteNew();
186 186
             s1.Show();
187 187
         }
188 188
 
@@ -192,8 +192,8 @@ private void tsmixinjian1_Click(object sender, EventArgs e)
192 192
             task.Show();
193 193
         }
194 194
 
195  
-      
196 195
 
197  
-       
  196
+
  197
+
198 198
     }
199 199
 }
227  Application/frmMain.cs.orig
... ...
@@ -0,0 +1,227 @@
  1
+using System;
  2
+using System.Collections.Generic;
  3
+using System.ComponentModel;
  4
+using System.Data;
  5
+using System.Drawing;
  6
+using System.Linq;
  7
+using System.Text;
  8
+using System.Windows.Forms;
  9
+
  10
+namespace WorkStation
  11
+{
  12
+    public partial class frmMain : Form
  13
+    {
  14
+        public frmMain()
  15
+        {
  16
+            InitializeComponent();
  17
+        }
  18
+        private void Application_Load(object sender, EventArgs e)
  19
+        {
  20
+            btnItem_Click(sender, e);
  21
+        }
  22
+        private void ShowProject(int CurrentRow)
  23
+        {
  24
+            for (int i = 0; i < this.tableLayoutPanel1.RowStyles.Count; i++)
  25
+            {
  26
+                if (i == CurrentRow)
  27
+                {
  28
+                    this.tableLayoutPanel1.RowStyles[i].SizeType = SizeType.Percent;
  29
+                    this.tableLayoutPanel1.RowStyles[i].Height = 1;
  30
+                }
  31
+                else
  32
+                {
  33
+                    this.tableLayoutPanel1.RowStyles[i].SizeType = SizeType.Absolute;
  34
+                    this.tableLayoutPanel1.RowStyles[i].Height = 25;
  35
+                }
  36
+            }
  37
+        }
  38
+
  39
+        private void btnItem_Click(object sender, EventArgs e)
  40
+        {
  41
+            this.ShowProject(0);
  42
+
  43
+            this.treeView1.Nodes.Clear();
  44
+
  45
+            TreeNode root1 = new TreeNode("巡检项模版");
  46
+            this.treeView1.Nodes.Add(root1);
  47
+
  48
+            TreeNode type_Build = new TreeNode("新建");
  49
+            root1.Nodes.Add(type_Build);
  50
+
  51
+            TreeNode type_Edit = new TreeNode("编辑");
  52
+            root1.Nodes.Add(type_Edit);
  53
+
  54
+            TreeNode type_Delete = new TreeNode("删除");
  55
+            root1.Nodes.Add(type_Delete);   
  56
+            root1.Toggle();           
  57
+        }
  58
+
  59
+        private void btnTask_Click(object sender, EventArgs e)
  60
+        {
  61
+            this.ShowProject(1);
  62
+            this.treeView2.Nodes.Clear();
  63
+
  64
+            TreeNode root1 = new TreeNode("任务管理");
  65
+            this.treeView2.Nodes.Add(root1);
  66
+
  67
+            TreeNode type_Buld = new TreeNode("新建");
  68
+            root1.Nodes.Add(type_Buld);
  69
+
  70
+            TreeNode type_Edit = new TreeNode("编辑");
  71
+            root1.Nodes.Add(type_Edit);
  72
+
  73
+            TreeNode type_Delete = new TreeNode("删除");
  74
+            root1.Nodes.Add(type_Delete);
  75
+
  76
+            TreeNode type_shenhe1= new TreeNode("审核");
  77
+            root1.Nodes.Add(type_shenhe1);
  78
+
  79
+            TreeNode type_xiafa= new TreeNode("下发");
  80
+            root1.Nodes.Add(type_xiafa);
  81
+
  82
+            TreeNode type_Exits = new TreeNode("退出");
  83
+            root1.Nodes.Add(type_Exits);                    
  84
+
  85
+        }
  86
+
  87
+        private void btnReport_Click(object sender, EventArgs e)
  88
+        {
  89
+            this.ShowProject(2);
  90
+            this.treeView3.Nodes.Clear();
  91
+
  92
+            TreeNode root1 = new TreeNode("统计报表");
  93
+            this.treeView3.Nodes.Add(root1);
  94
+
  95
+            TreeNode type_renyuan = new TreeNode("人员出勤统计");
  96
+            root1.Nodes.Add(type_renyuan);
  97
+
  98
+            TreeNode type_xunjianxiang = new TreeNode("巡检项统计");
  99
+            root1.Nodes.Add(type_xunjianxiang);
  100
+
  101
+            TreeNode type_chuqin = new TreeNode("出勤异常统计");
  102
+            root1.Nodes.Add(type_chuqin);
  103
+
  104
+            TreeNode type_dianjian = new TreeNode("点检异常统计");
  105
+            root1.Nodes.Add(type_dianjian); 
  106
+
  107
+        }
  108
+
  109
+        private void btnInfo_Click(object sender, EventArgs e)
  110
+        {
  111
+            this.ShowProject(3);
  112
+            this.treeView5.Nodes.Clear();
  113
+
  114
+            TreeNode root1 = new TreeNode("巡检信息");
  115
+            this.treeView5.Nodes.Add(root1);
  116
+
  117
+            TreeNode type_xunjianluxian = new TreeNode("巡检路线管理");
  118
+            root1.Nodes.Add(type_xunjianluxian);
  119
+
  120
+            TreeNode type_xunjiandian = new TreeNode("巡检点管理");
  121
+            root1.Nodes.Add(type_xunjiandian);
  122
+
  123
+            TreeNode type_xunjianxiang = new TreeNode("巡检项管理");
  124
+            root1.Nodes.Add(type_xunjianxiang);
  125
+
  126
+            TreeNode type_shebeixunjianxiang = new TreeNode("设备巡检项管理");
  127
+            root1.Nodes.Add(type_shebeixunjianxiang);
  128
+
  129
+        }
  130
+
  131
+        private void btnBasic_Click(object sender, EventArgs e)
  132
+        {
  133
+            this.ShowProject(4);
  134
+            this.treeView6.Nodes.Clear();
  135
+
  136
+            TreeNode root1 = new TreeNode("基础信息");
  137
+            this.treeView6.Nodes.Add(root1);
  138
+
  139
+            TreeNode type_Name = new TreeNode("公司名称");
  140
+            root1.Nodes.Add(type_Name);
  141
+
  142
+            TreeNode type_changqu = new TreeNode("厂区管理");
  143
+            root1.Nodes.Add(type_changqu);
  144
+
  145
+            TreeNode type_chejian = new TreeNode("车间管理");
  146
+            root1.Nodes.Add(type_chejian);
  147
+
  148
+            TreeNode type_gangwei = new TreeNode("岗位管理");
  149
+            root1.Nodes.Add(type_gangwei);
  150
+
  151
+            TreeNode type_renyuan = new TreeNode("人员管理");
  152
+            root1.Nodes.Add(type_renyuan);
  153
+
  154
+            TreeNode type_banci = new TreeNode("班次管理");
  155
+            root1.Nodes.Add(type_banci);
  156
+
  157
+        }
  158
+
  159
+        private void btnCard_Click(object sender, EventArgs e)
  160
+        {
  161
+            this.ShowProject(5);
  162
+            this.treeView7.Nodes.Clear();
  163
+
  164
+            TreeNode root1 = new TreeNode("卡片管理");
  165
+            this.treeView7.Nodes.Add(root1);
  166
+
  167
+            TreeNode type_xinka = new TreeNode("录入新卡");
  168
+            root1.Nodes.Add(type_xinka);
  169
+
  170
+            TreeNode type_yongtu = new TreeNode("编辑用途");
  171
+            root1.Nodes.Add(type_yongtu);
  172
+
  173
+            TreeNode type_zhuxiaokapian = new TreeNode("注销卡片");
  174
+            root1.Nodes.Add(type_zhuxiaokapian);           
  175
+
  176
+        }
  177
+
  178
+<<<<<<< HEAD:Application/frmMain.cs
  179
+        //新建巡检项
  180
+        private void tsmixunjianxiangs_Click(object sender, EventArgs e)
  181
+        {
  182
+            frmAddItem additem = new frmAddItem();
  183
+            additem.ShowDialog();
  184
+        }
  185
+
  186
+        //新建巡检点
  187
+        private void tsmixunjiandian_Click(object sender, EventArgs e)
  188
+        {
  189
+            frmAddPoint addpoint = new frmAddPoint();
  190
+            addpoint.ShowDialog();
  191
+        }
  192
+=======
  193
+        private void tsmixinjian_Click(object sender, EventArgs e)
  194
+        {
  195
+
  196
+        }
  197
+
  198
+        private void tsmichangquguanli_Click(object sender, EventArgs e)
  199
+        {
  200
+            SiteNew s1=new SiteNew();
  201
+            s1.Show();
  202
+        }
  203
+
  204
+        private void tsmixinjian1_Click(object sender, EventArgs e)
  205
+        {
  206
+            frmIssueTask task = new frmIssueTask();
  207
+            task.Show();
  208
+        }
  209
+
  210
+      
  211
+>>>>>>> hefangli/master:Application/frmain.cs
  212
+
  213
+        //新建设备
  214
+        private void tsmishebeixunjianxiang_Click(object sender, EventArgs e)
  215
+        {
  216
+            frmAddMachine fm = new frmAddMachine();
  217
+            fm.ShowDialog();
  218
+        }
  219
+
  220
+        private void tsmixunjianluxian_Click(object sender, EventArgs e)
  221
+        {
  222
+            frmAddRoute frm = new frmAddRoute();
  223
+            frm.Show();
  224
+        }
  225
+       
  226
+    }
  227
+}

0 notes on commit 0b7462b

Please sign in to comment.
Something went wrong with that request. Please try again.