客户端新增系统配置界面,集中处理系统配置功能,完成信任客户端列表功能,v1.4.7

This commit is contained in:
dathlin
2017-09-24 12:42:45 +08:00
parent 8f779ca4de
commit f5a76a7e43
26 changed files with 940 additions and 74 deletions

View File

@@ -45,10 +45,11 @@
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.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();
@@ -79,7 +80,6 @@
this.label10 = new System.Windows.Forms.Label();
this.panel_main = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.panel_right.SuspendLayout();
@@ -172,7 +172,7 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.ToolStripMenuItem});
this.ToolStripMenuItem.Image = global::.Properties.Resources.Team_32xLG;
this.ToolStripMenuItem.Name = "管理员ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(100, 31);
@@ -227,12 +227,12 @@
this.ToolStripMenuItem.Text = "开发中心";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 分厂配置ToolStripMenuItem
// 系统配置ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "分厂配置ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(164, 32);
this.ToolStripMenuItem.Text = "分厂配置";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
this.ToolStripMenuItem.Name = "系统配置ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(164, 32);
this.ToolStripMenuItem.Text = "系统配置";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 设置ToolStripMenuItem
//
@@ -259,6 +259,13 @@
this.ToolStripMenuItem.Text = "留言板";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 我的信息ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "我的信息ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(164, 32);
this.ToolStripMenuItem.Text = "我的信息";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 关于ToolStripMenuItem
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -559,13 +566,6 @@
this.pictureBox1.TabStop = false;
this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
//
// 我的信息ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "我的信息ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(164, 32);
this.ToolStripMenuItem.Text = "我的信息";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// FormMainWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -651,7 +651,7 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
}
}

View File

@@ -117,7 +117,7 @@ namespace 软件系统客户端模版
ToolStripMenuItem.Enabled = false;
ToolStripMenuItem.Enabled = false;
ToolStripMenuItem.Enabled = false;
ToolStripMenuItem.Enabled = false;
ToolStripMenuItem.Enabled = false;
}
//启动定时器
TimeTickInitilization();
@@ -311,15 +311,19 @@ namespace 软件系统客户端模版
}
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
using (FormInputAndAction fiaa = new FormInputAndAction(
str => UserClient.Net_simplify_client.ReadFromServer(
CommonHeadCode.SimplifyHeadCode., str).IsSuccess,
JArray.FromObject(UserClient.SystemFactories).ToString(),
"请按照JSON格式更新分厂信息然后提交"))
//using (FormInputAndAction fiaa = new FormInputAndAction(
// str => UserClient.Net_simplify_client.ReadFromServer(
// CommonHeadCode.SimplifyHeadCode.上传分厂, str).IsSuccess,
// JArray.FromObject(UserClient.SystemFactories).ToString(),
// "请按照JSON格式更新分厂信息然后提交"))
//{
// fiaa.ShowDialog();
//}
using (FormConfiguration fc = new FormConfiguration())
{
fiaa.ShowDialog();
fc.ShowDialog();
}
}