From 44aa189d9e01f8c0d19e00e44f1ef419ff2cc093 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 08 十二月 2022 22:36:38 +0800
Subject: [PATCH] 2022年12月08日22:36:36
---
HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs | 10 +++++++++-
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
index e826f65..85ff3c3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -244,12 +244,20 @@
var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
///鑾峰彇璁惧鍗曚釜灏忕被鍒楄〃锛堜緥濡傦細鐏厜1,鐏厜2...锛�
var lists = LogicMethod.Current.GetShowDeviceList(typeFunctionList, deviceList);
+ if (string.IsNullOrEmpty(UserInfo.Current.logicselectedRoom.roomName))
+ {
+ UserInfo.Current.logicselectedRoom.roomName = Language.StringByID(StringId.allAreas);
+ }
///鎴块棿鍚嶇О
funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;
+ if (string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction))
+ {
+ UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
+ }
///璁惧澶х被鍚嶇О<鐏厜绫汇�傘�傘�傘�傘��>
funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
this.LoadingDeviceListView(vv, lists);
-
+
}
/// <summary>
/// 鏄剧ず璁惧鐨刅iew
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 36ba961..4930ec3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -2594,7 +2594,7 @@
break;
case "pm10":
{
- ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm25, indexVulae, true, stateValue);
+ ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
}
break;
case "pm25":
--
Gitblit v1.8.0