HStation/XHS.V1.0.git

			@@ -10,7 +10,6 @@
			using HStation.WinFrmUI.Assets;
			using HStation.WinFrmUI.Basic;
			using HStation.WinFrmUI.Dict;
			using IBox.WinFrmUI;
			using PBS.WinFrmUI;
			using PBS.WinFrmUI.Box;
			using PBS.WinFrmUI.DataAnalysis;
			@@ -622,10 +621,6 @@
			ctrl_ele.OwnerElement.Expanded = true;
			this.accordionControlFunction.Refresh();
			}
			//if (!IsExistPage(pguid, true))
			//{
			// ele.Click.Invoke();
			//}
			return true;
			}
			else
			@@ -766,7 +761,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "AssetsCouplingMgr",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[41], new Size(18, 18), (caption, guid, svg, size) =>
			{
			});
			coupling.Elements = new List<AccordionElement>()
			@@ -776,7 +771,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "AssetsBluntheadMgr",
			}, svgImgItem32[8], new Size(18, 18), (caption,guid,svg,size) =>
			}, svgImgItem32[43], new Size(18, 18), (caption,guid,svg,size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -846,7 +841,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "AssetsEmitterMgr",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[37], new Size(18, 18), (caption, guid, svg, size) =>
			{
			});
			emitter.Elements = new List<AccordionElement>()
			@@ -1020,7 +1015,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "waterSupplySource",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[40], new Size(18, 18), (caption, guid, svg, size) =>
			{
			});
			waterSupplySource.Elements = new List<AccordionElement>()
			@@ -1030,7 +1025,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "AssetsTankMgr",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[39], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1053,7 +1048,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "waterSupply",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[38], new Size(18, 18), (caption, guid, svg, size) =>
			{
			});
			waterSupply.Elements = new List<AccordionElement>()
			@@ -1101,7 +1096,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "FacilityNetwork",
			}, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImgItem32[36], new Size(18, 18), (caption, guid, svg, size) =>
			{
			});
			FacilityNetwork.Elements = new List<AccordionElement>()
			@@ -1128,7 +1123,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "AssetsValveMgr",
			}, svgImgItem32[7], new Size(18, 18), (caption,guid,svg,size) =>
			}, svgImgItem32[42], new Size(18, 18), (caption,guid,svg,size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1178,18 +1173,35 @@
			{
			if (!IsExistPage(guid, true))
			{
			/* var page = new DocumentPage();
			var page=new AssetsManufacturerMainPage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);*/
			CreatePage(page,guid);
			}
			}),
			waterSupplySource,
			waterSupply,
			FacilityNetwork,
			Instrument,
			Get("供水设备",new PageGuid()
			{
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "WaterEquipmentMgr",
			}, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page=new WaterEquipmentMgr();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page,guid);
			}
			}),
			}
			};

			@@ -1291,7 +1303,7 @@
			Modular = "BasicData",
			MoudingType = eMoudingType.Tab,
			Function = "ElecPriceMgr",
			}, svgImgItem32[12], new Size(18, 18), (caption,guid,svg,size) =>
			}, svgImgItem32[44], new Size(18, 18), (caption,guid,svg,size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1303,7 +1315,7 @@
			CreatePage(page,guid);
			}
			}),
			}
			}
			};

			var auth_config_ele = new AccordionElement()
			@@ -1425,78 +1437,6 @@

			case "ModelManage":
			{
			var hydraulicScenario = Get("水力场景", new PageGuid()
			{
			Modular = "ModelManage",
			MoudingType = eMoudingType.Tab,
			Function = " ",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			//var page = new HydroSceneMgrPage();
			//page.PageGuid = guid;
			//page.PageTitle.Caption = caption;
			//page.PageTitle.HeaderSvgImage = svg;
			//page.PageTitle.SvgImageSize = size;
			//CreatePage(page, guid);
			}
			});
			var modelTemplate = Get("模型模版", new PageGuid()
			{
			Modular = "ModelManage",
			MoudingType = eMoudingType.Tab,
			Function = "ModelTemplate",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new ModelTemplatePage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			});
			var rapidModeling = Get("快速建模", new PageGuid()
			{
			Modular = "ModelManage",
			MoudingType = eMoudingType.Tab,
			Function = "QuickModeling",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new QuickModelingPage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			});
			var modelEdit = Get("模型编辑", new PageGuid()
			{
			Modular = "ModelManage",
			MoudingType = eMoudingType.Tab,
			Function = "ModelEdit",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new ModelEditPage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			});
			list.Add(hydraulicScenario);
			list.Add(modelTemplate);
			list.Add(rapidModeling);
			list.Add(modelEdit);
			}
			break;

			@@ -1571,7 +1511,7 @@
			Modular = "DataAnalysis",
			MoudingType = eMoudingType.Tab,
			Function = "EnergyAnalysis",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImageIBox[14], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1588,7 +1528,7 @@
			Modular = "DataAnalysis",
			MoudingType = eMoudingType.Tab,
			Function = "FlowPressAnalysis",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImageIBox[13], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1606,7 +1546,7 @@
			Modular = "DataAnalysis",
			MoudingType = eMoudingType.Tab,
			Function = "EndPressAnalysis",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImageIBox[12], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1760,7 +1700,7 @@
			CreatePage(page, guid);
			}
			}),
			Get("数据处理", new PageGuid()
			Get("数据处理", new PageGuid()
			{
			Modular = "SmartHardware",
			MoudingType = eMoudingType.Tab,
			@@ -1793,7 +1733,8 @@
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			}),/*Get("智控数据", new PageGuid()
			}),
			/*Get("智控数据", new PageGuid()
			{
			Modular = "SmartHardware",
			MoudingType = eMoudingType.Tab,
			@@ -1830,7 +1771,7 @@
			{
			}
			})*/
			Get("基础信息", new PageGuid()
			Get("基础信息", new PageGuid()
			{
			Modular = "SmartHardware",
			MoudingType = eMoudingType.Tab,
			@@ -1892,7 +1833,7 @@
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = "MapInfo",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			}, svgImageHome[7], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			@@ -1904,7 +1845,159 @@
			CreatePage(page, guid);
			}
			}, true);

			var accordionElement_ModelManagement = new AccordionElement()
			{
			Id = "Home",
			Caption = "模型管理",
			SvgImage = svgImageHome[3],
			SvgImageSize = new Size(24, 24),
			AllowGlyphSkinning = true,
			Elements = new List<AccordionElement>()
			{
			Get("水力场景", new PageGuid()
			{
			Modular = "ModelManage",
			MoudingType = eMoudingType.Tab,
			Function = " ",
			}, svgImageHome[8], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			//var page = new HydroSceneMgrPage();
			//page.PageGuid = guid;
			//page.PageTitle.Caption = caption;
			//page.PageTitle.HeaderSvgImage = svg;
			//page.PageTitle.SvgImageSize = size;
			//CreatePage(page, guid);
			}
			}),
			Get("模型模版", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = "ModelTemplate",
			}, svgImageHome[2], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new ModelTemplatePage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			}),
			Get("快速建模", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = "QuickModeling",
			}, svgImageHome[1], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new QuickModelingPage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			}),
			Get("模型编辑", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = "ModelEdit",
			}, svgImageHome[0], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new ModelEditPage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			})
			}
			};

			var accordionElement_WaterSupplyAnalysic = new AccordionElement()
			{
			Id = "WaterSupplyAnalysis",
			Caption = "供水分析",
			SvgImage = svgImageHome[6],
			SvgImageSize = new Size(24, 24),
			AllowGlyphSkinning = true,
			Elements = new List<AccordionElement>()
			{
			Get("系统曲线", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = " ",
			}, svgImageHome[9], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new SystemCurvePage();
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			}),
			Get("水量预测", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = " ",
			}, svgImageHome[5], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			}
			}),
			Get("运行评估", new PageGuid()
			{
			Modular = "Home",
			MoudingType = eMoudingType.Tab,
			Function = " ",
			}, svgImageHome[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			}
			})
			}
			};
			/* AccordionElement accordionElement_test = new();
			accordionElement_test = Get("test", new PageGuid()
			{
			Modular = "Test",
			MoudingType = eMoudingType.Tab,
			Function = "MapInfo",
			}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
			{
			if (!IsExistPage(guid, true))
			{
			var page = new IBox.WinFrmUI.IBoxFormControll(new Vmo.IBoxControllViewModel());
			page.PageGuid = guid;
			page.PageTitle.Caption = caption;
			page.PageTitle.HeaderSvgImage = svg;
			page.PageTitle.SvgImageSize = size;
			CreatePage(page, guid);
			}
			}, true);*/
			list.Add(accordionElement_Home);
			// list.Add(accordionElement_test);
			list.Add(accordionElement_WaterSupplyAnalysic);
			list.Add(accordionElement_ModelManagement);
			}
			break;