|
|
@@ -19,15 +19,14 @@ using System.Windows.Forms;
|
|
|
using XdCxRhDW.App.Api;
|
|
|
using XdCxRhDW.App.EditForms;
|
|
|
using XdCxRhDW.Repostory.Model;
|
|
|
-using System.Windows.Documents;
|
|
|
using XdCxRhDW.Repostory.EFContext;
|
|
|
-using XdCxRhDW.Core.Api;
|
|
|
using XdCxRhDW.WebApi;
|
|
|
using XdCxRhDW.Core.ObServer;
|
|
|
-using DevExpress.XtraBars.Docking2010;
|
|
|
using ExtensionsDev;
|
|
|
using DevExpress.XtraEditors;
|
|
|
using System.Data.Entity.Migrations;
|
|
|
+using System.Threading;
|
|
|
+using System.Threading.Tasks;
|
|
|
namespace XdCxRhDW.App.UserControl
|
|
|
{
|
|
|
public partial class CtrlHome : DevExpress.XtraEditors.XtraUserControl
|
|
|
@@ -40,7 +39,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
InitializeComponent();
|
|
|
gridHomeTask.Init<TaskInfo>().UseFilter();
|
|
|
gridHomePosRes.Init<PosRes>().UseMultiSelect().UseRowNumber().UseFilter();
|
|
|
- //layoutControl1.UseDefault();
|
|
|
+ layoutControl1.UseDefault();
|
|
|
txtStartTime.UseDefault();
|
|
|
txtEndTime.UseDefault();
|
|
|
btnDrawDto.ImageOptions.SvgImage = SvgHelper.LoadFromFile("Image\\DtoLine.svg");
|
|
|
@@ -401,7 +400,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
{
|
|
|
if (e.Clicks > 1)
|
|
|
{
|
|
|
- layoutControlGroup1_CustomButtonClick(null, new BaseButtonEventArgs(new GroupBoxButton() { Caption = "编辑任务" }));
|
|
|
+ layoutControlGroup1_CustomButtonClick(null, new DevExpress.XtraBars.Docking2010.BaseButtonEventArgs(new GroupBoxButton() { Caption = "编辑任务" }));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -508,7 +507,7 @@ namespace XdCxRhDW.App.UserControl
|
|
|
}
|
|
|
popupMenu2.ShowPopup(MousePosition);
|
|
|
}
|
|
|
- private async void layoutControlGroup1_CustomButtonClick(object sender, BaseButtonEventArgs e)
|
|
|
+ private async void layoutControlGroup1_CustomButtonClick(object sender, DevExpress.XtraBars.Docking2010.BaseButtonEventArgs e)
|
|
|
{
|
|
|
var txt = (e.Button as GroupBoxButton).Caption;
|
|
|
if (txt == "新建任务")
|
gongqiuhong