From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 430 +++++++---------------------------------------------
1 files changed, 63 insertions(+), 367 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index cf197b4..2d42e5d 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -5,7 +5,6 @@
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Assets;
-using HStation.WinFrmUI.Auth.Core._02_User;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
@@ -195,7 +194,6 @@
}
private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面
-
private Control _SystemConfigCtrl = null;//系统配置弹出界面
@@ -561,6 +559,7 @@
this.flyoutPanel1.ShowBeakForm(rectangle);
}
}
+
private TileControl _assetsMgrCtrl = null;//资产管理控件
//系统配置
@@ -697,11 +696,11 @@
var guid=new PageGuid(){
Modular="Auth",
MoudingType=eMoudingType.Tab,
- Function="UserManageMgr",
+ Function="RoleManageMgr",
};
if(!IsExistPage(guid,true))
{
- var page=new UserMgrMainPanel();
+ var page=new RoleMgrPage();
CreatePage(page,guid);
}
}
@@ -715,11 +714,11 @@
var guid=new PageGuid(){
Modular="Auth",
MoudingType=eMoudingType.Tab,
- Function="ValveMgr",
+ Function="UserMgr",
};
if(!IsExistPage(guid,true))
{
- var page=new ValveManageMainPage();
+ var page=new UserMgrPage();
CreatePage(page,guid);
}
}
@@ -737,11 +736,11 @@
};
if(!IsExistPage(guid,true))
{
- var page=new SysTypeManageMainPanel();
+ var page=new MenuMgrPage();
CreatePage(page,guid);
}
}
- }, new TilePeekItem(){
+ }, /*new TilePeekItem(){
Caption="测试导出",
SvgImage=svgImg32Model[2],
SvgImageSize=new Size(24,24),
@@ -755,6 +754,25 @@
if(!IsExistPage(guid,true))
{
var page=new test();
+ CreatePage(page,guid);
+ }
+ }
+ },*/
+
+ new TilePeekItem(){
+ Caption="角色菜单",
+ SvgImage=svgImg32Model[2],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Auth",
+ MoudingType=eMoudingType.Tab,
+ Function="RoleMenu",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new RoleProjectMenuPage();
CreatePage(page,guid);
}
}
@@ -922,7 +940,6 @@
peekTranslation.Tag = AssetsFunctionHelper.TranslationMgr;
list.Add(peekTranslation);
-
//水泵
var peekPump = new TilePeekItem();
peekPump.Id = AssetsFunctionHelper.PumpMgr;
@@ -969,349 +986,7 @@
peekCompressor.Tag = AssetsFunctionHelper.CompressorMgr;
peekResistance.Children.Add(peekCompressor);
-
return list;
-
- var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
- {
- new TilePeekItem(){
- Caption="水泵管理",
- SvgImage=svgImg32Model[18],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="pumpMgr",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new PumpProductMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="阀门管理",
- SvgImage=svgImg32Model[17],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="ValveMgr",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new ValveManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="连接件",
- SvgImage=svgImg32Model[18],
- SvgImageSize=new Size(24,24)
- },
- new TilePeekItem(){
- Caption="弯头管理",
- SvgImage=svgImg32Model[15],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Elbow",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new ElbowManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="三通管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="ThreeLink",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new ThreeLinkManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="喷头管理",
- SvgImage=svgImg32Model[19],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Sprinkler",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new SprinklerManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="四通管理",
- SvgImage=svgImg32Model[14],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="FourLink",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new FourLinkManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="厂商管理",
- SvgImage=svgImg32Model[16],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="AssetsManufacturerMainPanel",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new AssetsManufacturerMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="管道管理",
- SvgImage=svgImg32Model[11],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="PipeLineMgr",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new PipeManageMainPage();
- CreatePage(page,guid);
- }
- }
- }, new TilePeekItem(){
- Caption="换热器管理",
- SvgImage=svgImg32Model[13],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="ExchangerMgr",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new ExchangerManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="空压机管理",
- SvgImage=svgImg32Model[12],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="CompressorMgr",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new CompressorManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="成套设备",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Equipment",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new PackageManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="闷头管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Blunthead",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new BluntheadManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="水池管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Tank",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new TankManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="水表管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Meter",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new MeterManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="流量计管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Flowmeter",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new FlowmeterManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="消火栓管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Hydrant",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new HydrantManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="压力表管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Pressmeter",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new PressmeterManageMainPage();
- CreatePage(page,guid);
- }
- }
- },new TilePeekItem(){
- Caption="过渡件管理",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Translation",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new TranslationManageMainPage();
- CreatePage(page,guid);
- }
- }
- },
- new TilePeekItem(){
- Caption="冷却塔",
- SvgImage=svgImg32Model[10],
- SvgImageSize=new Size(24,24),
- Click=()=>{
- this.flyoutPanel1.HideBeakForm();
- var guid=new PageGuid(){
- Modular="Asstes",
- MoudingType=eMoudingType.Tab,
- Function="Cooling",
- };
- if(!IsExistPage(guid,true))
- {
- var page=new AssetsCoolingMgrPage();
- CreatePage(page,guid);
- }
- }
- },
- };
}
//点击Peek
@@ -1337,6 +1012,7 @@
this.flyoutPanel2.ShowBeakForm(rectangle);
}
break;
+
case AssetsFunctionHelper.EmitterMgr:
{
var pt = _assetsMgrCtrl.PointToClient(MousePosition);
@@ -1349,6 +1025,7 @@
this.flyoutPanel2.ShowBeakForm(rectangle);
}
break;
+
case AssetsFunctionHelper.InstrumentMgr:
{
var pt = _assetsMgrCtrl.PointToClient(MousePosition);
@@ -1361,6 +1038,7 @@
this.flyoutPanel2.ShowBeakForm(rectangle);
}
break;
+
case AssetsFunctionHelper.ResistanceMgr:
{
var pt = _assetsMgrCtrl.PointToClient(MousePosition);
@@ -1373,6 +1051,7 @@
this.flyoutPanel2.ShowBeakForm(rectangle);
}
break;
+
case AssetsFunctionHelper.TankMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1384,11 +1063,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new TankManageMainPage();
+ var page = new AssetsTankMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.BluntheadMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1400,11 +1080,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new BluntheadManageMainPage();
+ var page = new AssetsBluntheadMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.ElbowMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1416,11 +1097,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new ElbowManageMainPage();
+ var page = new AssetsElbowMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.ThreelinkMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1432,11 +1114,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new ThreeLinkManageMainPage();
+ var page = new AssetsThreelinkMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.FourlinkMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1448,11 +1131,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new FourLinkManageMainPage();
+ var page = new AssetsFourlinkMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.NozzleMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1464,11 +1148,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new SprinklerManageMainPage();
+ var page = new AssetsSprinklerMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.HydrantMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1480,11 +1165,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new HydrantManageMainPage();
+ var page = new AssetsHydrantMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.CoolingMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1501,6 +1187,7 @@
}
}
break;
+
case AssetsFunctionHelper.MeterMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1512,11 +1199,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new MeterManageMainPage();
+ var page = new AssetsMeterMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.FlowmeterMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1528,11 +1216,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new FlowmeterManageMainPage();
+ var page = new AssetsFlowmeterMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.PressmeterMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1544,11 +1233,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new PressmeterManageMainPage();
+ var page = new AssetsPressmeterMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.PipeMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1560,11 +1250,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new PipeManageMainPage();
+ var page = new AssetsPipeMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.TranslationMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1576,11 +1267,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new TranslationManageMainPage();
+ var page = new AssetsTranslationMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.PumpMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1597,6 +1289,7 @@
}
}
break;
+
case AssetsFunctionHelper.ValveMgr:
{
this.flyoutPanel1.HideBeakForm();
@@ -1608,11 +1301,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new ValveManageMainPage();
+ var page = new AssetsValveMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.ExchangerMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1624,11 +1318,12 @@
};
if (!IsExistPage(guid, true))
{
- var page = new ExchangerManageMainPage();
+ var page = new AssetsExchangerMgrPage();
CreatePage(page, guid);
}
}
break;
+
case AssetsFunctionHelper.CompressorMgr:
{
this.flyoutPanel2.HideBeakForm();
@@ -1640,16 +1335,17 @@
};
if (!IsExistPage(guid, true))
{
- var page = new CompressorManageMainPage();
+ var page = new AssetsCompressorMgrPage();
CreatePage(page, guid);
}
}
break;
+
default: break;
}
}
- #endregion
+ #endregion TileNavPane 相关处理
#region 窗体事件
--
Gitblit v1.9.3