From 4c0b2ce14b299b3409dfee230a052979c2844de4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:17:14 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3accadc..2653cb9 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -725,9 +725,10 @@
break;
case ShowFunction.SecurityCenter:
functionCount = FunctionList.List.securities.Count;
-#if DEBUG
- functionCount = 1;
-#endif
+ //if (DB_ResidenceData.Instance.GatewayType == 1)
+ //{
+ // functionCount = 1;
+ //}
break;
}
@@ -972,7 +973,8 @@
btnName.TextID = StringId.EnvironmentalData;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
- var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
+ //var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
+ var skipView = new A_EnvironmentalDataCenter();// EnvironmentalSciencePage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0