Skip to content
Browse files

Merge remote-tracking branch 'hefangli/master' into Develop

Conflicts:
	Application/Code/CommonClass.cs
	Application/Code/SqlHelper.cs
	Application/WorkStation.csproj
	Application/frmAddTask.Designer.cs
	Application/frmAddTask.cs
	Application/frmMain.Designer.cs
	Application/frmMain.cs
	Application/frmMain.cs.orig
	Application/frmMain.cs~HEAD
	Application/frmain.cs
  • Loading branch information...
2 parents cfc702b + fa454f1 commit 86eb9379b59b6d3cafa182f8c3ce2235d3dcddbe qicb committed Oct 30, 2012
Showing with 14,553 additions and 4,187 deletions.
  1. +11 −0 Application/ClassDiagram1.cd
  2. +11 −0 Application/ClassDiagram2.cd
  3. +11 −0 Application/ClassDiagram3.cd
  4. +11 −0 Application/ClassDiagram4.cd
  5. +11 −0 Application/ClassDiagram5.cd
  6. +29 −29 Application/Code/CommonClass.cs
  7. +22 −0 Application/Code/CommonClass.cs.orig
  8. +2,381 −2,381 Application/Code/SqlHelper.cs
  9. +4,772 −0 Application/Code/SqlHelper.cs.orig
  10. +0 −271 Application/Main.Designer.cs
  11. +0 −20 Application/Main.cs
  12. +0 −208 Application/Main.resx
  13. +5 −2 Application/Program.cs.orig
  14. +1 −1 Application/Properties/Resources.Designer.cs
  15. +45 −25 Application/Properties/Settings.Designer.cs.orig
  16. +21 −21 Application/Properties/Settings.settings
  17. +37 −0 Application/Properties/Settings.settings.orig
  18. +219 −0 Application/SiteEditDelete.Designer.cs
  19. +119 −0 Application/SiteEditDelete.cs
  20. +144 −0 Application/SiteEditDelete.resx
  21. +200 −0 Application/SiteNew.Designer.cs
  22. +98 −0 Application/SiteNew.cs
  23. +135 −0 Application/SiteNew.resx
  24. +350 −277 Application/WorkStation.csproj
  25. +92 −21 Application/WorkStation.csproj.orig
  26. +24 −24 Application/app.config
  27. +35 −0 Application/app.config.orig
  28. +86 −71 Application/frmAddCard.Designer.cs
  29. +69 −2 Application/frmAddCard.cs
  30. +33 −0 Application/frmAddCard.resx
  31. +223 −0 Application/frmAddCompany.Designer.cs
  32. +60 −0 Application/frmAddCompany.cs
  33. +135 −0 Application/frmAddCompany.resx
  34. +225 −0 Application/frmAddEmployee.Designer.cs
  35. +92 −0 Application/frmAddEmployee.cs
  36. +135 −0 Application/frmAddEmployee.resx
  37. +209 −209 Application/frmAddItem.cs
  38. +232 −0 Application/frmAddItem.cs.orig
  39. +1 −1 Application/frmAddPoint.Designer.cs
  40. +213 −0 Application/frmAddPoint.Designer.cs.orig
  41. +150 −150 Application/frmAddPoint.cs
  42. +178 −0 Application/frmAddPoint.cs.orig
  43. +193 −0 Application/frmAddPost.Designer.cs
  44. +62 −0 Application/frmAddPost.cs
  45. +144 −0 Application/frmAddPost.resx
  46. +122 −0 Application/frmAddRoutName.cs.orig
  47. +487 −0 Application/frmAddRoute.Designer.cs.orig
  48. +490 −0 Application/frmAddRoute.cs.orig
  49. +372 −372 Application/frmAddTask.Designer.cs
  50. +91 −71 Application/frmEditAndDeleteCard.Designer.cs
  51. +96 −1 Application/frmEditAndDeleteCard.cs
  52. +15 −0 Application/frmEditAndDeleteCard.resx
  53. +249 −0 Application/frmEditOrDeleteCompany.Designer.cs
  54. +90 −0 Application/frmEditOrDeleteCompany.cs
  55. +150 −0 Application/frmEditOrDeleteCompany.resx
  56. +251 −0 Application/frmEditOrDeleteEmployee.Designer.cs
  57. +134 −0 Application/frmEditOrDeleteEmployee.cs
  58. +150 −0 Application/frmEditOrDeleteEmployee.resx
  59. +7 −7 Application/frmEditOrDeleteItem.Designer.cs
  60. +219 −0 Application/frmEditOrDeletePost.Designer.cs
  61. +96 −0 Application/frmEditOrDeletePost.cs
  62. +138 −0 Application/frmEditOrDeletePost.resx
  63. +1 −1 Application/frmEditOrDeleteRoute.Designer.cs
  64. +1 −2 Application/frmEditOrDeleteTask.Designer.cs
  65. +0 −4 Application/frmEditOrDeleteTask.cs
  66. +1 −1 Application/frmIssueTask.Designer.cs
  67. +79 −15 Application/frmMain.Designer.cs
  68. +90 −0 Application/frmMain.cs
Sorry, we could not display the entire diff because it was too big.
View
11 Application/ClassDiagram1.cd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.frmEditAndDeleteCard" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AQAAgCAAACIACBBQAACAgAACAAg5hgAAAHAAAAAAAAY=</HashCode>
+ <FileName>frmEditAndDeleteCard.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
View
11 Application/ClassDiagram2.cd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.frmAddPost" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>IAEAAAAAACIAABEAAACAAEACAAg4BBgAAAAAAAIAAAQ=</HashCode>
+ <FileName>frmAddPost.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
View
11 Application/ClassDiagram3.cd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.SiteNew" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>gQQAASAABCIAQBEAAACAgMACAAA4BBQAAAAAAAIAAAU=</HashCode>
+ <FileName>SiteNew.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
View
11 Application/ClassDiagram4.cd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.frmEditOrDeleteCompany" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAgiAAACIAABEABACAAEACAAo4hgAiAQAAAAAAAAY=</HashCode>
+ <FileName>frmEditOrDeleteCompany.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
View
11 Application/ClassDiagram5.cd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Class Name="WorkStation.SiteEditDelete" Collapsed="true">
+ <Position X="0.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>gQAAgCAABCIAABEAAADAgMACAAA4BBAAAQAAAAIAAQQ=</HashCode>
+ <FileName>SiteEditDelete.cs</FileName>
+ </TypeIdentifier>
+ </Class>
+ <Font Name="宋体" Size="9" />
+</ClassDiagram>
View
58 Application/Code/CommonClass.cs
@@ -1,29 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace WorkStation
-{
- public class CommonClass
- {
- }
- public class BoxItem
- {
- public BoxItem()
- { }
- public BoxItem(string text, string value)
- {
- this.Text = text;
- this.Value = value;
- }
- private string _text = null;
- private object _value = null;
- public string Text { get { return this._text; } set { this._text = value; } }
- public object Value { get { return this._value; } set { this._value = value; } }
- public override string ToString()
- {
- return this._text;
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WorkStation
+{
+ public class CommonClass
+ {
+ }
+ public class BoxItem
+ {
+ public BoxItem()
+ { }
+ public BoxItem(string text, string value)
+ {
+ this.Text = text;
+ this.Value = value;
+ }
+ private string _text = null;
+ private object _value = null;
+ public string Text { get { return this._text; } set { this._text = value; } }
+ public object Value { get { return this._value; } set { this._value = value; } }
+ public override string ToString()
+ {
+ return this._text;
+ }
+ }
+}
View
22 Application/Code/CommonClass.cs.orig
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WorkStation
+{
+ public class CommonClass
+ {
+ }
+ public class BoxItem
+ {
+ private string _text = null;
+ private object _value = null;
+ public string Text { get { return this._text; } set { this._text = value; } }
+ public object Value { get { return this._value; } set { this._value = value; } }
+ public override string ToString()
+ {
+ return this._text;
+ }
+ }
+}
View
4,762 Application/Code/SqlHelper.cs
2,381 additions, 2,381 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4,772 Application/Code/SqlHelper.cs.orig
4,772 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
271 Application/Main.Designer.cs
@@ -1,271 +0,0 @@
-namespace WorkStation
-{
- partial class Main
- {
- /// <summary>
- /// 必需的设计器变量。
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// 清理所有正在使用的资源。
- /// </summary>
- /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows 窗体设计器生成的代码
-
- /// <summary>
- /// 设计器支持所需的方法 - 不要
- /// 使用代码编辑器修改此方法的内容。
- /// </summary>
- private void InitializeComponent()
- {
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
- this.menuStrip1 = new System.Windows.Forms.MenuStrip();
- this.巡检项模板ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.任务管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.统计报表ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.巡检信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.基础信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.卡片管理ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripContainer1 = new System.Windows.Forms.ToolStripContainer();
- this.toolStrip1 = new System.Windows.Forms.ToolStrip();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
- this.treeView1 = new System.Windows.Forms.TreeView();
- this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
- this.menuStrip1.SuspendLayout();
- this.toolStripContainer1.BottomToolStripPanel.SuspendLayout();
- this.toolStripContainer1.ContentPanel.SuspendLayout();
- this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
- this.toolStripContainer1.SuspendLayout();
- this.toolStrip1.SuspendLayout();
- this.statusStrip1.SuspendLayout();
- this.SuspendLayout();
- //
- // menuStrip1
- //
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.巡检项模板ToolStripMenuItem,
- this.任务管理ToolStripMenuItem,
- this.统计报表ToolStripMenuItem,
- this.巡检信息ToolStripMenuItem,
- this.基础信息ToolStripMenuItem,
- this.卡片管理ToolStripMenuItem,
- this.帮助ToolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(1029, 25);
- this.menuStrip1.TabIndex = 1;
- this.menuStrip1.Text = "menuStrip1";
- //
- // 巡检项模板ToolStripMenuItem
- //
- this.巡检项模板ToolStripMenuItem.Name = "巡检项模板ToolStripMenuItem";
- this.巡检项模板ToolStripMenuItem.Size = new System.Drawing.Size(95, 21);
- this.巡检项模板ToolStripMenuItem.Text = "巡检项模板(&T)";
- //
- // 任务管理ToolStripMenuItem
- //
- this.任务管理ToolStripMenuItem.Name = "任务管理ToolStripMenuItem";
- this.任务管理ToolStripMenuItem.Size = new System.Drawing.Size(84, 21);
- this.任务管理ToolStripMenuItem.Text = "任务管理(&A)";
- //
- // 统计报表ToolStripMenuItem
- //
- this.统计报表ToolStripMenuItem.Name = "统计报表ToolStripMenuItem";
- this.统计报表ToolStripMenuItem.Size = new System.Drawing.Size(84, 21);
- this.统计报表ToolStripMenuItem.Text = "统计报表(&R)";
- //
- // 巡检信息ToolStripMenuItem
- //
- this.巡检信息ToolStripMenuItem.Name = "巡检信息ToolStripMenuItem";
- this.巡检信息ToolStripMenuItem.Size = new System.Drawing.Size(80, 21);
- this.巡检信息ToolStripMenuItem.Text = "巡检信息(&I)";
- //
- // 基础信息ToolStripMenuItem
- //
- this.基础信息ToolStripMenuItem.Name = "基础信息ToolStripMenuItem";
- this.基础信息ToolStripMenuItem.Size = new System.Drawing.Size(84, 21);
- this.基础信息ToolStripMenuItem.Text = "基础信息(&B)";
- //
- // 卡片管理ToolStripMenuItem
- //
- this.卡片管理ToolStripMenuItem.Name = "卡片管理ToolStripMenuItem";
- this.卡片管理ToolStripMenuItem.Size = new System.Drawing.Size(84, 21);
- this.卡片管理ToolStripMenuItem.Text = "卡片管理(&C)";
- //
- // 帮助ToolStripMenuItem
- //
- this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
- this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(61, 21);
- this.帮助ToolStripMenuItem.Text = "帮助(&H)";
- //
- // toolStripContainer1
- //
- //
- // toolStripContainer1.BottomToolStripPanel
- //
- this.toolStripContainer1.BottomToolStripPanel.Controls.Add(this.statusStrip1);
- //
- // toolStripContainer1.ContentPanel
- //
- this.toolStripContainer1.ContentPanel.Controls.Add(this.treeView1);
- this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(1029, 353);
- this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.toolStripContainer1.Location = new System.Drawing.Point(0, 25);
- this.toolStripContainer1.Name = "toolStripContainer1";
- this.toolStripContainer1.Size = new System.Drawing.Size(1029, 400);
- this.toolStripContainer1.TabIndex = 3;
- this.toolStripContainer1.Text = "toolStripContainer1";
- //
- // toolStripContainer1.TopToolStripPanel
- //
- this.toolStripContainer1.TopToolStripPanel.Controls.Add(this.toolStrip1);
- //
- // toolStrip1
- //
- this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
- this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripButton1,
- this.toolStripButton2,
- this.toolStripButton3,
- this.toolStripButton4});
- this.toolStrip1.Location = new System.Drawing.Point(3, 0);
- this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(204, 25);
- this.toolStrip1.TabIndex = 0;
- //
- // toolStripButton1
- //
- this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton1.Text = "toolStripButton1";
- //
- // toolStripButton2
- //
- this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
- this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton2.Name = "toolStripButton2";
- this.toolStripButton2.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton2.Text = "toolStripButton2";
- //
- // toolStripButton3
- //
- this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
- this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton3.Name = "toolStripButton3";
- this.toolStripButton3.Size = new System.Drawing.Size(123, 22);
- this.toolStripButton3.Text = "toolStripButton3";
- //
- // toolStripButton4
- //
- this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
- this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton4.Name = "toolStripButton4";
- this.toolStripButton4.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton4.Text = "toolStripButton4";
- //
- // treeView1
- //
- this.treeView1.Location = new System.Drawing.Point(3, 3);
- this.treeView1.Name = "treeView1";
- this.treeView1.Size = new System.Drawing.Size(121, 97);
- this.treeView1.TabIndex = 0;
- //
- // statusStrip1
- //
- this.statusStrip1.Dock = System.Windows.Forms.DockStyle.None;
- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripProgressBar1,
- this.toolStripDropDownButton1});
- this.statusStrip1.Location = new System.Drawing.Point(0, 0);
- this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(1029, 22);
- this.statusStrip1.TabIndex = 0;
- //
- // toolStripProgressBar1
- //
- this.toolStripProgressBar1.Name = "toolStripProgressBar1";
- this.toolStripProgressBar1.Size = new System.Drawing.Size(100, 16);
- //
- // toolStripDropDownButton1
- //
- this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(29, 20);
- this.toolStripDropDownButton1.Text = "toolStripDropDownButton1";
- //
- // Main
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1029, 425);
- this.Controls.Add(this.toolStripContainer1);
- this.Controls.Add(this.menuStrip1);
- this.IsMdiContainer = true;
- this.MainMenuStrip = this.menuStrip1;
- this.Name = "Main";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "RFID智能巡检系统";
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
- this.toolStripContainer1.BottomToolStripPanel.ResumeLayout(false);
- this.toolStripContainer1.BottomToolStripPanel.PerformLayout();
- this.toolStripContainer1.ContentPanel.ResumeLayout(false);
- this.toolStripContainer1.TopToolStripPanel.ResumeLayout(false);
- this.toolStripContainer1.TopToolStripPanel.PerformLayout();
- this.toolStripContainer1.ResumeLayout(false);
- this.toolStripContainer1.PerformLayout();
- this.toolStrip1.ResumeLayout(false);
- this.toolStrip1.PerformLayout();
- this.statusStrip1.ResumeLayout(false);
- this.statusStrip1.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.MenuStrip menuStrip1;
- private System.Windows.Forms.ToolStripMenuItem 巡检项模板ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 任务管理ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 统计报表ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 巡检信息ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 基础信息ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 卡片管理ToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem 帮助ToolStripMenuItem;
- private System.Windows.Forms.ToolStripContainer toolStripContainer1;
- private System.Windows.Forms.ToolStrip toolStrip1;
- private System.Windows.Forms.ToolStripButton toolStripButton1;
- private System.Windows.Forms.ToolStripButton toolStripButton2;
- private System.Windows.Forms.ToolStripButton toolStripButton3;
- private System.Windows.Forms.ToolStripButton toolStripButton4;
- private System.Windows.Forms.TreeView treeView1;
- private System.Windows.Forms.StatusStrip statusStrip1;
- private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar1;
- private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
- }
-}
-
View
20 Application/Main.cs
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace WorkStation
-{
- public partial class Main : Form
- {
- public Main()
- {
- InitializeComponent();
- }
-
- }
-}
View
208 Application/Main.resx
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>18, -1</value>
- </metadata>
- <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>358, -1</value>
- </metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>138, -1</value>
- </metadata>
- <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
- ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
- HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
- rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
- TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
- oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
- 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
- xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
- LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
- KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
-</value>
- </data>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>28</value>
- </metadata>
-</root>
View
7 Application/Program.cs.orig
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
-
namespace WorkStation
{
static class Program
@@ -15,7 +14,11 @@ namespace WorkStation
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new Main());
+<<<<<<< HEAD
+ Application.Run(new frmain());
+=======
+ Application.Run(new frmMain());
+>>>>>>> weiyunbing/Develop
}
}
}
View
2 Application/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
-// 运行时版本:4.0.30319.17929
+// 运行时版本:4.0.30319.269
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
View
70 Application/Properties/Settings.Designer.cs.orig
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
-// 运行时版本:4.0.30319.17929
+// 运行时版本:4.0.30319.269
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
@@ -14,7 +13,7 @@ namespace WorkStation.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+ public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -23,33 +22,54 @@ namespace WorkStation.Properties {
return defaultInstance;
}
}
- }
-}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
+ [global::System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123")]
+ public string ConnectionString {
+ get {
+ return ((string)(this["ConnectionString"]));
+ }
+ }
+<<<<<<< HEAD
=======
-//------------------------------------------------------------------------------
-// <auto-generated>
-// 此代码由工具生成。
-// 运行时版本:4.0.30319.269
-//
-// 对此文件的更改可能会导致不正确的行为,并且如果
-// 重新生成代码,这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Application.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvRoute {
+ get {
+ return ((bool)(this["tvRoute"]));
+ }
+ set {
+ this["tvRoute"] = value;
+ }
+ }
- public static Settings Default {
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvLogicalPoint {
get {
- return defaultInstance;
+ return ((bool)(this["tvLogicalPoint"]));
+ }
+ set {
+ this["tvLogicalPoint"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool tvPhysicalPoint {
+ get {
+ return ((bool)(this["tvPhysicalPoint"]));
+ }
+ set {
+ this["tvPhysicalPoint"] = value;
}
}
+>>>>>>> qicb/Develop
}
}
->>>>>>> hefl
View
42 Application/Properties/Settings.settings
@@ -1,22 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WorkStation.Properties" GeneratedClassName="Settings">
- <Profiles />
- <Settings>
- <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
- <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
- &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
- <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
- </Setting>
- <Setting Name="tvRoute" Type="System.Boolean" Scope="User">
- <Value Profile="(Default)">True</Value>
- </Setting>
- <Setting Name="tvLogicalPoint" Type="System.Boolean" Scope="User">
- <Value Profile="(Default)">True</Value>
- </Setting>
- <Setting Name="tvPhysicalPoint" Type="System.Boolean" Scope="User">
- <Value Profile="(Default)">True</Value>
- </Setting>
- </Settings>
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WorkStation.Properties" GeneratedClassName="Settings">
+ <Profiles />
+ <Settings>
+ <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
+ <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+ &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+ <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
+ </Setting>
+ <Setting Name="tvRoute" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvLogicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvPhysicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ </Settings>
</SettingsFile>
View
37 Application/Properties/Settings.settings.orig
@@ -0,0 +1,37 @@
+<<<<<<< HEAD
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="DAL.Properties" GeneratedClassName="Settings">
+ <Profiles />
+ <Settings>
+ <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
+ <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+ &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+ <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
+ </Setting>
+ </Settings>
+=======
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WorkStation.Properties" GeneratedClassName="Settings">
+ <Profiles />
+ <Settings>
+ <Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
+ <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+ &lt;ConnectionString&gt;Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123&lt;/ConnectionString&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+ <Value Profile="(Default)">Data Source=192.168.1.221;Initial Catalog=Patrol;UserId=sa;Password=sa123</Value>
+ </Setting>
+ <Setting Name="tvRoute" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvLogicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ <Setting Name="tvPhysicalPoint" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
+ </Settings>
+>>>>>>> qicb/Develop
+</SettingsFile>
View
219 Application/SiteEditDelete.Designer.cs
@@ -0,0 +1,219 @@
+namespace WorkStation
+{
+ partial class SiteEditDelete
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.dgvSite = new System.Windows.Forms.DataGridView();
+ this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.btnSave = new System.Windows.Forms.Button();
+ this.cboCompany = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtAlias = new System.Windows.Forms.TextBox();
+ this.lblAlias = new System.Windows.Forms.Label();
+ this.txtName = new System.Windows.Forms.TextBox();
+ this.lblName = new System.Windows.Forms.Label();
+ this.btnEdit = new System.Windows.Forms.Button();
+ this.btnDelete = new System.Windows.Forms.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSite)).BeginInit();
+ this.SuspendLayout();
+ //
+ // dgvSite
+ //
+ this.dgvSite.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dgvSite.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.Column1,
+ this.Column2,
+ this.Column3,
+ this.Column4});
+ this.dgvSite.Location = new System.Drawing.Point(49, 21);
+ this.dgvSite.Name = "dgvSite";
+ this.dgvSite.RowTemplate.Height = 23;
+ this.dgvSite.Size = new System.Drawing.Size(630, 163);
+ this.dgvSite.TabIndex = 7;
+ //
+ // Column1
+ //
+ this.Column1.DataPropertyName = "ID";
+ this.Column1.HeaderText = "编号";
+ this.Column1.Name = "Column1";
+ //
+ // Column2
+ //
+ this.Column2.DataPropertyName = "Name";
+ this.Column2.HeaderText = "名称";
+ this.Column2.Name = "Column2";
+ //
+ // Column3
+ //
+ this.Column3.DataPropertyName = "Alias";
+ this.Column3.HeaderText = "别名";
+ this.Column3.Name = "Column3";
+ //
+ // Column4
+ //
+ this.Column4.DataPropertyName = "Name1";
+ this.Column4.HeaderText = "所属公司";
+ this.Column4.Name = "Column4";
+ //
+ // btnCancel
+ //
+ this.btnCancel.Location = new System.Drawing.Point(501, 290);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 17;
+ this.btnCancel.Text = "取消";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // btnSave
+ //
+ this.btnSave.Location = new System.Drawing.Point(501, 358);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(75, 23);
+ this.btnSave.TabIndex = 16;
+ this.btnSave.Text = "保存";
+ this.btnSave.UseVisualStyleBackColor = true;
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
+ // cboCompany
+ //
+ this.cboCompany.FormattingEnabled = true;
+ this.cboCompany.Location = new System.Drawing.Point(136, 358);
+ this.cboCompany.Name = "cboCompany";
+ this.cboCompany.Size = new System.Drawing.Size(134, 20);
+ this.cboCompany.TabIndex = 14;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(63, 366);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.TabIndex = 13;
+ this.label1.Text = "所属公司";
+ //
+ // txtAlias
+ //
+ this.txtAlias.Location = new System.Drawing.Point(136, 307);
+ this.txtAlias.Name = "txtAlias";
+ this.txtAlias.Size = new System.Drawing.Size(264, 21);
+ this.txtAlias.TabIndex = 12;
+ //
+ // lblAlias
+ //
+ this.lblAlias.AutoSize = true;
+ this.lblAlias.Location = new System.Drawing.Point(78, 316);
+ this.lblAlias.Name = "lblAlias";
+ this.lblAlias.Size = new System.Drawing.Size(29, 12);
+ this.lblAlias.TabIndex = 11;
+ this.lblAlias.Text = "别名";
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(136, 264);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(264, 21);
+ this.txtName.TabIndex = 10;
+ //
+ // lblName
+ //
+ this.lblName.AutoSize = true;
+ this.lblName.Location = new System.Drawing.Point(78, 269);
+ this.lblName.Name = "lblName";
+ this.lblName.Size = new System.Drawing.Size(29, 12);
+ this.lblName.TabIndex = 9;
+ this.lblName.Text = "名称";
+ //
+ // btnEdit
+ //
+ this.btnEdit.Location = new System.Drawing.Point(501, 200);
+ this.btnEdit.Name = "btnEdit";
+ this.btnEdit.Size = new System.Drawing.Size(75, 23);
+ this.btnEdit.TabIndex = 18;
+ this.btnEdit.Text = "编辑";
+ this.btnEdit.UseVisualStyleBackColor = true;
+ this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
+ //
+ // btnDelete
+ //
+ this.btnDelete.Location = new System.Drawing.Point(604, 200);
+ this.btnDelete.Name = "btnDelete";
+ this.btnDelete.Size = new System.Drawing.Size(75, 23);
+ this.btnDelete.TabIndex = 19;
+ this.btnDelete.Text = "删除";
+ this.btnDelete.UseVisualStyleBackColor = true;
+ this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
+ //
+ // SiteEditDelete
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(734, 429);
+ this.Controls.Add(this.btnDelete);
+ this.Controls.Add(this.btnEdit);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnSave);
+ this.Controls.Add(this.cboCompany);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.txtAlias);
+ this.Controls.Add(this.lblAlias);
+ this.Controls.Add(this.txtName);
+ this.Controls.Add(this.lblName);
+ this.Controls.Add(this.dgvSite);
+ this.Name = "SiteEditDelete";
+ this.Text = "编辑及删除厂区";
+ this.Load += new System.EventHandler(this.SiteEditDelete_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSite)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.DataGridView dgvSite;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.Button btnSave;
+ private System.Windows.Forms.ComboBox cboCompany;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox txtAlias;
+ private System.Windows.Forms.Label lblAlias;
+ private System.Windows.Forms.TextBox txtName;
+ private System.Windows.Forms.Label lblName;
+ private System.Windows.Forms.Button btnEdit;
+ private System.Windows.Forms.Button btnDelete;
+ }
+}
View
119 Application/SiteEditDelete.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Data.SqlClient;
+namespace WorkStation
+{
+ public partial class SiteEditDelete : Form
+ {
+ private static string sqlConnectionStr = "Data Source=192.168.1.221;Initial Catalog=Patrol;User ID=sa;Password=sa123";
+ public SiteEditDelete()
+ {
+ InitializeComponent();
+ }
+ /// <summary>
+ /// 更新`
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnSave_Click(object sender, EventArgs e)
+ {
+ string b = "update Site set Site.Name=@name,Site.Alias=@alias,Site.Company_ID=@comid where Site.ID=@id";
+ SqlParameter[] par = new SqlParameter[] { new SqlParameter("@id",dgvSite.SelectedCells[0].Value),
+ new SqlParameter("@name",SqlDbType.NVarChar),
+ new SqlParameter("@alias",SqlDbType.NVarChar),
+ new SqlParameter("@comid",SqlDbType.Int) };
+ par[1].Value = this.txtName.Text.Trim();
+ par[2].Value = this.txtAlias.Text.Trim();
+ par[3].Value = this.cboCompany.SelectedValue;
+ int i = SqlHelper.ExecuteNonQuery(sqlConnectionStr,CommandType.Text,b,par);
+ if(i>0)
+ {
+ MessageBox.Show("更新成功!");
+ }
+ else
+ {
+ MessageBox.Show("更新失败!");
+ }
+ SelectSiteBind();
+
+ }
+ /// <summary>
+ /// 取消
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ /// <summary>
+ /// 编辑
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnEdit_Click(object sender, EventArgs e)
+ {
+ string a = "select Site.Name,Site.Alias,Company.Name from Site,Company where Site.Company_ID=Company.ID and Site.ID=@id";
+ SqlParameter[] par = new SqlParameter[] { new SqlParameter("@id", dgvSite.SelectedCells[0].Value) };
+ SqlDataReader dr = SqlHelper.ExecuteReader(sqlConnectionStr,CommandType.Text,a,par);
+ while (dr.Read())
+ {
+ this.txtName.Text = dr[0].ToString();
+ this.txtAlias.Text = dr[1].ToString();
+ this.cboCompany.Text= dr[2].ToString();
+ }
+
+ }
+ /// <summary>
+ /// 删除
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnDelete_Click(object sender, EventArgs e)
+ {
+ string delSite = "delete from Site where ID=@id";
+ SqlParameter[] par = new SqlParameter[] { new SqlParameter("@id", dgvSite.SelectedCells[0].Value) };
+ int i = SqlHelper.ExecuteNonQuery(sqlConnectionStr, CommandType.Text, delSite,par);
+ if (i > 0)
+ {
+ MessageBox.Show("删除成功!");
+ }
+ else
+ {
+ MessageBox.Show("删除失败!");
+
+ }
+ SelectSiteBind();
+
+ }
+ /// <summary>
+ /// 加载时数据绑定
+ /// </summary>
+ public void SelectSiteBind()
+ {
+ string SelectSite = "select Site.ID, Site.Name,Site.Alias,Company.Name from Site,Company where Site.Company_ID=Company.ID";
+ DataSet ds = SqlHelper.ExecuteDataset(sqlConnectionStr, CommandType.Text, SelectSite);
+ this.dgvSite.DataSource = ds.Tables[0];
+ }
+ /// <summary>
+ /// 窗体加载
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void SiteEditDelete_Load(object sender, EventArgs e)
+ {
+ string SelectCompanyName = "select * from Company";
+ DataSet ds = SqlHelper.ExecuteDataset(sqlConnectionStr, CommandType.Text, SelectCompanyName);
+ cboCompany.DataSource = ds.Tables[0];
+ cboCompany.DisplayMember = "Name";
+ cboCompany.ValueMember = "ID";
+ SelectSiteBind();
+ }
+ }
+}
View
144 Application/SiteEditDelete.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+</root>
View
200 Application/SiteNew.Designer.cs
@@ -0,0 +1,200 @@
+namespace WorkStation
+{
+ partial class SiteNew
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lblName = new System.Windows.Forms.Label();
+ this.txtName = new System.Windows.Forms.TextBox();
+ this.lblAlias = new System.Windows.Forms.Label();
+ this.txtAlias = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.cboCompany = new System.Windows.Forms.ComboBox();
+ this.dgvSite = new System.Windows.Forms.DataGridView();
+ this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.btnSave = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSite)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lblName
+ //
+ this.lblName.AutoSize = true;
+ this.lblName.Location = new System.Drawing.Point(73, 38);
+ this.lblName.Name = "lblName";
+ this.lblName.Size = new System.Drawing.Size(29, 12);
+ this.lblName.TabIndex = 0;
+ this.lblName.Text = "名称";
+ //
+ // txtName
+ //
+ this.txtName.Location = new System.Drawing.Point(131, 35);
+ this.txtName.Name = "txtName";
+ this.txtName.Size = new System.Drawing.Size(264, 21);
+ this.txtName.TabIndex = 1;
+ //
+ // lblAlias
+ //
+ this.lblAlias.AutoSize = true;
+ this.lblAlias.Location = new System.Drawing.Point(73, 86);
+ this.lblAlias.Name = "lblAlias";
+ this.lblAlias.Size = new System.Drawing.Size(29, 12);
+ this.lblAlias.TabIndex = 2;
+ this.lblAlias.Text = "别名";
+ //
+ // txtAlias
+ //
+ this.txtAlias.Location = new System.Drawing.Point(131, 77);
+ this.txtAlias.Name = "txtAlias";
+ this.txtAlias.Size = new System.Drawing.Size(264, 21);
+ this.txtAlias.TabIndex = 3;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(59, 131);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.TabIndex = 4;
+ this.label1.Text = "所属公司";
+ //
+ // cboCompany
+ //
+ this.cboCompany.FormattingEnabled = true;
+ this.cboCompany.Location = new System.Drawing.Point(131, 123);
+ this.cboCompany.Name = "cboCompany";
+ this.cboCompany.Size = new System.Drawing.Size(134, 20);
+ this.cboCompany.TabIndex = 5;
+ //
+ // dgvSite
+ //
+ this.dgvSite.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dgvSite.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.Column1,
+ this.Column2,
+ this.Column3,
+ this.Column4});
+ this.dgvSite.Location = new System.Drawing.Point(46, 181);
+ this.dgvSite.Name = "dgvSite";
+ this.dgvSite.RowTemplate.Height = 23;
+ this.dgvSite.Size = new System.Drawing.Size(621, 170);
+ this.dgvSite.TabIndex = 6;
+ //
+ // Column1
+ //
+ this.Column1.DataPropertyName = "ID";
+ this.Column1.HeaderText = "编号";
+ this.Column1.Name = "Column1";
+ //
+ // Column2
+ //
+ this.Column2.DataPropertyName = "Name";
+ this.Column2.HeaderText = "名称";
+ this.Column2.Name = "Column2";
+ //
+ // Column3
+ //
+ this.Column3.DataPropertyName = "Alias";
+ this.Column3.HeaderText = "别名";
+ this.Column3.Name = "Column3";
+ //
+ // Column4
+ //
+ this.Column4.DataPropertyName = "Name1";
+ this.Column4.HeaderText = "所属公司";
+ this.Column4.Name = "Column4";
+ //
+ // btnSave
+ //
+ this.btnSave.Location = new System.Drawing.Point(497, 38);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(75, 23);
+ this.btnSave.TabIndex = 7;
+ this.btnSave.Text = "保存";
+ this.btnSave.UseVisualStyleBackColor = true;
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Location = new System.Drawing.Point(497, 110);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 8;
+ this.btnCancel.Text = "取消";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // backgroundWorker1
+ //
+ this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
+ this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
+ //
+ // SiteNew
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(711, 415);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnSave);
+ this.Controls.Add(this.dgvSite);
+ this.Controls.Add(this.cboCompany);
+ this.Controls.Add(this.label1);
+ this.Controls.Add(this.txtAlias);
+ this.Controls.Add(this.lblAlias);
+ this.Controls.Add(this.txtName);
+ this.Controls.Add(this.lblName);
+ this.Name = "SiteNew";
+ this.Text = "新建厂区";
+ this.Load += new System.EventHandler(this.SiteNew_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.dgvSite)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lblName;
+ private System.Windows.Forms.TextBox txtName;
+ private System.Windows.Forms.Label lblAlias;
+ private System.Windows.Forms.TextBox txtAlias;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox cboCompany;
+ private System.Windows.Forms.DataGridView dgvSite;
+ private System.Windows.Forms.Button btnSave;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+ private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+ private System.ComponentModel.BackgroundWorker backgroundWorker1;
+ }
+}
View
98 Application/SiteNew.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Data.SqlClient;
+namespace WorkStation
+{
+ public partial class SiteNew : Form
+ {
+ private static string sqlConnectionStr = "Data Source=192.168.1.221;Initial Catalog=Patrol;User ID=sa;Password=sa123";
+ public SiteNew()
+ {
+ InitializeComponent();
+ }
+ /// <summary>
+ /// 数据保存
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnSave_Click(object sender, EventArgs e)
+ {
+ string insertSite = "insert into Site(Name,Alias,Company_ID) values(@name,@alias,@com_id)";
+ SqlParameter[] par = new SqlParameter[] {new SqlParameter("@name",SqlDbType.NVarChar),
+ new SqlParameter("@alias",SqlDbType.NVarChar),
+ new SqlParameter("@com_id",SqlDbType.Int)};
+
+ par[0].Value = this.txtName.Text;
+ par[1].Value = this.txtAlias.Text;
+ par[2].Value = this.cboCompany.SelectedValue;
+ int i = SqlHelper.ExecuteNonQuery(insertSite,par);
+ if(i>0)
+ {
+ MessageBox.Show("保存成功!");
+ }
+ else
+ {
+ MessageBox.Show("保存失败!");
+ }
+ SelectSiteBind();
+
+ }
+ /// <summary>
+ /// 数据加载
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void SiteNew_Load(object sender, EventArgs e)
+ {
+ backgroundWorker1.RunWorkerAsync();
+ }
+ /// <summary>
+ /// 数据绑定
+ /// </summary>
+ public void SelectSiteBind()
+ {
+ string SelectSite = "select Site.ID, Site.Name,Site.Alias,Company.Name from Site,Company where Site.Company_ID=Company.ID";
+ DataSet ds = SqlHelper.ExecuteDataset(sqlConnectionStr, CommandType.Text, SelectSite);
+ this.dgvSite.DataSource = ds.Tables[0];
+ }
+ /// <summary>
+ /// 取消
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ /// <summary>
+ /// 线程
+ /// </summary>
+ DataSet dsSite = null;
+ DataSet dsCompany = null;
+ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
+ {
+ string SelectCompanyName = "select * from Company";
+ dsSite = SqlHelper.ExecuteDataset(sqlConnectionStr, CommandType.Text, SelectCompanyName);
+ string SelectSite = "select Site.ID, Site.Name,Site.Alias,Company.Name from Site,Company where Site.Company_ID=Company.ID";
+ dsCompany = SqlHelper.ExecuteDataset(sqlConnectionStr, CommandType.Text, SelectSite);
+ }
+
+ private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+ {
+ cboCompany.DataSource = dsSite.Tables[0];
+ cboCompany.DisplayMember = "Name";
+ cboCompany.ValueMember = "ID";
+ this.dgvSite.DataSource = dsCompany.Tables[0];
+ }
+
+
+
+
+ }
+}
View
135 Application/SiteNew.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <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>
View
627 Application/WorkStation.csproj
@@ -1,284 +1,357 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7E891505-264A-413F-B105-8AAE7A0E326A}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>WorkStation</RootNamespace>
- <AssemblyName>WorkStation</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Client</TargetFrameworkProfile>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <PlatformTarget>x86</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.VisualBasic" />
- <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.ServiceProcess" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Code\CommonClass.cs" />
- <Compile Include="Code\SqlHelper.cs" />
- <Compile Include="frmAddCard.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddCard.Designer.cs">
- <DependentUpon>frmAddCard.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddPlan.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddPlan.Designer.cs">
- <DependentUpon>frmAddPlan.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddPlanExamine.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddPlanExamine.Designer.cs">
- <DependentUpon>frmAddPlanExamine.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddPlanToTask.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddPlanToTask.Designer.cs">
- <DependentUpon>frmAddPlanToTask.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddPlan_Add.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddPlan_Add.Designer.cs">
- <DependentUpon>frmAddPlan_Add.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddPoint.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddPoint.Designer.cs">
- <DependentUpon>frmAddPoint.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddRoute.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddRoute.Designer.cs">
- <DependentUpon>frmAddRoute.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddRoutName.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddRoutName.Designer.cs">
- <DependentUpon>frmAddRoutName.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddMachine.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddMachine.Designer.cs">
- <DependentUpon>frmAddMachine.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddTask.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddTask.Designer.cs">
- <DependentUpon>frmAddTask.cs</DependentUpon>
- </Compile>
- <Compile Include="frmMain.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmMain.Designer.cs">
- <DependentUpon>frmMain.cs</DependentUpon>
- </Compile>
- <Compile Include="frmAddItem.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmAddItem.Designer.cs">
- <DependentUpon>frmAddItem.cs</DependentUpon>
- </Compile>
- <Compile Include="frmEditAndDeleteCard.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmEditAndDeleteCard.Designer.cs">
- <DependentUpon>frmEditAndDeleteCard.cs</DependentUpon>
- </Compile>
- <Compile Include="frmEditOrDeleteItem.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmEditOrDeleteItem.Designer.cs">
- <DependentUpon>frmEditOrDeleteItem.cs</DependentUpon>
- </Compile>
- <Compile Include="frmEditOrDeletePoint.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmEditOrDeletePoint.Designer.cs">
- <DependentUpon>frmEditOrDeletePoint.cs</DependentUpon>
- </Compile>
- <Compile Include="frmEditOrDeleteRoute.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmEditOrDeleteRoute.Designer.cs">
- <DependentUpon>frmEditOrDeleteRoute.cs</DependentUpon>
- </Compile>
- <Compile Include="frmEditOrDeleteTask.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmEditOrDeleteTask.Designer.cs">
- <DependentUpon>frmEditOrDeleteTask.cs</DependentUpon>
- </Compile>
- <Compile Include="frmIssueTask.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="frmIssueTask.Designer.cs">
- <DependentUpon>frmIssueTask.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="frmAddCard.resx">
- <DependentUpon>frmAddCard.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddPlan.resx">
- <DependentUpon>frmAddPlan.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddPlanExamine.resx">
- <DependentUpon>frmAddPlanExamine.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddPlanToTask.resx">
- <DependentUpon>frmAddPlanToTask.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddPlan_Add.resx">
- <DependentUpon>frmAddPlan_Add.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddPoint.resx">
- <DependentUpon>frmAddPoint.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddRoute.resx">
- <DependentUpon>frmAddRoute.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddRoutName.resx">
- <DependentUpon>frmAddRoutName.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddMachine.resx">
- <DependentUpon>frmAddMachine.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddTask.resx">
- <DependentUpon>frmAddTask.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmMain.resx">
- <DependentUpon>frmMain.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmAddItem.resx">
- <DependentUpon>frmAddItem.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmEditAndDeleteCard.resx">
- <DependentUpon>frmEditAndDeleteCard.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmEditOrDeleteItem.resx">
- <DependentUpon>frmEditOrDeleteItem.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmEditOrDeletePoint.resx">
- <DependentUpon>frmEditOrDeletePoint.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmEditOrDeleteRoute.resx">
- <DependentUpon>frmEditOrDeleteRoute.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmEditOrDeleteTask.resx">
- <DependentUpon>frmEditOrDeleteTask.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="frmIssueTask.resx">
- <DependentUpon>frmIssueTask.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- </Compile>
- <None Include="app.config" />
- <None Include="Properties\Settings.settings">
- <Generator>PublicSettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <Content Include="picture\001.bmp" />
- <Content Include="picture\002.bmp" />
- <Content Include="picture\003.bmp" />
- <Content Include="picture\004.bmp" />
- <Content Include="picture\01.gif" />
- <Content Include="picture\094.GIF" />
- <Content Include="picture\096.GIF" />
- <Content Include="picture\130.GIF" />
- <Content Include="picture\1381ContentsButton.ico" />
- <Content Include="picture\27.gif" />
- <Content Include="picture\34.gif" />
- <Content Include="picture\b087.gif" />
- <Content Include="picture\ContentsButton.ico" />
- <Content Include="picture\icon17.gif" />
- <Content Include="picture\ic_download.gif" />
- <Content Include="picture\kksd1183_9_m.gif" />
- <Content Include="picture\login.gif" />
- <Content Include="picture\picture\003.bmp" />
- <Content Include="picture\picture\004.bmp" />
- <Content Include="picture\picture\icon17.gif" />
- <Content Include="picture\picture\TabAdvertisement.bmp" />
- <Content Include="picture\picture\TabAppendix.bmp" />
- <Content Include="picture\picture\TabIndex.bmp" />
- <Content Include="picture\picture\TabSentence.bmp" />
- <Content Include="picture\TabAdvertisement.bmp" />
- <Content Include="picture\TabAppendix.bmp" />
- <Content Include="picture\TabIndex.bmp" />
- <Content Include="picture\TabSentence.bmp" />
- <Content Include="picture\TabWizard.bmp" />
- <Content Include="picture\u=3720357200,1595926406&amp;fm=0&amp;gp=20.jpg" />
- <Content Include="picture\WB02085_.GIF" />
- <Content Include="picture\取消1.bmp" />
- <Content Include="picture\取消2.bmp" />
- <Content Include="picture\确定1.bmp" />
- <Content Include="picture\确定2.bmp" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7E891505-264A-413F-B105-8AAE7A0E326A}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>WorkStation</RootNamespace>
+ <AssemblyName>WorkStation</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>