wxr
2023-08-09 10afb4f79299cae08344fd8245a7217ea49f712e
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1055,13 +1055,15 @@
                    case ShowFunction.EnergyMonitoring:
                        #region 能源监测
                        btnName.TextID = StringId.EnergyMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnergyMainPage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        functionPageTitleId = StringId.EnergyMonitoring;
                        //btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        //{
                        //    var skipView = new EnergyMainPage();
                        //    MainPage.BasePageView.AddChidren(skipView);
                        //    skipView.LoadPage();
                        //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        //};
                        #endregion
                        break;
                    case ShowFunction.Environmental:
@@ -1209,7 +1211,7 @@
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item
                    //&& ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item