clovejunti/DeviceManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6

Browse Source
This commit is contained in:
clovejunti 2024-06-04 01:21:11 +08:00
parent 3495daf57c
commit 8b1af1ec38
60 changed files with 758 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
DeviceRepair.Api/Controllers/MaintenanceController.cs
View File

@ -36,6 +36,28 @@ namespace DeviceRepair.Api.Controllers
return apiResponseData;
}
/// <summary>
/// 查询设备维修单
/// </summary>
/// <param name="Code"></param>
/// <returns></returns>
[HttpPost, Route("GetDataTest")]
public IHttpActionResult GetDataTest(DeviceWarrantyRequestFormFilter FilterInfo)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "操作失败！" };
try
{
apiResponseData = MaintenanceAccess.Instance.GetDatas(FilterInfo);
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return new GzipCompressedResult(apiResponseData.ToJson(), Request); ;
}
/// <summary>
/// 设备维修
/// </summary>

23
DeviceRepair.Api/Controllers/RoleController.cs
View File

@ -1,5 +1,6 @@
using DeviceRepair.Api.Common;
using DeviceRepair.Api.CustomAttribute;
using DeviceRepair.Api.Models;
using DeviceRepair.DataAccess;
using DeviceRepair.Models;
using System;
@ -248,5 +249,27 @@ namespace DeviceRepair.Api.Controllers
return apiResponseData;
}
/// <summary>
/// 通过用户主键获取当前权限
/// </summary>
/// <param name="UserAutoID"></param>
/// <returns></returns>
[HttpGet, Route("GetUserAuthsByUserID"), HttpAuthorize]
public IHttpActionResult GetUserAuthsByUserID(int UserAutoID)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "操作失败！" };
try
{
apiResponseData = RoleAccess.Instance.GetUserAuthsByUserID(UserAutoID);
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return new GzipCompressedResult(apiResponseData.ToJson(), Request); ;
}
}
}

2
DeviceRepair.Api/DeviceRepair.Api.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

56
DeviceRepair.Api/Models/CompressedContentResult.cs
View File

@ -1,6 +1,6 @@
using System.IO;
using DeviceRepair.Utils;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
@ -10,54 +10,36 @@ using System.Web.Http;
namespace DeviceRepair.Api.Models
{
public class CompressedContentResult<T> : IHttpActionResult
public class GzipCompressedResult : IHttpActionResult
{
private readonly T _value;
private readonly string _content;
private readonly HttpRequestMessage _request;
private readonly ApiController _controller;
public CompressedContentResult(T value, HttpRequestMessage request, ApiController controller)
public GzipCompressedResult(string content, HttpRequestMessage request)
{
_value = value;
_content = content;
_request = request;
_controller = controller;
}
public Task<HttpResponseMessage> ExecuteAsync(CancellationToken cancellationToken)
public async Task<HttpResponseMessage> ExecuteAsync(CancellationToken cancellationToken)
{
var response = _controller.Request.CreateResponse(HttpStatusCode.OK, _value, _controller.Configuration.Formatters.JsonFormatter);
var response = new HttpResponseMessage(HttpStatusCode.OK);
var contentBytes = Encoding.UTF8.GetBytes(_content).Compress();
// 检查客户端是否接受 GZIP 压缩
var acceptsEncoding = _request.Headers.AcceptEncoding;
var gzipSupported = acceptsEncoding.Any(x => x.Value.Contains("gzip"));
if (gzipSupported)
using (var outputStream = new MemoryStream())
{
var originalContent = response.Content.ReadAsStringAsync().Result; // 注意：这里同步读取可能会导致问题，但在示例中为了简化
byte[] compressedContent = CompressString(originalContent);
using (var gzipStream = new GZipStream(outputStream, CompressionMode.Compress))
{
await gzipStream.WriteAsync(contentBytes, 0, contentBytes.Length, cancellationToken);
}
var compressedStream = new MemoryStream(compressedContent);
var compressedContentResult = new StreamContent(compressedStream);
compressedContentResult.Headers.ContentType = response.Content.Headers.ContentType;
compressedContentResult.Headers.ContentEncoding.Add("gzip");
response.Content = compressedContentResult;
response.Content = new ByteArrayContent(outputStream.ToArray());
response.Content.Headers.ContentEncoding.Add("gzip");
response.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
}
return Task.FromResult(response);
}
private byte[] CompressString(string str)
{
byte[] buffer = Encoding.UTF8.GetBytes(str);
var memoryStream = new MemoryStream();
using (var gZipStream = new GZipStream(memoryStream, CompressionMode.Compress, true))
{
gZipStream.Write(buffer, 0, buffer.Length);
}
memoryStream.Position = 0;
return memoryStream.ToArray();
response.RequestMessage = _request;
return response;
}
}
}

2
DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml
View File

@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>C:\Users\Clove\Desktop\WebSite</PublishUrl>
<PublishUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240603</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>

22
DeviceRepair.Api/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>C:\Users\Clove\Desktop\WebSite</_PublishTargetUrl>
<History>True|2024-05-31T02:08:51.2865889Z;True|2024-05-31T01:21:35.1603933+08:00;True|2024-05-30T17:42:28.4008960+08:00;True|2024-05-30T17:35:13.0117556+08:00;True|2024-05-30T17:28:00.7834102+08:00;True|2024-05-30T17:10:05.9943745+08:00;True|2024-05-29T13:43:17.4797209+08:00;</History>
<_PublishTargetUrl>C:\Users\Clove\Desktop\20240603_Release\WebApi_20240603</_PublishTargetUrl>
<History>True|2024-06-03T17:16:03.9124219Z;True|2024-06-03T15:22:33.9888519+08:00;True|2024-06-03T10:04:55.1562939+08:00;True|2024-06-03T09:51:46.3653303+08:00;True|2024-05-31T10:08:51.2865889+08:00;True|2024-05-31T01:21:35.1603933+08:00;True|2024-05-30T17:42:28.4008960+08:00;True|2024-05-30T17:35:13.0117556+08:00;True|2024-05-30T17:28:00.7834102+08:00;True|2024-05-30T17:10:05.9943745+08:00;True|2024-05-29T13:43:17.4797209+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@ -78,37 +78,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>05/28/2024 22:39:54</publishTime>
</File>
<File Include="bin/DeviceRepair.Api.dll">
<publishTime>05/31/2024 10:08:50</publishTime>
<publishTime>06/04/2024 01:16:03</publishTime>
</File>
<File Include="bin/DeviceRepair.Api.pdb">
<publishTime>05/31/2024 10:08:50</publishTime>
<publishTime>06/04/2024 01:16:03</publishTime>
</File>
<File Include="bin/DeviceRepair.DataAccess.dll">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/DeviceRepair.DataAccess.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime>
</File>
<File Include="bin/DeviceRepair.DataAccess.pdb">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/DeviceRepair.Models.dll">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/DeviceRepair.Models.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime>
</File>
<File Include="bin/DeviceRepair.Models.pdb">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/DeviceRepair.Utils.dll">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/DeviceRepair.Utils.dll.config">
<publishTime>05/30/2024 11:42:20</publishTime>
</File>
<File Include="bin/DeviceRepair.Utils.pdb">
<publishTime>05/31/2024 10:06:56</publishTime>
<publishTime>06/04/2024 00:50:39</publishTime>
</File>
<File Include="bin/EntityFramework.dll">
<publishTime>05/28/2024 22:39:54</publishTime>
@ -414,7 +414,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>04/16/2024 09:58:38</publishTime>
</File>
<File Include="Web.config">
<publishTime>05/31/2024 10:08:50</publishTime>
<publishTime>06/04/2024 01:16:03</publishTime>
</File>
</ItemGroup>
</Project>

2
DeviceRepair.DataAccess/DeviceAccess.cs
View File

@ -211,6 +211,8 @@ namespace DeviceRepair.DataAccess
if (dictionary.ContainsKey("Route"))
dictionary.Remove("Route");
if (dictionary.ContainsKey("RouteText"))
dictionary.Remove("RouteText");
if (AutoID == 0)
{

40
DeviceRepair.DataAccess/RoleAccess.cs
View File

@ -497,7 +497,7 @@ namespace DeviceRepair.DataAccess
int[] addIds = entity.Users.Select(x => x.AutoID).ToArray();
var Users = db.Queryable<UserInfoModel>().Where(x => SqlFunc.ContainsArray(addIds, x.AutoID)).ToList();
var Users = db.Queryable<UserInfoModel>().Where(x => SqlFunc.ContainsArray(addIds, x.AutoID)).ToList();
foreach (UserInfoModel item in Users)
{
@ -547,5 +547,43 @@ namespace DeviceRepair.DataAccess
}
return apiResponseData;
}
/// <summary>
/// 通过用户主键获取当前权限
/// </summary>
/// <param name="UserAutoID"></param>
/// <returns></returns>
public APIResponseData GetUserAuthsByUserID(int UserAutoID)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "没有查询到数据！" };
try
{
if (UserAutoID <= 0)
return new APIResponseData { Code = -1, Message = "传入的用户主键ID不能小于等于0！" }; ;
db.ChangeDatabase("main");
var Datas = db.Queryable<UserInfoModel, RoleAuthModel, AuthModel >((us, ra, au) => new object[] {
JoinType.Inner,us.RoleGroup == ra.RoleID,
JoinType.Inner,au.AutoID == ra.AuthID,
}).Where((us, ra, au) => UserAutoID == us.AutoID)
.Select<AuthModel>().ToList();
apiResponseData.Code = 1;
apiResponseData.Data = Datas;
apiResponseData.Message = "";
}
catch (SqlSugarException ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
}
}

5
DeviceRepair.DataAccess/UserAccess.cs
View File

@ -392,10 +392,11 @@ namespace DeviceRepair.DataAccess
base.db.ChangeDatabase("main");
if (db.Updateable(m).UpdateColumns(it => new { it.PassWord, it.ModifyDate, it.ModifyBy })
if (db.Updateable(m).UpdateColumns(it => new { it.PassWord, it.ModifyDate, it.ModifyBy, it.LastPwdAlterTime })
.ReSetValue(it => it.PassWord == PassWord)
.ReSetValue(it => it.ModifyBy == Operation.Operator)
.ReSetValue(it => it.ModifyDate == CurrentDate).ExecuteCommand() > 0)
.ReSetValue(it => it.ModifyDate == CurrentDate)
.ReSetValue(it => it.LastPwdAlterTime == CurrentDate).ExecuteCommand() > 0)
{
base.db.ChangeDatabase("log");
UserPassChangeLogInfo log = new UserPassChangeLogInfo

5
DeviceRepair.Models/APIResponseData.cs
View File

@ -89,5 +89,10 @@ namespace DeviceRepair.Models
throw;
}
}
public string ToJson()
{
return JsonConvert.SerializeObject(this);
}
}
}

2
DeviceRepair.Models/DeviceRepair/View/DeviceWarrantyRequestFormView.cs
View File

@ -124,6 +124,6 @@ namespace DeviceRepair.Models
}
}
public string IsDownStatusText { get { return IsDown ? "停机" : "非停机"; } }
public string IsDownText { get { return IsDown ? "停机" : "非停机"; } }
}
}

22
DeviceRepair.Utils/CompressionHelper.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using System.IO.Compression;
using System.Runtime.Serialization.Formatters.Binary;
using System.Text;
namespace DeviceRepair.Utils
{
@ -100,10 +101,29 @@ namespace DeviceRepair.Utils
}
else
{
byte[] rawData = System.Text.Encoding.UTF8.GetBytes(rawString.ToString());
byte[] rawData = Encoding.UTF8.GetBytes(rawString.ToString());
byte[] zippedData = Compress(rawData);
return (string)(Convert.ToBase64String(zippedData));
}
}
/// <summary>
/// 将gzip压缩后的字符串解压缩
/// </summary>
/// <param name="compressedString"></param>
/// <returns></returns>
public static string DecompressString(this string compressedString)
{
byte[] compressedBytes = Convert.FromBase64String(compressedString);
using (var inputStream = new MemoryStream(compressedBytes))
using (var gzipStream = new GZipStream(inputStream, CompressionMode.Decompress))
using (var outputStream = new MemoryStream())
{
gzipStream.CopyTo(outputStream);
byte[] decompressedBytes = outputStream.ToArray();
return Encoding.UTF8.GetString(decompressedBytes);
}
}
}
}

17
DeviceRepairAndOptimization/Biz/ApiHelper.cs
View File

@ -85,7 +85,7 @@ namespace DeviceRepairAndOptimization.Biz
return relativeUri.ToString();
}
public APIResponseData SendMessage(HttpItem item)
public APIResponseData SendMessage(HttpItem item, bool isGzip = false)
{
try
{
@ -96,9 +96,18 @@ namespace DeviceRepairAndOptimization.Biz
if (result.StatusCode != HttpStatusCode.OK)
throw new Exception(result.Html);
//获取返回值
APIResponseData apiResponseData = JsonConvert.DeserializeObject<APIResponseData>(result.Html);
return apiResponseData;
if (!isGzip)
{
//获取返回值
APIResponseData apiResponseData = JsonConvert.DeserializeObject<APIResponseData>(result.Html);
return apiResponseData;
}
else
{
var JsonStr = (Convert.ToBase64String(result.ResultByte)).DecompressString();
APIResponseData apiResponseData = JsonConvert.DeserializeObject<APIResponseData>(JsonStr);
return apiResponseData;
}
}
catch (Exception ex)
{

7
DeviceRepairAndOptimization/Biz/MaintenanceManager.cs
View File

@ -39,13 +39,10 @@ namespace DeviceRepairAndOptimization.Biz
Method = "Post",
ContentType = "text/json",
Postdata = JsonConvert.SerializeObject(FilterInfo),
//IsGzip = true,
//Encoding = System.Text.Encoding.UTF8,
//Accept = "text/html, application/xhtml+xml, */*",
//ResultType = ResultType.String
ResultType = ResultType.Byte
};
apiResponseData = ApiHelper.Instance.SendMessage(item);
apiResponseData = ApiHelper.Instance.SendMessage(item, true);
break;

36
DeviceRepairAndOptimization/Biz/UserManager.cs
View File

@ -449,5 +449,41 @@ namespace DeviceRepairAndOptimization.Biz
}
return apiResponseData;
}
/// <summary>
/// 通过用户主键获取当前权限
/// </summary>
/// <param name="UserAutoID"></param>
/// <returns></returns>
public APIResponseData GetUserAuthsByUserID(int UserAutoID)
{
APIResponseData apiResponseData = new APIResponseData { Code = -1, Message = "没有查询到数据！" };
try
{
switch (DeviceRepair.Utils.Config.Configurations.Properties.ConnType?.ToLower())
{
case "api":
apiResponseData = ApiHelper.Instance.SendMessage(new HttpItem
{
URL = $"{ServiceRouteConstValue.GetUserAuthsByUserID}?UserAutoID={UserAutoID}",
Method = "Get",
ContentType = "application/json; charset=utf-8",
ResultType = CsharpHttpHelper.Enum.ResultType.Byte
}, true);
break;
case "sql":
apiResponseData = UserAccess.Instance.GetAllUsers();
break;
default:
break;
}
}
catch (Exception ex)
{
apiResponseData.Code = -1;
apiResponseData.Message = ex.Message;
}
return apiResponseData;
}
}
}

21
DeviceRepairAndOptimization/GlobalInfo.cs
View File

@ -3,6 +3,8 @@ using DeviceRepair.Utils;
using System;
using System.Linq;
using System.Windows.Forms;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace DeviceRepairAndOptimization
{
@ -45,5 +47,24 @@ namespace DeviceRepairAndOptimization
public static string token = "";
public static Form _RootForm;
/// <summary>
/// 刷新当前用户权限
/// </summary>
public static void RefreshAuths()
{
try
{
// 更新当前用户权限
APIResponseData apiResponseData = Biz.UserManager.Instance.GetUserAuthsByUserID(CurrentUser?.AutoID ?? 0);
if (!apiResponseData.IsSuccess)
throw new Exception(apiResponseData.Message);
CurrentUser.AuthItems = apiResponseData.ToDeserializeObject<List<AuthModel>>();
}
catch
{
}
}
}
}

3
DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.cs
View File

@ -130,6 +130,9 @@ namespace DeviceRepairAndOptimization.Pages.CustomField
/// <param name="view"></param>
void GridViewInitialize(DevExpress.XtraGrid.Views.Grid.GridView view)
{
// 关闭列头右键菜单
view.OptionsMenu.EnableColumnMenu = false;
view.OptionsBehavior.Editable = false;
view.OptionsBehavior.ReadOnly = true;

4
DeviceRepairAndOptimization/Pages/CustomField/pageFieldCode.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</value>
<value>205, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -142,7 +142,7 @@
</value>
</data>
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 93</value>
<value>391, 17</value>
</metadata>
<data name="barButtonItem3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

10
DeviceRepairAndOptimization/Pages/DriveInformation/pageRouteAssign.cs
View File

@ -5,12 +5,7 @@ using DeviceRepairAndOptimization.Biz;
using DeviceRepairAndOptimization.Common;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace DeviceRepairAndOptimization.Pages.DriveMaintenance
@ -97,6 +92,11 @@ namespace DeviceRepairAndOptimization.Pages.DriveMaintenance
{
TreeListNode node = treeListNodes.FirstOrDefault();
CurrentSelectModel = routes.FirstOrDefault(x => x.AutoID == node.Id);
if (CurrentSelectModel == null)
{
XtraMessageBoxHelper.Warn("选中数据不能为空！");
return;
}
this.DialogResult = DialogResult.OK;
}
else

2
DeviceRepairAndOptimization/Pages/DriveInformation/page_DriveListInfo.cs
View File

@ -44,6 +44,8 @@ namespace DeviceRepairAndOptimization.Pages
/// <param name="e"></param>
private void page_DriveListInfo_Load(object sender, EventArgs e)
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
gridView1.ScrollStyle = DevExpress.XtraGrid.Views.Grid.ScrollStyleFlags.LiveHorzScroll | DevExpress.XtraGrid.Views.Grid.ScrollStyleFlags.LiveVertScroll;
BindData();
}

5
DeviceRepairAndOptimization/Pages/FormVersion/Page_FormVersionDialog.cs
View File

@ -60,6 +60,9 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion
/// <param name="e"></param>
private void Page_FormVersionDialog_Load(object sender, EventArgs e)
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
BindDatas();
if (SelectValue != 0)
@ -109,9 +112,7 @@ namespace DeviceRepairAndOptimization.Pages.FormVersion
private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e)
{
if (e.Column != null && e.Column.Caption == "Selection")
{
e.Info.Caption = "选择";
}
}
/// <summary>

10
DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs generated
View File

@ -99,7 +99,7 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.Size = new System.Drawing.Size(1460, 854);
tableLayoutPanel1.Size = new System.Drawing.Size(1598, 916);
tableLayoutPanel1.TabIndex = 0;
//
// gridControl1
@ -111,7 +111,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl1.Name = "gridControl1";
this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.Operations});
this.gridControl1.Size = new System.Drawing.Size(1454, 800);
this.gridControl1.Size = new System.Drawing.Size(1592, 862);
this.gridControl1.TabIndex = 1;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@ -249,7 +249,7 @@ namespace DeviceRepairAndOptimization.Pages
flowLayoutPanel1.Controls.Add(this.btn_Filter);
flowLayoutPanel1.Controls.Add(this.EditSearch);
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel1.Location = new System.Drawing.Point(1060, 0);
flowLayoutPanel1.Location = new System.Drawing.Point(1198, 0);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Size = new System.Drawing.Size(400, 35);
@ -291,7 +291,7 @@ namespace DeviceRepairAndOptimization.Pages
stackPanel1.Location = new System.Drawing.Point(0, 0);
stackPanel1.Margin = new System.Windows.Forms.Padding(0);
stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(1060, 48);
stackPanel1.Size = new System.Drawing.Size(1198, 48);
stackPanel1.TabIndex = 2;
//
// btn_Add
@ -350,7 +350,7 @@ namespace DeviceRepairAndOptimization.Pages
//
this.AcceptButton = this.btn_Filter;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1460, 854);
this.ClientSize = new System.Drawing.Size(1598, 916);
this.Controls.Add(tableLayoutPanel1);
this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

3
DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.cs
View File

@ -188,6 +188,9 @@ namespace DeviceRepairAndOptimization.Pages
/// <param name="view"></param>
void GridViewInitialize(DevExpress.XtraGrid.Views.Grid.GridView view)
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
view.OptionsBehavior.Editable = false;
view.OptionsBehavior.ReadOnly = true;

12
DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.cs
View File

@ -112,6 +112,8 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
/// <param name="view"></param>
void GridViewInitialize(DevExpress.XtraGrid.Views.Grid.GridView view)
{
// 关闭列头右键菜单
view.OptionsMenu.EnableColumnMenu = false;
view.OptionsBehavior.Editable = false;
view.OptionsBehavior.ReadOnly = true;
@ -171,7 +173,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
{
try
{
if (!CurrentAccessories.Any(x => x.FieldID == CurrentAccessoriesInfoModel.FieldID))
if (CurrentAccessoriesInfoModel == null || !CurrentAccessories.Any(x => x.FieldID == CurrentAccessoriesInfoModel.FieldID))
{
throw new Exception("请选择要删除的配件行！");
}
@ -198,7 +200,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
{
try
{
if (!CurrentAccessories.Any(x => x.FieldID == CurrentAccessoriesInfoModel.FieldID))
if (CurrentAccessoriesInfoModel == null || !CurrentAccessories.Any(x => x.FieldID == CurrentAccessoriesInfoModel.FieldID))
{
throw new Exception("请选择要修改的配件行！");
}
@ -238,7 +240,11 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
}
catch (Exception ex)
{
XtraMessageBoxHelper.Error(ex.Message);
string Error = ex.Message;
if (Error.Equals("值对于 Int32 太大或太小。"))
Error = "输入的数量值不正确！";
XtraMessageBoxHelper.Error(Error);
}
}

4
DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesEdit.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</value>
<value>205, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btn_AddItem.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -302,7 +302,7 @@
</value>
</data>
<metadata name="toolbarFormManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 93</value>
<value>336, 17</value>
</metadata>
<data name="btn_SaveAccessories.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

5
DeviceRepairAndOptimization/Pages/Maintain/dlgAccessoriesLst.cs
View File

@ -48,6 +48,9 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
/// </summary>
void InitializeGridViewStyle()
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
/// 自增长行号
gridView1.CustomDrawRowIndicator += (s, e) =>
{
@ -231,7 +234,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
{
string Error = ex.Message;
if (Error.Equals("值对于 Int32 太大或太小。"))
Error = "输入的数量值 太大或太小，请检查！";
Error = "输入的数量值不正确！";
XtraMessageBoxHelper.Error(Error);
}

2
DeviceRepairAndOptimization/Pages/Maintain/pageMaintainView.cs
View File

@ -254,9 +254,7 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
private void gridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e)
{
if (e.Column != null && e.Column.Caption == "Selection")
{
e.Info.Caption = "选择";
}
}
/// <summary>

10
DeviceRepairAndOptimization/Pages/Maintenance/page_DriveTypeTree.Designer.cs generated
View File

@ -79,7 +79,7 @@
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.Size = new System.Drawing.Size(0, 0);
tableLayoutPanel1.Size = new System.Drawing.Size(1598, 916);
tableLayoutPanel1.TabIndex = 0;
tableLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel1_Paint);
//
@ -123,7 +123,7 @@
this.tvDevices.OptionsSelection.KeepSelectedOnClick = false;
this.tvDevices.OptionsView.AutoWidth = false;
this.tvDevices.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All;
this.tvDevices.Size = new System.Drawing.Size(1, 1);
this.tvDevices.Size = new System.Drawing.Size(1590, 860);
this.tvDevices.TabIndex = 13;
this.tvDevices.TreeLevelWidth = 23;
//
@ -290,12 +290,12 @@
stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
stackPanel1.Location = new System.Drawing.Point(3, 3);
stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(1, 42);
stackPanel1.Size = new System.Drawing.Size(1592, 42);
stackPanel1.TabIndex = 0;
//
// EditSearch
//
this.EditSearch.Location = new System.Drawing.Point(-304, 5);
this.EditSearch.Location = new System.Drawing.Point(1287, 5);
this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
this.EditSearch.Name = "EditSearch";
this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F);
@ -318,7 +318,7 @@
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ClientSize = new System.Drawing.Size(0, 0);
this.ClientSize = new System.Drawing.Size(1598, 916);
this.Controls.Add(tableLayoutPanel1);
this.Name = "page_DriveTypeTree";
this.Text = "page_DriveTypeTree";

12
DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.Designer.cs generated
View File

@ -74,7 +74,7 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1192, 983);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1598, 999);
this.tableLayoutPanel1.TabIndex = 0;
//
// gridControl1
@ -83,7 +83,7 @@
this.gridControl1.Location = new System.Drawing.Point(3, 51);
this.gridControl1.MainView = this.gridView1;
this.gridControl1.Name = "gridControl1";
this.gridControl1.Size = new System.Drawing.Size(1186, 929);
this.gridControl1.Size = new System.Drawing.Size(1592, 945);
this.gridControl1.TabIndex = 1;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@ -223,7 +223,7 @@
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1192, 48);
this.tableLayoutPanel2.Size = new System.Drawing.Size(1598, 48);
this.tableLayoutPanel2.TabIndex = 2;
//
// stackPanel1
@ -234,7 +234,7 @@
this.stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.stackPanel1.LabelVertAlignment = DevExpress.Utils.Layout.LabelVertAlignment.Center;
this.stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
this.stackPanel1.Location = new System.Drawing.Point(742, 0);
this.stackPanel1.Location = new System.Drawing.Point(1148, 0);
this.stackPanel1.Margin = new System.Windows.Forms.Padding(0);
this.stackPanel1.Name = "stackPanel1";
this.stackPanel1.Size = new System.Drawing.Size(450, 48);
@ -275,7 +275,7 @@
this.stackPanel2.Location = new System.Drawing.Point(0, 0);
this.stackPanel2.Margin = new System.Windows.Forms.Padding(0);
this.stackPanel2.Name = "stackPanel2";
this.stackPanel2.Size = new System.Drawing.Size(742, 48);
this.stackPanel2.Size = new System.Drawing.Size(1148, 48);
this.stackPanel2.TabIndex = 1;
//
// btn_DriveMaintenanceEdit
@ -343,7 +343,7 @@
// page_MaintenanceView
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1192, 983);
this.ClientSize = new System.Drawing.Size(1598, 999);
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "page_MaintenanceView";
this.Text = "page_MaintenanceView";

2
DeviceRepairAndOptimization/Pages/Maintenance/page_MaintenanceView.cs
View File

@ -75,6 +75,8 @@ namespace DeviceRepairAndOptimization.Pages.Maintenance
/// <param name="view"></param>
void GridViewInitialize(DevExpress.XtraGrid.Views.Grid.GridView view)
{
// 关闭列头右键菜单
view.OptionsMenu.EnableColumnMenu = false;
view.OptionsBehavior.Editable = false;
view.OptionsBehavior.ReadOnly = true;

3
DeviceRepairAndOptimization/Pages/Plan/pageDevicePlans.cs
View File

@ -38,6 +38,9 @@ namespace DeviceRepairAndOptimization.Pages.Plan
{
try
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
APIResponseData apiResponseData = Biz.PlanManager.Instance.GetDeviceInformationPlans(CurrentYear, CurrentEquipmentID);
if (!apiResponseData.IsSuccess)
throw new Exception(apiResponseData.Message);

24
DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs generated
View File

@ -99,16 +99,16 @@ namespace DeviceRepairAndOptimization.Pages
flowLayoutPanel1.Controls.Add(this.EditSearch);
flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel1.Location = new System.Drawing.Point(1096, 0);
flowLayoutPanel1.Location = new System.Drawing.Point(1241, 0);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Size = new System.Drawing.Size(542, 48);
flowLayoutPanel1.Size = new System.Drawing.Size(613, 48);
flowLayoutPanel1.TabIndex = 1;
//
// btn_Filter
//
this.btn_Filter.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btn_Filter.Location = new System.Drawing.Point(482, 9);
this.btn_Filter.Location = new System.Drawing.Point(553, 9);
this.btn_Filter.Name = "btn_Filter";
this.btn_Filter.Size = new System.Drawing.Size(57, 26);
this.btn_Filter.TabIndex = 10;
@ -117,7 +117,7 @@ namespace DeviceRepairAndOptimization.Pages
//
// EditSearch
//
this.EditSearch.Location = new System.Drawing.Point(174, 7);
this.EditSearch.Location = new System.Drawing.Point(245, 7);
this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
this.EditSearch.Name = "EditSearch";
this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Verdana", 10F);
@ -230,18 +230,18 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel2.Controls.Add(this.EditYear, 1, 0);
tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel2.Location = new System.Drawing.Point(543, 3);
tableLayoutPanel2.Location = new System.Drawing.Point(614, 3);
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 1;
tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel2.Size = new System.Drawing.Size(550, 42);
tableLayoutPanel2.Size = new System.Drawing.Size(624, 42);
tableLayoutPanel2.TabIndex = 4;
//
// EditYear
//
this.EditYear.Dock = System.Windows.Forms.DockStyle.Fill;
this.EditYear.EditValue = null;
this.EditYear.Location = new System.Drawing.Point(153, 3);
this.EditYear.Location = new System.Drawing.Point(190, 3);
this.EditYear.Name = "EditYear";
this.EditYear.Properties.AutoHeight = false;
this.EditYear.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@ -265,7 +265,7 @@ namespace DeviceRepairAndOptimization.Pages
this.tb_pnl_Content.RowCount = 2;
this.tb_pnl_Content.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
this.tb_pnl_Content.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tb_pnl_Content.Size = new System.Drawing.Size(1638, 931);
this.tb_pnl_Content.Size = new System.Drawing.Size(1854, 947);
this.tb_pnl_Content.TabIndex = 0;
//
// panel1
@ -276,7 +276,7 @@ namespace DeviceRepairAndOptimization.Pages
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1638, 48);
this.panel1.Size = new System.Drawing.Size(1854, 48);
this.panel1.TabIndex = 0;
//
// tableLayoutPanel1
@ -294,7 +294,7 @@ namespace DeviceRepairAndOptimization.Pages
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1638, 48);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1854, 48);
this.tableLayoutPanel1.TabIndex = 1;
//
// gridControl
@ -303,7 +303,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl.Location = new System.Drawing.Point(3, 51);
this.gridControl.MainView = this.gridView1;
this.gridControl.Name = "gridControl";
this.gridControl.Size = new System.Drawing.Size(1632, 877);
this.gridControl.Size = new System.Drawing.Size(1848, 893);
this.gridControl.TabIndex = 1;
this.gridControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@ -543,7 +543,7 @@ namespace DeviceRepairAndOptimization.Pages
// page_MaintenancePlan
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1638, 931);
this.ClientSize = new System.Drawing.Size(1854, 947);
this.Controls.Add(this.tb_pnl_Content);
this.DoubleBuffered = true;
this.Name = "page_MaintenancePlan";

2
DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.cs
View File

@ -116,6 +116,8 @@ namespace DeviceRepairAndOptimization.Pages
try
{
splashScreenManager1.ShowWaitForm();
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
//this.tb_pnl_Content.RowStyles[0].Height = 45f;
this.EditSearch.Height = 31;
EditYear.ToYearStyle();

252
DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.Designer.cs generated
View File

@ -149,29 +149,29 @@
panel1.Location = new System.Drawing.Point(0, 0);
panel1.Margin = new System.Windows.Forms.Padding(0);
panel1.Name = "panel1";
panel1.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel1.Size = new System.Drawing.Size(980, 50);
panel1.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel1.Size = new System.Drawing.Size(735, 40);
panel1.TabIndex = 0;
//
// panel2
//
panel2.Controls.Add(label1);
panel2.Controls.Add(this.txt_EquipmentID);
panel2.Location = new System.Drawing.Point(0, 58);
panel2.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel2.Location = new System.Drawing.Point(0, 46);
panel2.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel2.Name = "panel2";
panel2.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel2.Size = new System.Drawing.Size(980, 50);
panel2.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel2.Size = new System.Drawing.Size(735, 40);
panel2.TabIndex = 1;
//
// label1
//
label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(20, 16);
label1.Location = new System.Drawing.Point(15, 13);
label1.Margin = new System.Windows.Forms.Padding(0);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(82, 15);
label1.Size = new System.Drawing.Size(65, 12);
label1.TabIndex = 0;
label1.Text = "设备编号：";
label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -179,7 +179,8 @@
// txt_EquipmentID
//
this.txt_EquipmentID.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.txt_EquipmentID.Location = new System.Drawing.Point(140, 5);
this.txt_EquipmentID.Location = new System.Drawing.Point(105, 4);
this.txt_EquipmentID.Margin = new System.Windows.Forms.Padding(2);
this.txt_EquipmentID.Name = "txt_EquipmentID";
editorButtonImageOptions3.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("editorButtonImageOptions3.SvgImage")));
editorButtonImageOptions3.SvgImageSize = new System.Drawing.Size(24, 24);
@ -188,8 +189,9 @@
this.txt_EquipmentID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "清空", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "确定", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.txt_EquipmentID.Properties.MaxLength = 50;
this.txt_EquipmentID.Properties.ReadOnly = true;
this.txt_EquipmentID.Size = new System.Drawing.Size(817, 40);
this.txt_EquipmentID.Size = new System.Drawing.Size(613, 32);
this.txt_EquipmentID.TabIndex = 1;
this.txt_EquipmentID.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.txt_EquipmentID_ButtonClick);
this.txt_EquipmentID.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_EquipmentID_KeyDown);
@ -198,29 +200,30 @@
//
panel3.Controls.Add(this.txt_DeviceName);
panel3.Controls.Add(label2);
panel3.Location = new System.Drawing.Point(0, 116);
panel3.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel3.Location = new System.Drawing.Point(0, 92);
panel3.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel3.Name = "panel3";
panel3.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel3.Size = new System.Drawing.Size(980, 50);
panel3.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel3.Size = new System.Drawing.Size(735, 40);
panel3.TabIndex = 2;
//
// txt_DeviceName
//
this.txt_DeviceName.Location = new System.Drawing.Point(140, 14);
this.txt_DeviceName.Location = new System.Drawing.Point(105, 11);
this.txt_DeviceName.Margin = new System.Windows.Forms.Padding(2);
this.txt_DeviceName.Name = "txt_DeviceName";
this.txt_DeviceName.Properties.ReadOnly = true;
this.txt_DeviceName.Size = new System.Drawing.Size(817, 24);
this.txt_DeviceName.Size = new System.Drawing.Size(613, 22);
this.txt_DeviceName.TabIndex = 2;
//
// label2
//
label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(20, 17);
label2.Location = new System.Drawing.Point(15, 14);
label2.Margin = new System.Windows.Forms.Padding(0);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(82, 15);
label2.Size = new System.Drawing.Size(65, 12);
label2.TabIndex = 1;
label2.Text = "设备类型：";
label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -233,16 +236,17 @@
panel4.Controls.Add(label13);
panel4.Controls.Add(label9);
panel4.Controls.Add(label3);
panel4.Location = new System.Drawing.Point(0, 174);
panel4.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel4.Location = new System.Drawing.Point(0, 138);
panel4.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel4.Name = "panel4";
panel4.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel4.Size = new System.Drawing.Size(980, 50);
panel4.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel4.Size = new System.Drawing.Size(735, 40);
panel4.TabIndex = 3;
//
// ck_Mar
//
this.ck_Mar.Location = new System.Drawing.Point(780, 15);
this.ck_Mar.Location = new System.Drawing.Point(585, 12);
this.ck_Mar.Margin = new System.Windows.Forms.Padding(2);
this.ck_Mar.Name = "ck_Mar";
this.ck_Mar.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -255,12 +259,13 @@
"Semi-an"});
this.ck_Mar.Properties.Tag = 3;
this.ck_Mar.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Mar.Size = new System.Drawing.Size(154, 24);
this.ck_Mar.Size = new System.Drawing.Size(116, 22);
this.ck_Mar.TabIndex = 10;
//
// ck_Jan
//
this.ck_Jan.Location = new System.Drawing.Point(139, 15);
this.ck_Jan.Location = new System.Drawing.Point(104, 12);
this.ck_Jan.Margin = new System.Windows.Forms.Padding(2);
this.ck_Jan.Name = "ck_Jan";
this.ck_Jan.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -273,13 +278,14 @@
"Semi-an"});
this.ck_Jan.Properties.Tag = 1;
this.ck_Jan.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Jan.Size = new System.Drawing.Size(154, 24);
this.ck_Jan.Size = new System.Drawing.Size(116, 22);
this.ck_Jan.TabIndex = 8;
this.ck_Jan.Tag = "1";
//
// ck_Feb
//
this.ck_Feb.Location = new System.Drawing.Point(470, 15);
this.ck_Feb.Location = new System.Drawing.Point(352, 12);
this.ck_Feb.Margin = new System.Windows.Forms.Padding(2);
this.ck_Feb.Name = "ck_Feb";
this.ck_Feb.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -292,7 +298,7 @@
"Semi-an"});
this.ck_Feb.Properties.Tag = 2;
this.ck_Feb.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Feb.Size = new System.Drawing.Size(154, 24);
this.ck_Feb.Size = new System.Drawing.Size(116, 22);
this.ck_Feb.TabIndex = 9;
this.ck_Feb.Tag = "2";
//
@ -300,10 +306,10 @@
//
label13.Anchor = System.Windows.Forms.AnchorStyles.Left;
label13.AutoSize = true;
label13.Location = new System.Drawing.Point(684, 18);
label13.Location = new System.Drawing.Point(513, 14);
label13.Margin = new System.Windows.Forms.Padding(0);
label13.Name = "label13";
label13.Size = new System.Drawing.Size(52, 15);
label13.Size = new System.Drawing.Size(41, 12);
label13.TabIndex = 6;
label13.Text = "三月：";
label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -312,10 +318,10 @@
//
label9.Anchor = System.Windows.Forms.AnchorStyles.Left;
label9.AutoSize = true;
label9.Location = new System.Drawing.Point(370, 18);
label9.Location = new System.Drawing.Point(278, 14);
label9.Margin = new System.Windows.Forms.Padding(0);
label9.Name = "label9";
label9.Size = new System.Drawing.Size(52, 15);
label9.Size = new System.Drawing.Size(41, 12);
label9.TabIndex = 4;
label9.Text = "二月：";
label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -324,10 +330,10 @@
//
label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
label3.AutoSize = true;
label3.Location = new System.Drawing.Point(20, 18);
label3.Location = new System.Drawing.Point(15, 14);
label3.Margin = new System.Windows.Forms.Padding(0);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(52, 15);
label3.Size = new System.Drawing.Size(41, 12);
label3.TabIndex = 2;
label3.Text = "一月：";
label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -340,16 +346,17 @@
panel5.Controls.Add(label14);
panel5.Controls.Add(label10);
panel5.Controls.Add(label4);
panel5.Location = new System.Drawing.Point(0, 232);
panel5.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel5.Location = new System.Drawing.Point(0, 184);
panel5.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel5.Name = "panel5";
panel5.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel5.Size = new System.Drawing.Size(980, 50);
panel5.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel5.Size = new System.Drawing.Size(735, 40);
panel5.TabIndex = 4;
//
// ck_Jun
//
this.ck_Jun.Location = new System.Drawing.Point(780, 15);
this.ck_Jun.Location = new System.Drawing.Point(585, 12);
this.ck_Jun.Margin = new System.Windows.Forms.Padding(2);
this.ck_Jun.Name = "ck_Jun";
this.ck_Jun.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -362,13 +369,14 @@
"Semi-an"});
this.ck_Jun.Properties.Tag = 6;
this.ck_Jun.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Jun.Size = new System.Drawing.Size(154, 24);
this.ck_Jun.Size = new System.Drawing.Size(116, 22);
this.ck_Jun.TabIndex = 11;
this.ck_Jun.Tag = "6";
//
// ck_Apr
//
this.ck_Apr.Location = new System.Drawing.Point(140, 15);
this.ck_Apr.Location = new System.Drawing.Point(105, 12);
this.ck_Apr.Margin = new System.Windows.Forms.Padding(2);
this.ck_Apr.Name = "ck_Apr";
this.ck_Apr.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -381,13 +389,14 @@
"Semi-an"});
this.ck_Apr.Properties.Tag = 4;
this.ck_Apr.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Apr.Size = new System.Drawing.Size(154, 24);
this.ck_Apr.Size = new System.Drawing.Size(116, 22);
this.ck_Apr.TabIndex = 9;
this.ck_Apr.Tag = "4";
//
// ck_May
//
this.ck_May.Location = new System.Drawing.Point(470, 15);
this.ck_May.Location = new System.Drawing.Point(352, 12);
this.ck_May.Margin = new System.Windows.Forms.Padding(2);
this.ck_May.Name = "ck_May";
this.ck_May.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -400,7 +409,7 @@
"Semi-an"});
this.ck_May.Properties.Tag = 5;
this.ck_May.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_May.Size = new System.Drawing.Size(154, 24);
this.ck_May.Size = new System.Drawing.Size(116, 22);
this.ck_May.TabIndex = 10;
this.ck_May.Tag = "5";
//
@ -408,10 +417,10 @@
//
label14.Anchor = System.Windows.Forms.AnchorStyles.Left;
label14.AutoSize = true;
label14.Location = new System.Drawing.Point(684, 19);
label14.Location = new System.Drawing.Point(513, 15);
label14.Margin = new System.Windows.Forms.Padding(0);
label14.Name = "label14";
label14.Size = new System.Drawing.Size(52, 15);
label14.Size = new System.Drawing.Size(41, 12);
label14.TabIndex = 7;
label14.Text = "六月：";
label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -420,10 +429,10 @@
//
label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
label10.AutoSize = true;
label10.Location = new System.Drawing.Point(370, 18);
label10.Location = new System.Drawing.Point(278, 14);
label10.Margin = new System.Windows.Forms.Padding(0);
label10.Name = "label10";
label10.Size = new System.Drawing.Size(52, 15);
label10.Size = new System.Drawing.Size(41, 12);
label10.TabIndex = 5;
label10.Text = "五月：";
label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -432,10 +441,10 @@
//
label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
label4.AutoSize = true;
label4.Location = new System.Drawing.Point(20, 18);
label4.Location = new System.Drawing.Point(15, 14);
label4.Margin = new System.Windows.Forms.Padding(0);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(52, 15);
label4.Size = new System.Drawing.Size(41, 12);
label4.TabIndex = 2;
label4.Text = "四月：";
label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -448,16 +457,17 @@
panel6.Controls.Add(label15);
panel6.Controls.Add(label11);
panel6.Controls.Add(label5);
panel6.Location = new System.Drawing.Point(0, 290);
panel6.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel6.Location = new System.Drawing.Point(0, 230);
panel6.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel6.Name = "panel6";
panel6.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel6.Size = new System.Drawing.Size(980, 50);
panel6.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel6.Size = new System.Drawing.Size(735, 40);
panel6.TabIndex = 5;
//
// ck_Sep
//
this.ck_Sep.Location = new System.Drawing.Point(780, 15);
this.ck_Sep.Location = new System.Drawing.Point(585, 12);
this.ck_Sep.Margin = new System.Windows.Forms.Padding(2);
this.ck_Sep.Name = "ck_Sep";
this.ck_Sep.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -470,13 +480,14 @@
"Semi-an"});
this.ck_Sep.Properties.Tag = 9;
this.ck_Sep.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Sep.Size = new System.Drawing.Size(154, 24);
this.ck_Sep.Size = new System.Drawing.Size(116, 22);
this.ck_Sep.TabIndex = 12;
this.ck_Sep.Tag = "9";
//
// ck_Aug
//
this.ck_Aug.Location = new System.Drawing.Point(470, 15);
this.ck_Aug.Location = new System.Drawing.Point(352, 12);
this.ck_Aug.Margin = new System.Windows.Forms.Padding(2);
this.ck_Aug.Name = "ck_Aug";
this.ck_Aug.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -489,13 +500,14 @@
"Semi-an"});
this.ck_Aug.Properties.Tag = 8;
this.ck_Aug.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Aug.Size = new System.Drawing.Size(154, 24);
this.ck_Aug.Size = new System.Drawing.Size(116, 22);
this.ck_Aug.TabIndex = 11;
this.ck_Aug.Tag = "8";
//
// ck_Jul
//
this.ck_Jul.Location = new System.Drawing.Point(140, 15);
this.ck_Jul.Location = new System.Drawing.Point(105, 12);
this.ck_Jul.Margin = new System.Windows.Forms.Padding(2);
this.ck_Jul.Name = "ck_Jul";
this.ck_Jul.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -508,7 +520,7 @@
"Semi-an"});
this.ck_Jul.Properties.Tag = 7;
this.ck_Jul.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Jul.Size = new System.Drawing.Size(154, 24);
this.ck_Jul.Size = new System.Drawing.Size(116, 22);
this.ck_Jul.TabIndex = 10;
this.ck_Jul.Tag = "7";
//
@ -516,10 +528,10 @@
//
label15.Anchor = System.Windows.Forms.AnchorStyles.Left;
label15.AutoSize = true;
label15.Location = new System.Drawing.Point(684, 18);
label15.Location = new System.Drawing.Point(513, 14);
label15.Margin = new System.Windows.Forms.Padding(0);
label15.Name = "label15";
label15.Size = new System.Drawing.Size(52, 15);
label15.Size = new System.Drawing.Size(41, 12);
label15.TabIndex = 7;
label15.Text = "九月：";
label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -528,10 +540,10 @@
//
label11.Anchor = System.Windows.Forms.AnchorStyles.Left;
label11.AutoSize = true;
label11.Location = new System.Drawing.Point(370, 18);
label11.Location = new System.Drawing.Point(278, 14);
label11.Margin = new System.Windows.Forms.Padding(0);
label11.Name = "label11";
label11.Size = new System.Drawing.Size(52, 15);
label11.Size = new System.Drawing.Size(41, 12);
label11.TabIndex = 5;
label11.Text = "八月：";
label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -540,10 +552,10 @@
//
label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(20, 18);
label5.Location = new System.Drawing.Point(15, 14);
label5.Margin = new System.Windows.Forms.Padding(0);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(52, 15);
label5.Size = new System.Drawing.Size(41, 12);
label5.TabIndex = 2;
label5.Text = "七月：";
label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -556,16 +568,17 @@
panel7.Controls.Add(label16);
panel7.Controls.Add(label12);
panel7.Controls.Add(label6);
panel7.Location = new System.Drawing.Point(0, 348);
panel7.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel7.Location = new System.Drawing.Point(0, 276);
panel7.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel7.Name = "panel7";
panel7.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel7.Size = new System.Drawing.Size(980, 50);
panel7.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel7.Size = new System.Drawing.Size(735, 40);
panel7.TabIndex = 6;
//
// ck_Dec
//
this.ck_Dec.Location = new System.Drawing.Point(780, 15);
this.ck_Dec.Location = new System.Drawing.Point(585, 12);
this.ck_Dec.Margin = new System.Windows.Forms.Padding(2);
this.ck_Dec.Name = "ck_Dec";
this.ck_Dec.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -578,13 +591,14 @@
"Semi-an"});
this.ck_Dec.Properties.Tag = 12;
this.ck_Dec.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Dec.Size = new System.Drawing.Size(154, 24);
this.ck_Dec.Size = new System.Drawing.Size(116, 22);
this.ck_Dec.TabIndex = 15;
this.ck_Dec.Tag = "12";
//
// ck_Nov
//
this.ck_Nov.Location = new System.Drawing.Point(470, 15);
this.ck_Nov.Location = new System.Drawing.Point(352, 12);
this.ck_Nov.Margin = new System.Windows.Forms.Padding(2);
this.ck_Nov.Name = "ck_Nov";
this.ck_Nov.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -597,13 +611,14 @@
"Semi-an"});
this.ck_Nov.Properties.Tag = 11;
this.ck_Nov.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Nov.Size = new System.Drawing.Size(154, 24);
this.ck_Nov.Size = new System.Drawing.Size(116, 22);
this.ck_Nov.TabIndex = 14;
this.ck_Nov.Tag = "11";
//
// ck_Oct
//
this.ck_Oct.Location = new System.Drawing.Point(140, 15);
this.ck_Oct.Location = new System.Drawing.Point(105, 12);
this.ck_Oct.Margin = new System.Windows.Forms.Padding(2);
this.ck_Oct.Name = "ck_Oct";
this.ck_Oct.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@ -616,7 +631,7 @@
"Semi-an"});
this.ck_Oct.Properties.Tag = 10;
this.ck_Oct.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.ck_Oct.Size = new System.Drawing.Size(154, 24);
this.ck_Oct.Size = new System.Drawing.Size(116, 22);
this.ck_Oct.TabIndex = 13;
this.ck_Oct.Tag = "10";
//
@ -624,10 +639,10 @@
//
label16.Anchor = System.Windows.Forms.AnchorStyles.Left;
label16.AutoSize = true;
label16.Location = new System.Drawing.Point(684, 18);
label16.Location = new System.Drawing.Point(513, 14);
label16.Margin = new System.Windows.Forms.Padding(0);
label16.Name = "label16";
label16.Size = new System.Drawing.Size(67, 15);
label16.Size = new System.Drawing.Size(53, 12);
label16.TabIndex = 7;
label16.Text = "十二月：";
label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -636,10 +651,10 @@
//
label12.Anchor = System.Windows.Forms.AnchorStyles.Left;
label12.AutoSize = true;
label12.Location = new System.Drawing.Point(370, 18);
label12.Location = new System.Drawing.Point(278, 14);
label12.Margin = new System.Windows.Forms.Padding(0);
label12.Name = "label12";
label12.Size = new System.Drawing.Size(67, 15);
label12.Size = new System.Drawing.Size(53, 12);
label12.TabIndex = 5;
label12.Text = "十一月：";
label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -648,10 +663,10 @@
//
label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
label6.AutoSize = true;
label6.Location = new System.Drawing.Point(20, 18);
label6.Location = new System.Drawing.Point(15, 14);
label6.Margin = new System.Windows.Forms.Padding(0);
label6.Name = "label6";
label6.Size = new System.Drawing.Size(52, 15);
label6.Size = new System.Drawing.Size(41, 12);
label6.TabIndex = 2;
label6.Text = "十月：";
label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -660,27 +675,29 @@
//
panel8.Controls.Add(this.tp_StartMonth);
panel8.Controls.Add(label7);
panel8.Location = new System.Drawing.Point(0, 406);
panel8.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel8.Location = new System.Drawing.Point(0, 322);
panel8.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel8.Name = "panel8";
panel8.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel8.Size = new System.Drawing.Size(980, 50);
panel8.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel8.Size = new System.Drawing.Size(735, 40);
panel8.TabIndex = 7;
//
// tp_StartMonth
//
this.tp_StartMonth.Location = new System.Drawing.Point(139, 13);
this.tp_StartMonth.Location = new System.Drawing.Point(104, 10);
this.tp_StartMonth.Margin = new System.Windows.Forms.Padding(2);
this.tp_StartMonth.Name = "tp_StartMonth";
this.tp_StartMonth.Size = new System.Drawing.Size(200, 25);
this.tp_StartMonth.Size = new System.Drawing.Size(173, 21);
this.tp_StartMonth.TabIndex = 3;
//
// label7
//
label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
label7.AutoSize = true;
label7.Location = new System.Drawing.Point(20, 18);
label7.Location = new System.Drawing.Point(15, 14);
label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(113, 15);
label7.Size = new System.Drawing.Size(89, 12);
label7.TabIndex = 2;
label7.Text = "新PM起始月份：";
label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -689,27 +706,29 @@
//
panel9.Controls.Add(this.txt_Remark);
panel9.Controls.Add(label8);
panel9.Location = new System.Drawing.Point(0, 464);
panel9.Margin = new System.Windows.Forms.Padding(0, 8, 0, 0);
panel9.Location = new System.Drawing.Point(0, 368);
panel9.Margin = new System.Windows.Forms.Padding(0, 6, 0, 0);
panel9.Name = "panel9";
panel9.Padding = new System.Windows.Forms.Padding(20, 0, 20, 0);
panel9.Size = new System.Drawing.Size(980, 50);
panel9.Padding = new System.Windows.Forms.Padding(15, 0, 15, 0);
panel9.Size = new System.Drawing.Size(735, 40);
panel9.TabIndex = 8;
//
// txt_Remark
//
this.txt_Remark.Location = new System.Drawing.Point(139, 13);
this.txt_Remark.Location = new System.Drawing.Point(104, 10);
this.txt_Remark.Margin = new System.Windows.Forms.Padding(2);
this.txt_Remark.Name = "txt_Remark";
this.txt_Remark.Size = new System.Drawing.Size(817, 24);
this.txt_Remark.Size = new System.Drawing.Size(613, 22);
this.txt_Remark.TabIndex = 3;
//
// label8
//
label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
label8.AutoSize = true;
label8.Location = new System.Drawing.Point(20, 18);
label8.Location = new System.Drawing.Point(15, 14);
label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
label8.Name = "label8";
label8.Size = new System.Drawing.Size(52, 15);
label8.Size = new System.Drawing.Size(41, 12);
label8.TabIndex = 2;
label8.Text = "备注：";
label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -727,17 +746,19 @@
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(982, 595);
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 36F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(736, 476);
this.tableLayoutPanel1.TabIndex = 0;
//
// separatorControl1
//
this.separatorControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.separatorControl1.Location = new System.Drawing.Point(3, 528);
this.separatorControl1.Location = new System.Drawing.Point(2, 422);
this.separatorControl1.Margin = new System.Windows.Forms.Padding(2);
this.separatorControl1.Name = "separatorControl1";
this.separatorControl1.Size = new System.Drawing.Size(976, 19);
this.separatorControl1.Padding = new System.Windows.Forms.Padding(7);
this.separatorControl1.Size = new System.Drawing.Size(732, 16);
this.separatorControl1.TabIndex = 0;
//
// flowLayoutPanel1
@ -746,29 +767,29 @@
this.flowLayoutPanel1.Controls.Add(this.btn_Submit);
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 550);
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 440);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(0, 0, 20, 0);
this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 45);
this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0);
this.flowLayoutPanel1.Size = new System.Drawing.Size(736, 36);
this.flowLayoutPanel1.TabIndex = 1;
//
// btn_Cancel
//
this.btn_Cancel.Location = new System.Drawing.Point(865, 8);
this.btn_Cancel.Margin = new System.Windows.Forms.Padding(3, 8, 3, 3);
this.btn_Cancel.Location = new System.Drawing.Point(649, 6);
this.btn_Cancel.Margin = new System.Windows.Forms.Padding(2, 6, 2, 2);
this.btn_Cancel.Name = "btn_Cancel";
this.btn_Cancel.Size = new System.Drawing.Size(94, 29);
this.btn_Cancel.Size = new System.Drawing.Size(70, 23);
this.btn_Cancel.TabIndex = 0;
this.btn_Cancel.Text = "取消";
this.btn_Cancel.Click += new System.EventHandler(this.btn_Cancel_Click);
//
// btn_Submit
//
this.btn_Submit.Location = new System.Drawing.Point(765, 8);
this.btn_Submit.Margin = new System.Windows.Forms.Padding(3, 8, 3, 3);
this.btn_Submit.Location = new System.Drawing.Point(575, 6);
this.btn_Submit.Margin = new System.Windows.Forms.Padding(2, 6, 2, 2);
this.btn_Submit.Name = "btn_Submit";
this.btn_Submit.Size = new System.Drawing.Size(94, 29);
this.btn_Submit.Size = new System.Drawing.Size(70, 23);
this.btn_Submit.TabIndex = 1;
this.btn_Submit.Text = "提交";
this.btn_Submit.Click += new System.EventHandler(this.btn_Submit_Click);
@ -789,7 +810,7 @@
this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
this.flowLayoutPanel2.Size = new System.Drawing.Size(982, 525);
this.flowLayoutPanel2.Size = new System.Drawing.Size(736, 420);
this.flowLayoutPanel2.TabIndex = 2;
//
// splashScreenManager1
@ -802,13 +823,14 @@
//
// page_PlanEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(982, 595);
this.ClientSize = new System.Drawing.Size(736, 476);
this.ControlBox = false;
this.Controls.Add(this.tableLayoutPanel1);
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "page_PlanEdit";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "page_PlanEdit";

30
DeviceRepairAndOptimization/Pages/Plan/page_PlanEdit.resx
View File

@ -211,6 +211,15 @@
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label14.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label10.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="panel6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@ -223,6 +232,15 @@
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label15.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label11.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="panel7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
@ -235,10 +253,16 @@
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="panel8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="label16.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="label12.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label6.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="panel8.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -254,6 +278,6 @@
<value>False</value>
</metadata>
<metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
<value>205, 17</value>
</metadata>
</root>

160
DeviceRepairAndOptimization/Pages/Users/Page_UserList.Designer.cs generated
View File

@ -28,47 +28,47 @@
/// </summary>
private void InitializeComponent()
{
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Page_UserList));
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraGrid.GridFormatRule gridFormatRule3 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleValue formatConditionRuleValue3 = new DevExpress.XtraEditors.FormatConditionRuleValue();
DevExpress.XtraGrid.GridFormatRule gridFormatRule4 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleValue formatConditionRuleValue4 = new DevExpress.XtraEditors.FormatConditionRuleValue();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.BreadCrumbNode breadCrumbNode2 = new DevExpress.XtraEditors.BreadCrumbNode();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleValue formatConditionRuleValue1 = new DevExpress.XtraEditors.FormatConditionRuleValue();
DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleValue formatConditionRuleValue2 = new DevExpress.XtraEditors.FormatConditionRuleValue();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.BreadCrumbNode breadCrumbNode1 = new DevExpress.XtraEditors.BreadCrumbNode();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
this.colStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.reposBtnStatus = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.dgvDatas = new DevExpress.XtraGrid.GridControl();
@ -125,9 +125,9 @@
// reposBtnStatus
//
this.reposBtnStatus.AutoHeight = false;
editorButtonImageOptions8.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions8.Image")));
editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
this.reposBtnStatus.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.reposBtnStatus.Name = "reposBtnStatus";
this.reposBtnStatus.ReadOnly = true;
//
@ -170,29 +170,29 @@
this.colLastPwdAlterTime,
this.colDescription});
this.gridView1.DetailHeight = 450;
gridFormatRule3.ApplyToRow = true;
gridFormatRule3.Column = this.colStatus;
gridFormatRule3.Enabled = false;
gridFormatRule3.Name = "Format0";
formatConditionRuleValue3.Appearance.BackColor = System.Drawing.Color.PaleGreen;
formatConditionRuleValue3.Appearance.ForeColor = System.Drawing.Color.Black;
formatConditionRuleValue3.Appearance.Options.UseBackColor = true;
formatConditionRuleValue3.Appearance.Options.UseForeColor = true;
formatConditionRuleValue3.Condition = DevExpress.XtraEditors.FormatCondition.Expression;
formatConditionRuleValue3.Expression = "ToStr([Status]) = \'A\'";
gridFormatRule3.Rule = formatConditionRuleValue3;
gridFormatRule4.ApplyToRow = true;
gridFormatRule4.Column = this.colStatus;
gridFormatRule4.Name = "Format1";
formatConditionRuleValue4.Appearance.BackColor = System.Drawing.Color.LightPink;
formatConditionRuleValue4.Appearance.ForeColor = System.Drawing.Color.Maroon;
formatConditionRuleValue4.Appearance.Options.UseBackColor = true;
formatConditionRuleValue4.Appearance.Options.UseForeColor = true;
formatConditionRuleValue4.Condition = DevExpress.XtraEditors.FormatCondition.Expression;
formatConditionRuleValue4.Expression = "ToStr([Status]) = \'L\'";
gridFormatRule4.Rule = formatConditionRuleValue4;
this.gridView1.FormatRules.Add(gridFormatRule3);
this.gridView1.FormatRules.Add(gridFormatRule4);
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.colStatus;
gridFormatRule1.Enabled = false;
gridFormatRule1.Name = "Format0";
formatConditionRuleValue1.Appearance.BackColor = System.Drawing.Color.PaleGreen;
formatConditionRuleValue1.Appearance.ForeColor = System.Drawing.Color.Black;
formatConditionRuleValue1.Appearance.Options.UseBackColor = true;
formatConditionRuleValue1.Appearance.Options.UseForeColor = true;
formatConditionRuleValue1.Condition = DevExpress.XtraEditors.FormatCondition.Expression;
formatConditionRuleValue1.Expression = "ToStr([Status]) = \'A\'";
gridFormatRule1.Rule = formatConditionRuleValue1;
gridFormatRule2.ApplyToRow = true;
gridFormatRule2.Column = this.colStatus;
gridFormatRule2.Name = "Format1";
formatConditionRuleValue2.Appearance.BackColor = System.Drawing.Color.LightPink;
formatConditionRuleValue2.Appearance.ForeColor = System.Drawing.Color.Maroon;
formatConditionRuleValue2.Appearance.Options.UseBackColor = true;
formatConditionRuleValue2.Appearance.Options.UseForeColor = true;
formatConditionRuleValue2.Condition = DevExpress.XtraEditors.FormatCondition.Expression;
formatConditionRuleValue2.Expression = "ToStr([Status]) = \'L\'";
gridFormatRule2.Rule = formatConditionRuleValue2;
this.gridView1.FormatRules.Add(gridFormatRule1);
this.gridView1.FormatRules.Add(gridFormatRule2);
this.gridView1.GridControl = this.dgvDatas;
this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
@ -217,14 +217,14 @@
//
// reposBtnUserCode
//
editorButtonImageOptions9.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions9.Image")));
editorButtonImageOptions10.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions10.Image")));
editorButtonImageOptions11.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("editorButtonImageOptions11.SvgImage")));
editorButtonImageOptions11.SvgImageSize = new System.Drawing.Size(16, 16);
editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
editorButtonImageOptions4.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("editorButtonImageOptions4.SvgImage")));
editorButtonImageOptions4.SvgImageSize = new System.Drawing.Size(16, 16);
this.reposBtnUserCode.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "修改", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "修改用户", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "用户角色分配", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "分配角色", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "更新工卡", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "更新工卡", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "修改", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "修改用户", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "用户角色分配", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "分配角色", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "更新工卡", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "更新工卡", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.reposBtnUserCode.Name = "reposBtnUserCode";
this.reposBtnUserCode.ReadOnly = true;
//
@ -299,11 +299,11 @@
//
this.reposBtnPwd.Appearance.BackColor = System.Drawing.Color.Blue;
this.reposBtnPwd.Appearance.Options.UseBackColor = true;
editorButtonImageOptions12.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions12.Image")));
editorButtonImageOptions13.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions13.Image")));
editorButtonImageOptions5.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions5.Image")));
editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
this.reposBtnPwd.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "随机密码重置", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "使用随机密码重置", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "默认密码重置", -1, true, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "使用默认密码重置", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "随机密码重置", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "使用随机密码重置", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "默认密码重置", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "使用默认密码重置", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.reposBtnPwd.Name = "reposBtnPwd";
this.reposBtnPwd.ReadOnly = true;
this.reposBtnPwd.UseSystemPasswordChar = true;
@ -442,16 +442,16 @@
this.repositoryItemBreadCrumbEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemBreadCrumbEdit1.Name = "repositoryItemBreadCrumbEdit1";
breadCrumbNode2.Caption = "string";
breadCrumbNode2.Value = "string";
breadCrumbNode1.Caption = "string";
breadCrumbNode1.Value = "string";
this.repositoryItemBreadCrumbEdit1.Nodes.AddRange(new DevExpress.XtraEditors.BreadCrumbNode[] {
breadCrumbNode2});
breadCrumbNode1});
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.OK, "哦哦", -1, true, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.OK, "哦哦", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//

12
DeviceRepairAndOptimization/Pages/Users/Page_UserList.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="editorButtonImageOptions8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAD90RVh0VGl0
bGUAQ29uZGl0aW9uYWxGb3JtYXR0aW5zSWNvblNldFNpZ25zMztDb25kaXRpb25hbEZvcm1hdHRpbmc7
@ -138,7 +138,7 @@
d5yfz4FYZ638Xdx9bvqHC/sNr30BiiGUNzoAAAAASUVORK5CYII=
</value>
</data>
<data name="editorButtonImageOptions9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABd0RVh0VGl0
bGUATW9kaWZ5VGFibGVTdHlsZTvvH3A0AAACyUlEQVQ4T6WTWUhUURzGz0yZaONSkERahARZSEi9+FC5
@ -156,7 +156,7 @@
24xFpRt/oC+F9bFg7BzBTWIdzdkfqgJAkkYtu9MAAAAASUVORK5CYII=
</value>
</data>
<data name="editorButtonImageOptions10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFVzZXI7l1sKAgAAAx1JREFUOE9V
@ -177,7 +177,7 @@
</value>
</data>
<assembly alias="DevExpress.Data.v20.2" name="DevExpress.Data.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="editorButtonImageOptions11.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions4.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v20.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIwLjIsIFZlcnNpb249MjAuMi4z
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -206,7 +206,7 @@
Cw==
</value>
</data>
<data name="editorButtonImageOptions12.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAQdEVYdFRpdGxlAEhpZ2hsaWdodDt4R7JYAAAAn0lE
@ -215,7 +215,7 @@
PvMkrHiwlAHmSVgJIckA8yQoHsLtLJlkgEySFA/h1qOafbF2A1cLH5OqmZXnAAAAAElFTkSuQmCC
</value>
</data>
<data name="editorButtonImageOptions13.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="editorButtonImageOptions6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAsdEVYdFRpdGxlAEJyaW5nO1RvIEZyb250O0Zyb250

3
DeviceRepairAndOptimization/Pages/Users/frmRoleAuths.cs
View File

@ -199,6 +199,9 @@ namespace DeviceRepairAndOptimization.Pages.Users
}
}
// 更新当前用户权限
new Action(GlobalInfo.RefreshAuths).BeginInvoke(null, null);
splashScreenManager1.TryCloseWait();
this.DialogResult = DialogResult.OK;
}

61
DeviceRepairAndOptimization/Pages/Users/frmRoleEdit.Designer.cs generated
View File

@ -143,13 +143,13 @@
this.tvAuths.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
this.tColumnRoleCode,
this.treeListColumn5});
this.tvAuths.Location = new System.Drawing.Point(20, 131);
this.tvAuths.Location = new System.Drawing.Point(24, 135);
this.tvAuths.MenuManager = this.toolbarFormManager1;
this.tvAuths.Name = "tvAuths";
this.tvAuths.OptionsBehavior.AllowIndeterminateCheckState = true;
this.tvAuths.OptionsView.BestFitNodes = DevExpress.XtraTreeList.TreeListBestFitNodes.All;
this.tvAuths.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
this.tvAuths.Size = new System.Drawing.Size(393, 448);
this.tvAuths.Size = new System.Drawing.Size(387, 440);
this.tvAuths.TabIndex = 10;
//
// tColumnRoleCode
@ -231,11 +231,11 @@
// dgvUsers
//
this.dgvUsers.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
this.dgvUsers.Location = new System.Drawing.Point(437, 157);
this.dgvUsers.Location = new System.Drawing.Point(439, 161);
this.dgvUsers.MainView = this.gridView1;
this.dgvUsers.MenuManager = this.toolbarFormManager1;
this.dgvUsers.Name = "dgvUsers";
this.dgvUsers.Size = new System.Drawing.Size(510, 422);
this.dgvUsers.Size = new System.Drawing.Size(504, 414);
this.dgvUsers.TabIndex = 12;
this.dgvUsers.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@ -276,7 +276,6 @@
this.gridView1.OptionsFind.FindMode = DevExpress.XtraEditors.FindMode.FindClick;
this.gridView1.OptionsSelection.MultiSelect = true;
this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsSelection.ShowCheckBoxSelectorInColumnHeader = DevExpress.Utils.DefaultBoolean.True;
this.gridView1.OptionsView.ShowDetailButtons = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
@ -312,10 +311,10 @@
//
// txtRoleCode
//
this.txtRoleCode.Location = new System.Drawing.Point(91, 10);
this.txtRoleCode.Location = new System.Drawing.Point(96, 12);
this.txtRoleCode.Name = "txtRoleCode";
this.txtRoleCode.Properties.MaxLength = 50;
this.txtRoleCode.Size = new System.Drawing.Size(332, 22);
this.txtRoleCode.Size = new System.Drawing.Size(327, 22);
this.txtRoleCode.StyleController = this.layoutControl1;
this.txtRoleCode.TabIndex = 4;
conditionValidationRule1.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank;
@ -324,19 +323,19 @@
//
// txtRoleDesc
//
this.txtRoleDesc.Location = new System.Drawing.Point(508, 36);
this.txtRoleDesc.Location = new System.Drawing.Point(511, 38);
this.txtRoleDesc.Name = "txtRoleDesc";
this.txtRoleDesc.Properties.MaxLength = 50;
this.txtRoleDesc.Size = new System.Drawing.Size(449, 22);
this.txtRoleDesc.Size = new System.Drawing.Size(444, 22);
this.txtRoleDesc.StyleController = this.layoutControl1;
this.txtRoleDesc.TabIndex = 7;
//
// txtRoleName
//
this.txtRoleName.Location = new System.Drawing.Point(91, 36);
this.txtRoleName.Location = new System.Drawing.Point(96, 38);
this.txtRoleName.Name = "txtRoleName";
this.txtRoleName.Properties.MaxLength = 50;
this.txtRoleName.Size = new System.Drawing.Size(332, 22);
this.txtRoleName.Size = new System.Drawing.Size(327, 22);
this.txtRoleName.StyleController = this.layoutControl1;
this.txtRoleName.TabIndex = 5;
conditionValidationRule2.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank;
@ -345,16 +344,16 @@
//
// txtNote
//
this.txtNote.Location = new System.Drawing.Point(91, 62);
this.txtNote.Location = new System.Drawing.Point(96, 64);
this.txtNote.Name = "txtNote";
this.txtNote.Properties.MaxLength = 50;
this.txtNote.Size = new System.Drawing.Size(866, 22);
this.txtNote.Size = new System.Drawing.Size(859, 22);
this.txtNote.StyleController = this.layoutControl1;
this.txtNote.TabIndex = 8;
//
// comboBoxEdit1
//
this.comboBoxEdit1.Location = new System.Drawing.Point(518, 131);
this.comboBoxEdit1.Location = new System.Drawing.Point(523, 135);
this.comboBoxEdit1.MenuManager = this.toolbarFormManager1;
this.comboBoxEdit1.Name = "comboBoxEdit1";
this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@ -365,7 +364,7 @@
"显示停用用户"});
this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.comboBoxEdit1.Properties.SelectedIndexChanged += new System.EventHandler(this.comboBoxEdit1_Properties_SelectedIndexChanged);
this.comboBoxEdit1.Size = new System.Drawing.Size(178, 22);
this.comboBoxEdit1.Size = new System.Drawing.Size(172, 22);
this.comboBoxEdit1.StyleController = this.layoutControl1;
this.comboBoxEdit1.TabIndex = 15;
//
@ -392,7 +391,7 @@
this.layoutControlItem1.CustomizationFormText = "角色编码";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(417, 26);
this.layoutControlItem1.Size = new System.Drawing.Size(415, 26);
this.layoutControlItem1.Text = "角色编码";
this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 15);
//
@ -401,24 +400,24 @@
this.layoutControlItem2.Control = this.txtRoleName;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(417, 26);
this.layoutControlItem2.Size = new System.Drawing.Size(415, 26);
this.layoutControlItem2.Text = "角色名称";
this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 15);
//
// emptySpaceItem3
//
this.emptySpaceItem3.AllowHotTrack = false;
this.emptySpaceItem3.Location = new System.Drawing.Point(417, 0);
this.emptySpaceItem3.Location = new System.Drawing.Point(415, 0);
this.emptySpaceItem3.Name = "emptySpaceItem3";
this.emptySpaceItem3.Size = new System.Drawing.Size(534, 26);
this.emptySpaceItem3.Size = new System.Drawing.Size(532, 26);
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txtRoleDesc;
this.layoutControlItem4.Location = new System.Drawing.Point(417, 26);
this.layoutControlItem4.Location = new System.Drawing.Point(415, 26);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.Size = new System.Drawing.Size(534, 26);
this.layoutControlItem4.Size = new System.Drawing.Size(532, 26);
this.layoutControlItem4.Text = "角色描述";
this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 15);
//
@ -427,7 +426,7 @@
this.layoutControlItem5.Control = this.txtNote;
this.layoutControlItem5.Location = new System.Drawing.Point(0, 52);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.Size = new System.Drawing.Size(951, 26);
this.layoutControlItem5.Size = new System.Drawing.Size(947, 26);
this.layoutControlItem5.Text = "备注";
this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 15);
//
@ -437,7 +436,7 @@
this.layoutControlItem6});
this.layoutControlGroup2.Location = new System.Drawing.Point(0, 90);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.Size = new System.Drawing.Size(417, 493);
this.layoutControlGroup2.Size = new System.Drawing.Size(415, 489);
this.layoutControlGroup2.Text = "角色权限选择";
//
// layoutControlItem6
@ -445,7 +444,7 @@
this.layoutControlItem6.Control = this.tvAuths;
this.layoutControlItem6.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.Size = new System.Drawing.Size(397, 452);
this.layoutControlItem6.Size = new System.Drawing.Size(391, 444);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@ -454,7 +453,7 @@
this.emptySpaceItem1.AllowHotTrack = false;
this.emptySpaceItem1.Location = new System.Drawing.Point(0, 78);
this.emptySpaceItem1.Name = "emptySpaceItem1";
this.emptySpaceItem1.Size = new System.Drawing.Size(951, 12);
this.emptySpaceItem1.Size = new System.Drawing.Size(947, 12);
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlGroup1
@ -463,9 +462,9 @@
this.layoutControlItem7,
this.layoutControlItem3,
this.emptySpaceItem2});
this.layoutControlGroup1.Location = new System.Drawing.Point(417, 90);
this.layoutControlGroup1.Location = new System.Drawing.Point(415, 90);
this.layoutControlGroup1.Name = "layoutControlGroup1";
this.layoutControlGroup1.Size = new System.Drawing.Size(534, 493);
this.layoutControlGroup1.Size = new System.Drawing.Size(532, 489);
this.layoutControlGroup1.Text = "用户选择";
//
// layoutControlItem7
@ -473,7 +472,7 @@
this.layoutControlItem7.Control = this.dgvUsers;
this.layoutControlItem7.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.Size = new System.Drawing.Size(514, 426);
this.layoutControlItem7.Size = new System.Drawing.Size(508, 418);
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
//
@ -483,16 +482,16 @@
this.layoutControlItem3.CustomizationFormText = "选择";
this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.Size = new System.Drawing.Size(263, 26);
this.layoutControlItem3.Size = new System.Drawing.Size(260, 26);
this.layoutControlItem3.Text = "选择用户状态";
this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 15);
//
// emptySpaceItem2
//
this.emptySpaceItem2.AllowHotTrack = false;
this.emptySpaceItem2.Location = new System.Drawing.Point(263, 0);
this.emptySpaceItem2.Location = new System.Drawing.Point(260, 0);
this.emptySpaceItem2.Name = "emptySpaceItem2";
this.emptySpaceItem2.Size = new System.Drawing.Size(251, 26);
this.emptySpaceItem2.Size = new System.Drawing.Size(248, 26);
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
//
// toolbarFormControl1

6
DeviceRepairAndOptimization/Pages/Users/frmRoleEdit.cs
View File

@ -33,6 +33,8 @@ namespace DeviceRepairAndOptimization.Pages.Users
tvAuths.BeforeCheckNode += TvAuths_BeforeCheckNode;
tvAuths.AfterCheckNode += TvAuths_AfterCheckNode;
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
#region 加载窗体数据
splashScreenManager1.ShowWaitForm();
@ -321,6 +323,10 @@ namespace DeviceRepairAndOptimization.Pages.Users
splashScreenManager1.TryCloseWait();
this.DialogResult = DialogResult.OK;
}
// 更新当前用户权限
new Action(GlobalInfo.RefreshAuths).BeginInvoke(null, null);
splashScreenManager1.TryCloseWait();
}
catch (Exception ex)

18
DeviceRepairAndOptimization/Pages/Users/frmRoleUsers.cs
View File

@ -20,11 +20,18 @@ namespace DeviceRepairAndOptimization.Pages.Users
this.Load += FrmRoleUsers_Load;
}
private void FrmRoleUsers_Load(object sender, EventArgs e)
private void FrmRoleUsers_Load(object sender, EventArgs ee)
{
try
{
splashScreenManager1.ShowWaitForm();
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
// 修改字段标题
gridView1.CustomDrawColumnHeader += GridView1_CustomDrawColumnHeader;
APIResponseData apiResponseData = UserManager.Instance.GetAllUsers();
if (!apiResponseData.IsSuccess)
{
@ -56,6 +63,12 @@ namespace DeviceRepairAndOptimization.Pages.Users
}
}
private void GridView1_CustomDrawColumnHeader(object sender, DevExpress.XtraGrid.Views.Grid.ColumnHeaderCustomDrawEventArgs e)
{
if (e.Column != null && e.Column.Caption == "Selection")
e.Info.Caption = "选择";
}
private void SelectCurrentRoleUsers()
{
APIResponseData apiResponseData = RoleManger.Instance.GetRoleUsers(CurrentRole.AutoID);
@ -126,6 +139,9 @@ namespace DeviceRepairAndOptimization.Pages.Users
throw new Exception(apiResponseData.Message);
}
// 更新当前用户权限
new Action(GlobalInfo.RefreshAuths).BeginInvoke(null, null);
splashScreenManager1.TryCloseWait();
this.DialogResult = DialogResult.OK;
}

2
DeviceRepairAndOptimization/Pages/Users/frmRoles.cs
View File

@ -48,6 +48,8 @@ namespace DeviceRepairAndOptimization.Pages.Users
private void FrmRoles_Load(object sender, EventArgs e)
{
splashScreenManager1.ShowWaitForm();
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
GetDatas();
splashScreenManager1.TryCloseWait();
}

5
DeviceRepairAndOptimization/Pages/Users/frmUserAdd.cs
View File

@ -23,7 +23,7 @@ namespace DeviceRepairAndOptimization.Pages.Users
public frmUserAdd(UserInfoModel entity = null, bool AllocationRole = false, string title = "用户新增")
{
InitializeComponent();
this.Text = title;
// 关闭右键Customize Layout菜单
@ -88,6 +88,9 @@ namespace DeviceRepairAndOptimization.Pages.Users
{
try
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
#region 加载角色列表
if (IsSetUserRoles)
{

3
DeviceRepairAndOptimization/Pages/Users/frmUsers.cs
View File

@ -408,6 +408,9 @@ namespace DeviceRepairAndOptimization.Pages.Users
private void frmUsers_Load(object sender, EventArgs e)
{
gridView1.IndicatorWidth = 40;
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
try
{
splashScreenManager1.ShowWaitForm();

100
DeviceRepairAndOptimization/Pages/pageSytemSetting.Designer.cs generated
View File

@ -30,29 +30,29 @@ namespace DeviceRepairAndOptimization.Pages
private void InitializeComponent()
{
DevExpress.XtraLayout.LayoutControl layoutControl1;
DevExpress.Utils.Layout.StackPanel stackPanel1;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageSytemSetting));
DevExpress.XtraLayout.LayoutControlGroup Root;
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.Utils.Layout.StackPanel stackPanel1;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageSytemSetting));
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
this.lcContent = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.lcContent = new DevExpress.XtraLayout.LayoutControlItem();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
stackPanel1 = new DevExpress.Utils.Layout.StackPanel();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
((System.ComponentModel.ISupportInitialize)(layoutControl1)).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(stackPanel1)).BeginInit();
stackPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lcContent)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
this.SuspendLayout();
//
// layoutControl1
@ -67,6 +67,43 @@ namespace DeviceRepairAndOptimization.Pages
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
// dataLayoutControl1
//
this.dataLayoutControl1.Location = new System.Drawing.Point(12, 46);
this.dataLayoutControl1.Name = "dataLayoutControl1";
this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1225, 682, 650, 400);
this.dataLayoutControl1.Root = this.layoutControlGroup1;
this.dataLayoutControl1.Size = new System.Drawing.Size(1574, 941);
this.dataLayoutControl1.TabIndex = 5;
this.dataLayoutControl1.Text = "dataLayoutControl1";
//
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Name = "Root";
this.layoutControlGroup1.Size = new System.Drawing.Size(1574, 941);
this.layoutControlGroup1.TextVisible = false;
//
// stackPanel1
//
stackPanel1.Controls.Add(this.simpleButton1);
stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
stackPanel1.Location = new System.Drawing.Point(12, 12);
stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(1574, 30);
stackPanel1.TabIndex = 4;
//
// simpleButton1
//
this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image")));
this.simpleButton1.Location = new System.Drawing.Point(1496, 3);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(75, 23);
this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "保存";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@ -90,15 +127,6 @@ namespace DeviceRepairAndOptimization.Pages
Root.Size = new System.Drawing.Size(1598, 999);
Root.TextVisible = false;
//
// stackPanel1
//
stackPanel1.Controls.Add(this.simpleButton1);
stackPanel1.LayoutDirection = DevExpress.Utils.Layout.StackPanelLayoutDirection.RightToLeft;
stackPanel1.Location = new System.Drawing.Point(12, 12);
stackPanel1.Name = "stackPanel1";
stackPanel1.Size = new System.Drawing.Size(1574, 30);
stackPanel1.TabIndex = 4;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = stackPanel1;
@ -108,26 +136,6 @@ namespace DeviceRepairAndOptimization.Pages
this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem1.TextVisible = false;
//
// simpleButton1
//
this.simpleButton1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("simpleButton1.ImageOptions.Image")));
this.simpleButton1.Location = new System.Drawing.Point(1496, 3);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(75, 23);
this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "保存";
this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// dataLayoutControl1
//
this.dataLayoutControl1.Location = new System.Drawing.Point(12, 46);
this.dataLayoutControl1.Name = "dataLayoutControl1";
this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1225, 682, 650, 400);
this.dataLayoutControl1.Root = this.layoutControlGroup1;
this.dataLayoutControl1.Size = new System.Drawing.Size(1574, 941);
this.dataLayoutControl1.TabIndex = 5;
this.dataLayoutControl1.Text = "dataLayoutControl1";
//
// lcContent
//
this.lcContent.Control = this.dataLayoutControl1;
@ -138,14 +146,6 @@ namespace DeviceRepairAndOptimization.Pages
this.lcContent.TextSize = new System.Drawing.Size(0, 0);
this.lcContent.TextVisible = false;
//
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Name = "Root";
this.layoutControlGroup1.Size = new System.Drawing.Size(1574, 941);
this.layoutControlGroup1.TextVisible = false;
//
// pageSytemSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@ -154,18 +154,18 @@ namespace DeviceRepairAndOptimization.Pages
this.Controls.Add(layoutControl1);
this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("宋体", 11.25F);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "pageSytemSetting";
this.Text = "pageSytemSetting";
((System.ComponentModel.ISupportInitialize)(layoutControl1)).EndInit();
layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(stackPanel1)).EndInit();
stackPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lcContent)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
this.ResumeLayout(false);
}

30
DeviceRepairAndOptimization/Pages/pageSytemSetting.resx
View File

@ -126,21 +126,21 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="simpleButton1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAXdEVYdFRpdGxlAFNhdmUgQWxsO1NhdmU7QWxsbhT1oQAAAvdJREFUOE9tk8lPU1EUh8GCUAqI
GxP+CRdGJcxzgUJLoS0U+tpSoHSg0EIfnSlQZqkoyGAMJohGgiiSYKJuDJBojIkrRTRxJ2FUMRFk+fPe
R4KmepNv83LOd86957wwACckJiaGE04RIkKI/A88QniogNfsn1y2dkyiuX0CTb5xNHrGYHaPwui6DoNj
GHp7EJrGHqgNnSskPiJUENnsn8DU3Av0TiygZ/wRuscfont0HoGRB7B5x2AiAmPrEFQNHSDxUWHkhBNO
ESIEAkGU0XnNPjq9ZG8fvsf6gndZ75UZ1jN4h20L3GL11j57g22g1WAbRGWthwqiqYCnsQWXtS1BSKvb
YHFcJVUGoW/qhdbUBVW9D/liA8QqJyTV7OdaS7ddb+2HQuuiAj4VRGpsQxiZfgpxhQ27+7+w/e0Qm18P
sLF3gC+7P5EtqoOyzo8iRQvURn9bnaUP5QxLBTFUcJppGkBwagmF5Y1c4ttPO3izvo3Xa1t49X4TGUIN
KnSkkzILVHpvm87cg1JlCxUIqCCqytyHgcnHyJMYsEEqHidu4eW7TY6UXBXkWg9yJCYodW6H1hhAiaKZ
CmKpILrS0I3AjXmu1awCHdJJxbQ8BqkkMTm7CklZStKyG5kiPSq0Dqe6oQvFskYqiKMCvryuA+3DszB7
JmFyT8DgHgdj6oFM7UIZ4+SQVjuRJqyFXMU6GX0nCqVGKoinghhpjQ/O/hnIdV6yDv+e4gorJEoWybka
lFW1uBQaF4TihhOBQMK4YA/chpRxcAl7P46O2T/ipiKUmlGssJOrqJCZz7iKZRbkFGlXiYCbQqyo0k5W
9yapZOMENGmH8p1ySN6mHiJ5Ky6mK8Hn88+RxASCgMCjgrgCmRUm1xiEpWZ4Fz/CubAOdn4dtrkPaLq/
Rh5Ui5wSEy6kKEDi40mNk/Wnh5+Sq15Jza/hKknan0HkeY489gnSLYu4XD+LpAw6CQbnL0lWSXxMqID+
B/QuZwgJf3E2BPqNLg7vjwBhvwEQ2/URXB1OawAAAABJRU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABd0RVh0VGl0
bGUAU2F2ZSBBbGw7U2F2ZTtBbGxuFPWhAAAC90lEQVQ4T22TyU9TURSHwYJQCogbE/4JF0YlzHOBQkuh
LRT62lKgdKDQQh+dKVBmqSjIYAwmiEaCKJJgom4MkGiMiStFNHEnYVQxEWT5895HgqZ6k2/zcs53zr3n
vDAAJyQmJoYTThEiQoj8DzxCeKiA1+yfXLZ2TKK5fQJNvnE0esZgdo/C6LoOg2MYensQmsYeqA2dKyQ+
IlQQ2eyfwNTcC/ROLKBn/BG6xx+ie3QegZEHsHnHYCICY+sQVA0dIPFRYeSEE04RIgQCQZTRec0+Or1k
bx++x/qCd1nvlRnWM3iHbQvcYvXWPnuDbaDVYBtEZa2HCqKpgKexBZe1LUFIq9tgcVwlVQahb+qF1tQF
Vb0P+WIDxConJNXs51pLt11v7YdC66ICPhVEamxDGJl+CnGFDbv7v7D97RCbXw+wsXeAL7s/kS2qg7LO
jyJFC9RGf1udpQ/lDEsFMVRwmmkaQHBqCYXljVzi2087eLO+jddrW3j1fhMZQg0qdKSTMgtUem+bztyD
UmULFQioIKrK3IeBycfIkxiwQSoeJ27h5btNjpRcFeRaD3IkJih1bofWGECJopkKYqkgutLQjcCNea7V
rAId0knFtDwGqSQxObsKSVlK0rIbmSI9KrQOp7qhC8WyRiqIowK+vK4D7cOzMHsmYXJPwOAeB2PqgUzt
Qhnj5JBWO5EmrIVcxToZfScKpUYqiKeCGGmND87+Gch1XrIO/57iCiskShbJuRqUVbW4FBoXhOKGE4FA
wrhgD9yGlHFwCXs/jo7ZP+KmIpSaUaywk6uokJnPuIplFuQUaVeJgJtCrKjSTlb3Jqlk4wQ0aYfynXJI
3qYeInkrLqYrwefzz5HEBIKAwKOCuAKZFSbXGISlZngXP8K5sA52fh22uQ9our9GHlSLnBITLqQoQOLj
SY2T9aeHn5KrXknNr+EqSdqfQeR5jjz2CdIti7hcP4ukDDoJBucvSVZJfEyogP4H9C5nCAl/cTYE+o0u
Du+PAGG/ARDb9RFcHU5rAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="Root.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

4
DeviceRepairAndOptimization/Pages/page_DocReader.Designer.cs generated
View File

@ -32,9 +32,9 @@
//
// page_DocReader
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1472, 937);
this.ClientSize = new System.Drawing.Size(1598, 999);
this.Name = "page_DocReader";
this.Text = "page_DocReader";
this.ResumeLayout(false);

18
DeviceRepairAndOptimization/Pages/page_RichEdit.Designer.cs generated
View File

@ -53,7 +53,7 @@ namespace DeviceRepairAndOptimization.Pages
this.richEditControl1.MenuManager = this.barManager1;
this.richEditControl1.Name = "richEditControl1";
this.richEditControl1.ShowCaretInReadOnly = false;
this.richEditControl1.Size = new System.Drawing.Size(1472, 854);
this.richEditControl1.Size = new System.Drawing.Size(1598, 916);
this.richEditControl1.TabIndex = 0;
this.richEditControl1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.richEditControl1_MouseClick);
//
@ -77,15 +77,15 @@ namespace DeviceRepairAndOptimization.Pages
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
this.barDockControlTop.Size = new System.Drawing.Size(1472, 0);
this.barDockControlTop.Size = new System.Drawing.Size(1598, 0);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
this.barDockControlBottom.Location = new System.Drawing.Point(0, 854);
this.barDockControlBottom.Location = new System.Drawing.Point(0, 916);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1472, 0);
this.barDockControlBottom.Size = new System.Drawing.Size(1598, 0);
//
// barDockControlLeft
//
@ -93,15 +93,15 @@ namespace DeviceRepairAndOptimization.Pages
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControlLeft.Location = new System.Drawing.Point(0, 0);
this.barDockControlLeft.Manager = this.barManager1;
this.barDockControlLeft.Size = new System.Drawing.Size(0, 854);
this.barDockControlLeft.Size = new System.Drawing.Size(0, 916);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControlRight.Location = new System.Drawing.Point(1472, 0);
this.barDockControlRight.Location = new System.Drawing.Point(1598, 0);
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Size = new System.Drawing.Size(0, 854);
this.barDockControlRight.Size = new System.Drawing.Size(0, 916);
//
// btn_Ok
//
@ -143,9 +143,9 @@ namespace DeviceRepairAndOptimization.Pages
//
// page_RichEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1472, 854);
this.ClientSize = new System.Drawing.Size(1598, 916);
this.Controls.Add(this.richEditControl1);
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);

6
DeviceRepairAndOptimization/Pages/page_totalWarn.Designer.cs generated
View File

@ -137,7 +137,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl1.Location = new System.Drawing.Point(0, 0);
this.gridControl1.MainView = this.tileView1;
this.gridControl1.Name = "gridControl1";
this.gridControl1.Size = new System.Drawing.Size(1472, 937);
this.gridControl1.Size = new System.Drawing.Size(1598, 999);
this.gridControl1.TabIndex = 0;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.tileView1});
@ -256,9 +256,9 @@ namespace DeviceRepairAndOptimization.Pages
//
// page_totalWarn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1472, 937);
this.ClientSize = new System.Drawing.Size(1598, 999);
this.Controls.Add(this.gridControl1);
this.Name = "page_totalWarn";
this.Text = "page_totalWarn";

4
DeviceRepairAndOptimization/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.1.10")]
[assembly: AssemblyFileVersion("2.0.1.10")]
[assembly: AssemblyVersion("2.0.1.12")]
[assembly: AssemblyFileVersion("2.0.1.12")]

25
DeviceRepairAndOptimization/Properties/licenses.licx
View File

@ -1,20 +1,21 @@
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v20.2, Version=20.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

7
DeviceRepairAndOptimization/ServiceRouteConstValue.cs
View File

@ -109,6 +109,11 @@
/// </summary>
public const string ClearRoleAuths = "Api/Role/ClearRoleAuths";
/// <summary>
/// 通过用户主键获取当前权限
/// </summary>
public const string GetUserAuthsByUserID = "Api/Role/GetUserAuthsByUserID";
#endregion
#region 计划相关
@ -297,7 +302,7 @@
/// <summary>
/// 设备维修单获取
/// </summary>
public const string GetMaintenanceDatas = "Api/Maintenance/GetDatas";
public const string GetMaintenanceDatas = "Api/Maintenance/GetDataTest";//"Api/Maintenance/GetDatas";
/// <summary>
/// 设备维修

53
DeviceRepairAndOptimization/frmLogin.Designer.cs generated
View File

@ -67,8 +67,8 @@
// bTxtPassword
//
this.bTxtPassword.EnterMoveNextControl = true;
this.bTxtPassword.Location = new System.Drawing.Point(124, 422);
this.bTxtPassword.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.bTxtPassword.Location = new System.Drawing.Point(96, 352);
this.bTxtPassword.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.bTxtPassword.Name = "bTxtPassword";
this.bTxtPassword.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
this.bTxtPassword.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
@ -77,14 +77,15 @@
this.bTxtPassword.Properties.Appearance.Options.UseFont = true;
this.bTxtPassword.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
editorButtonImageOptions2.Image = global::DeviceRepairAndOptimization.Properties.Resources.icohide;
this.bTxtPassword.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, true, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "密码可见", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "密码可见", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "密码隐藏", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "密码隐藏", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.bTxtPassword.Properties.MaxLength = 200;
this.bTxtPassword.Properties.UseSystemPasswordChar = true;
this.bTxtPassword.Properties.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.bTxtPassword_Properties_ButtonClick);
this.bTxtPassword.Properties.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.bTxtPassword_Properties_KeyPress);
this.bTxtPassword.Size = new System.Drawing.Size(371, 44);
this.bTxtPassword.Size = new System.Drawing.Size(289, 42);
this.bTxtPassword.TabIndex = 1;
conditionValidationRule1.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank;
conditionValidationRule1.ErrorText = "请输入密码！";
@ -97,8 +98,8 @@
//
this.bTxtUserCode.EnterMoveNextControl = true;
this.bTxtUserCode.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.bTxtUserCode.Location = new System.Drawing.Point(124, 339);
this.bTxtUserCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.bTxtUserCode.Location = new System.Drawing.Point(96, 282);
this.bTxtUserCode.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.bTxtUserCode.Name = "bTxtUserCode";
this.bTxtUserCode.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
this.bTxtUserCode.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
@ -109,7 +110,8 @@
editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
this.bTxtUserCode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, false, true, true, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.bTxtUserCode.Size = new System.Drawing.Size(371, 44);
this.bTxtUserCode.Properties.MaxLength = 50;
this.bTxtUserCode.Size = new System.Drawing.Size(289, 42);
this.bTxtUserCode.TabIndex = 0;
conditionValidationRule2.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank;
conditionValidationRule2.ErrorText = "账号不可以为空";
@ -125,11 +127,11 @@
this.lblVersion.Appearance.Options.UseForeColor = true;
this.lblVersion.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("lblVersion.BackgroundImage")));
this.lblVersion.Enabled = false;
this.lblVersion.Location = new System.Drawing.Point(0, 243);
this.lblVersion.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.lblVersion.Location = new System.Drawing.Point(0, 202);
this.lblVersion.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.lblVersion.Name = "lblVersion";
this.lblVersion.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light;
this.lblVersion.Size = new System.Drawing.Size(618, 45);
this.lblVersion.Size = new System.Drawing.Size(481, 37);
this.lblVersion.TabIndex = 7;
this.lblVersion.Text = "Ver";
//
@ -142,8 +144,8 @@
this.bBtnLogin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.bBtnLogin.Cursor = System.Windows.Forms.Cursors.Hand;
this.bBtnLogin.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("bBtnLogin.ImageOptions.Image")));
this.bBtnLogin.Location = new System.Drawing.Point(110, 530);
this.bBtnLogin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.bBtnLogin.Location = new System.Drawing.Point(86, 442);
this.bBtnLogin.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.bBtnLogin.Name = "bBtnLogin";
this.bBtnLogin.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light;
this.bBtnLogin.Size = new System.Drawing.Size(120, 42);
@ -158,11 +160,11 @@
this.bBtnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.bBtnExit.Cursor = System.Windows.Forms.Cursors.Hand;
this.bBtnExit.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("bBtnExit.ImageOptions.Image")));
this.bBtnExit.Location = new System.Drawing.Point(360, 530);
this.bBtnExit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.bBtnExit.Location = new System.Drawing.Point(280, 442);
this.bBtnExit.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.bBtnExit.Name = "bBtnExit";
this.bBtnExit.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light;
this.bBtnExit.Size = new System.Drawing.Size(154, 54);
this.bBtnExit.Size = new System.Drawing.Size(120, 45);
this.bBtnExit.TabIndex = 3;
this.bBtnExit.Click += new System.EventHandler(this.bBtnExit_Click);
//
@ -171,7 +173,7 @@
this.peImage.Dock = System.Windows.Forms.DockStyle.Top;
this.peImage.EditValue = ((object)(resources.GetObject("peImage.EditValue")));
this.peImage.Location = new System.Drawing.Point(0, 0);
this.peImage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.peImage.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.peImage.Name = "peImage";
this.peImage.Properties.AllowFocused = false;
this.peImage.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
@ -180,7 +182,7 @@
this.peImage.Properties.ShowMenu = false;
this.peImage.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Stretch;
this.peImage.Properties.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.None;
this.peImage.Size = new System.Drawing.Size(618, 617);
this.peImage.Size = new System.Drawing.Size(481, 514);
this.peImage.TabIndex = 5;
this.peImage.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pnl_Top_MouseMove);
//
@ -192,9 +194,9 @@
this.panelEx1.BorderWidth = 1;
this.panelEx1.Controls.Add(this.lblTitle);
this.panelEx1.Location = new System.Drawing.Point(0, 0);
this.panelEx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelEx1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(618, 49);
this.panelEx1.Size = new System.Drawing.Size(481, 41);
this.panelEx1.TabIndex = 10;
this.panelEx1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pnl_Top_MouseMove);
//
@ -203,9 +205,10 @@
this.lblTitle.AutoSize = true;
this.lblTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(150)))), ((int)(((byte)(161)))));
this.lblTitle.Location = new System.Drawing.Point(9, 10);
this.lblTitle.Location = new System.Drawing.Point(7, 8);
this.lblTitle.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblTitle.Name = "lblTitle";
this.lblTitle.Size = new System.Drawing.Size(109, 29);
this.lblTitle.Size = new System.Drawing.Size(86, 23);
this.lblTitle.TabIndex = 0;
this.lblTitle.Text = "系统登陆";
this.lblTitle.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pnl_Top_MouseMove);
@ -216,9 +219,9 @@
//
// frmLogin
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(618, 617);
this.ClientSize = new System.Drawing.Size(481, 514);
this.Controls.Add(this.panelEx1);
this.Controls.Add(this.lblVersion);
this.Controls.Add(this.bBtnLogin);
@ -229,7 +232,7 @@
this.FormBorderEffect = DevExpress.XtraEditors.FormBorderEffect.Shadow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.IconOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("frmLogin.IconOptions.LargeImage")));
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "frmLogin";

23
DeviceRepairAndOptimization/frmLogin.cs
View File

@ -134,9 +134,9 @@ namespace DeviceRepairAndOptimization
private void bTxtPassword_Leave(object sender, EventArgs e)
{
bTxtPassword.Properties.UseSystemPasswordChar = true;
bTxtPassword.Properties.Buttons[1].ImageOptions.Image = Properties.Resources.icoshow;
bTxtPassword.Properties.Buttons[1].Caption = "密码可见";
bTxtPassword.Properties.Buttons[1].ToolTip = "密码可见";
bTxtPassword.Properties.Buttons[1].ImageOptions.Image = Properties.Resources.icohide;
bTxtPassword.Properties.Buttons[1].Caption = "密码隐藏";
bTxtPassword.Properties.Buttons[1].ToolTip = "密码隐藏";
}
/// <summary>
@ -190,20 +190,21 @@ namespace DeviceRepairAndOptimization
/// <param name="e"></param>
private void bTxtPassword_Properties_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
if (e.Button.Caption == "密码可见")
bool isShow = e.Button.Caption != "密码可见";
if (isShow)
{
bTxtPassword.Properties.UseSystemPasswordChar = false;
bTxtPassword.Properties.Buttons[1].ImageOptions.Image = Properties.Resources.icohide;
bTxtPassword.Properties.Buttons[1].Caption = "密码隐藏";
bTxtPassword.Properties.Buttons[1].ToolTip = "密码隐藏";
}
else if (e.Button.Caption == "密码隐藏")
{
bTxtPassword.Properties.UseSystemPasswordChar = true;
bTxtPassword.Properties.Buttons[1].ImageOptions.Image = Properties.Resources.icoshow;
bTxtPassword.Properties.Buttons[1].Caption = "密码可见";
bTxtPassword.Properties.Buttons[1].ToolTip = "密码可见";
}
else
{
bTxtPassword.Properties.UseSystemPasswordChar = true;
bTxtPassword.Properties.Buttons[1].ImageOptions.Image = Properties.Resources.icohide;
bTxtPassword.Properties.Buttons[1].Caption = "密码隐藏";
bTxtPassword.Properties.Buttons[1].ToolTip = "密码隐藏";
}
}
/// <summary>

14
DeviceRepairAndOptimization/frmLogin.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="dxValidationProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
<value>205, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -170,18 +170,6 @@
pRGoKQ1/Demn65crriXGl8Qa/m04ZID9IhLW19cfzUyQyylcQxMJroHZt2xqSZKDmvUnSQ1K+gPJDEqW
ifaQpb2kaU8JBieGyEd/EVEIsxv0a2UklWgM/c8WZcPyDxr3/4j2Gkt7itLeQz/HBg1A6H9REOREOFwK
5QAAAABJRU5ErkJggg==
</value>
</data>
<data name="editorButtonImageOptions2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAE3SURB
VDhPpZKxSsRQEEXzG5ba+QHCYuMX+Df6AxIIWKQMiGBSprEQLBYbixSRFNkopNDeRgxaCAsmYZzzyJO3
MeKqAwfe3Ll3svsST0T+xaT4G74Ivu/vKqdRFEkQBAbtH9CYjf1ucFO5SpJEFouFNE0jXdcZOKMxw4N3
ZYEKe8pLnufairwtW7m+e5TDsxvTu4UHLxltPcLbymtd18ZA+Pj8VvaP5oapwkuGLAvmRVEMIzFPtuHv
FlBkyLJg2bbtIIv52essIEP2xwUu7p24Cy7s5VHjv+DCzJbmDsiyYEt5rqrKDMaXaEFjRuElQ9a+xp0w
DCXLMmNwXyNwtmE86n8io+3Kh7SRpqnEcSxlWZqPp+97A2c09eTKJV6b+1xg0eFMOVHulfcBzmizsX+l
+QuT4vqI9wEq0AjdmqGMVgAAAABJRU5ErkJggg==
</value>
</data>
<data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
TsSFCDeivceClient/DowntimeFormAdd.cs
View File

@ -157,7 +157,7 @@ namespace TsSFCDeivceClient
if (view.ShowDialog() == DialogResult.OK)
{
CurrentDeviceInfo = view.CurrentDeviceInfo;
bbtnDevice.EditValue = view.CurrentDeviceInfo.EquipmentName;
bbtnDevice.EditValue = $"{view.CurrentDeviceInfo.EquipmentName}（{CurrentDeviceInfo.EquipmentID}）";
}
}
}

9
TsSFCDeivceClient/pageDeivceView.cs
View File

@ -2,6 +2,7 @@
using DeviceRepair.Models;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using TsSFCDeivceClient.Common;
@ -12,7 +13,7 @@ namespace TsSFCDeivceClient
int m_SelectedCurrentRowIndex = 0;
public DeviceInformationInfo CurrentDeviceInfo = null;
string FilterString
{
get { return txt_Filter.EditValue?.ToString()?.Trim(); }
@ -52,7 +53,11 @@ namespace TsSFCDeivceClient
gridControl1.DataSource = lst;
gridView1.BestFitColumns();
if (lst.Count > 0)
{ CurrentDeviceInfo = lst[0]; gridView1.SelectRow(0); }
{
CurrentDeviceInfo = lst[0]; gridView1.SelectRow(0);
SizeF size = this.CreateGraphics().MeasureString(lst.Count.ToString(), this.Font);
gridView1.IndicatorWidth = Convert.ToInt32(size.Width) + 20;
}
}
catch (Exception ex)
{

1
TsSFCDeivceClient/pageDeivceView.designer.cs generated
View File

@ -120,6 +120,7 @@ namespace TsSFCDeivceClient
this.gcRemarks});
this.gridView1.GridControl = this.gridControl1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsSelection.ShowCheckBoxSelectorInColumnHeader = DevExpress.Utils.DefaultBoolean.False;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// gcEquipmentID

2
TsSFCDeivceClient/pageDeviceMaintenanceFormView.cs
View File

@ -259,7 +259,9 @@ namespace TsSFCDeivceClient
/// </summary>
void InitializeGridViewStyle()
{
// 关闭列头右键菜单
gridView1.OptionsMenu.EnableColumnMenu = false;
gridView1.OptionsSelection.ShowCheckBoxSelectorInColumnHeader = DevExpress.Utils.DefaultBoolean.False;
/// 自增长行号
gridView1.CustomDrawRowIndicator += (s, e) =>

5
TsSFCDeivceClient/pageDeviceMaintenanceFormView.designer.cs generated
View File

@ -29,7 +29,6 @@ namespace TsSFCDeivceClient
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(pageDeviceMaintenanceFormView));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
@ -42,7 +41,7 @@ namespace TsSFCDeivceClient
this.btn_Assessment_QE = new DevExpress.XtraEditors.SimpleButton();
this.btnResumptionConfirm = new DevExpress.XtraEditors.SimpleButton();
this.toolbarFormControl1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormControl();
this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager(this.components);
this.toolbarFormManager1 = new DevExpress.XtraBars.ToolbarForm.ToolbarFormManager();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@ -355,6 +354,8 @@ namespace TsSFCDeivceClient
// gcCreatOn
//
this.gcCreatOn.Caption = "发生时间";
this.gcCreatOn.DisplayFormat.FormatString = "G";
this.gcCreatOn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gcCreatOn.FieldName = "CreatOn";
this.gcCreatOn.MinWidth = 26;
this.gcCreatOn.Name = "gcCreatOn";