From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 11 十一月 2022 13:54:15 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into wjc --- HDL_ON/Entity/FunctionList.cs | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs index c1b9c0c..8ca1efc 100644 --- a/HDL_ON/Entity/FunctionList.cs +++ b/HDL_ON/Entity/FunctionList.cs @@ -39,6 +39,14 @@ /// 鍔熻兘鍒楄〃 /// </summary> public List<Function> Functions = new List<Function>(); + /// <summary> + /// 鏈烘鑷傚垪琛� + /// </summary> + /// <returns></returns> + public List<Function> GetMechanicalArmList() + { + return Functions.FindAll((obj) => obj.spk == SPK.MechanicalArm); + } /// <summary> /// 缁垮缓绉戞妧绯荤粺 @@ -126,16 +134,17 @@ /// <summary> /// 鍏変紡鍒楄〃 /// </summary> - public List<InverterInfo> InverterList + public List<Function> InverterList() { - get - { - return _inverterList; - } - set - { - _inverterList = value; - } + //get + //{ + // return _inverterList; + //} + //set + //{ + // _inverterList = value; + //} + return Functions.FindAll((obj) => obj.spk == SPK.Inverter); } #region 瀹剁數鍒楄〃 electricals /// <summary> -- Gitblit v1.8.0