From 6fcff08e4f76bce6076319b5b3a2456c2d94c5fe Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 26 十一月 2024 09:19:00 +0800
Subject: [PATCH] 提交成套设备界面修改
---
Desktop/HStation.Desktop.PBS.Core/MainForm.cs | 53 ++++++++++++++++++++++-------------------------------
1 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/Desktop/HStation.Desktop.PBS.Core/MainForm.cs b/Desktop/HStation.Desktop.PBS.Core/MainForm.cs
index 6387e7f..9ddd54b 100644
--- a/Desktop/HStation.Desktop.PBS.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.PBS.Core/MainForm.cs
@@ -3,6 +3,7 @@
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
+using HStation.WinFrmUI.PBS;
using System.IO;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
@@ -67,7 +68,7 @@
{
this.Close();
}
-
+
//功能点击事件
private void tileNavPane_ElementClick(object sender, NavElementEventArgs e)
{
@@ -84,8 +85,8 @@
private Control _place_mgr_ctrl = null;//场所管理弹出界面
private Control _equivalent_mgr_ctrl = null;//当量管理弹出界面
- private Control _asste_mgr_ctrl = null;//产品管理弹出界面
- private Control _system_config_ctrl = null;//系统配置弹出界面
+ private Control _asste_mgr_ctrl = null;//产品管理弹出界面
+ private Control _system_config_ctrl = null;//系统配置弹出界面
private Control _auth_config_ctrl = null;//权限配置弹出界面
//首页
@@ -99,7 +100,6 @@
};
if (!IsExistPage(guid, true))
{
-
}
}
@@ -128,7 +128,8 @@
};
if(!IsExistPage(guid,true))
{
-
+ var page=new Yw.WinFrmUI.DivisionMainPage();
+ CreatePage(page,guid);
}
}
},
@@ -141,12 +142,13 @@
var guid=new PageGuid(){
Modular="Place",
MoudingType=eMoudingType.Tab,
- Function="PlaceBuildMgr",
+ Function="PlaceMgr",
};
if(!IsExistPage(guid,true))
{
-
- }
+ var page=new Yw.WinFrmUI.BuildingTypeMgr();
+ CreatePage(page,guid);
+ }
}
},
new TilePeekItem(){
@@ -158,11 +160,10 @@
var guid=new PageGuid(){
Modular="Place",
MoudingType=eMoudingType.Tab,
- Function="PlaceFacilityMgr",
+ Function="FacilityMgr",
};
if(!IsExistPage(guid,true))
{
-
}
}
},
@@ -179,8 +180,9 @@
};
if(!IsExistPage(guid,true))
{
-
- }
+ var page=new Yw.WinFrmUI.PartitionMgr();
+ CreatePage(page,guid);
+ }
}
},
};
@@ -192,11 +194,10 @@
this.flyoutPanelControl1.Controls.Add(_place_mgr_ctrl);
var rectangle = this.RectangleToScreen(hit_info.ButtonInfo.Bounds);
this.flyoutPanel1.ShowBeakForm(rectangle);
-
}
//当量管理
- private void nbEquivalentMgr_ElementClick(object sender, NavElementEventArgs e)
+ private void nbWEMgr_ElementClick(object sender, NavElementEventArgs e)
{
var pt = this.tileNavPane.PointToClient(MousePosition);
var hit_info = this.tileNavPane.CalcHitInfo(pt);
@@ -214,13 +215,12 @@
Click=()=>{
this.flyoutPanel1.HideBeakForm();
var guid=new PageGuid(){
- Modular="Equivalent",
+ Modular="WE",
MoudingType=eMoudingType.Tab,
Function="WaterUtensilMgr",
};
if(!IsExistPage(guid,true))
{
-
}
}
},
@@ -231,13 +231,12 @@
Click=()=>{
this.flyoutPanel1.HideBeakForm();
var guid=new PageGuid(){
- Modular="Equivalent",
+ Modular="WE",
MoudingType=eMoudingType.Tab,
- Function="WaterEquivalentMgr",
+ Function="WaterWEMgr",
};
if(!IsExistPage(guid,true))
{
-
}
}
}
@@ -276,7 +275,6 @@
};
if(!IsExistPage(guid,true))
{
-
}
}
},
@@ -293,7 +291,6 @@
};
if(!IsExistPage(guid,true))
{
-
}
}
},
@@ -310,7 +307,6 @@
};
if(!IsExistPage(guid,true))
{
-
}
}
}
@@ -322,7 +318,6 @@
this.flyoutPanelControl1.Controls.Add(_asste_mgr_ctrl);
var rectangle = this.RectangleToScreen(hit_info.ButtonInfo.Bounds);
this.flyoutPanel1.ShowBeakForm(rectangle);
-
}
//系统配置
@@ -365,7 +360,6 @@
};
if(!IsExistPage(guid,true))
{
-
}
}
}, new TilePeekItem(){
@@ -408,7 +402,6 @@
this.flyoutPanelControl1.Controls.Add(_system_config_ctrl);
var rectangle = this.RectangleToScreen(hit_info.ButtonInfo.Bounds);
this.flyoutPanel1.ShowBeakForm(rectangle);
-
}
//权限配置
@@ -434,7 +427,7 @@
Function="RoleMgr",
};
if(!IsExistPage(guid,true))
- {
+ {
}
}
},
@@ -450,7 +443,7 @@
Function="UserMgr",
};
if(!IsExistPage(guid,true))
- {
+ {
}
}
},
@@ -466,7 +459,7 @@
Function="MenuMgr",
};
if(!IsExistPage(guid,true))
- {
+ {
}
}
},
@@ -481,7 +474,7 @@
}
}
- #endregion
+ #endregion Menu
#endregion TileNavPane 相关处理
@@ -896,7 +889,5 @@
}
this.tabbedView1.DocumentGroupProperties.ShowTabHeader = !this.tabbedView1.DocumentGroupProperties.ShowTabHeader;
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3