diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs index 7be5a8d..11f896e 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/HslControlsEntity.cs @@ -108,6 +108,9 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public HslLanternSimple DryDpause { get; set; } public HslLanternSimple DryDready { get; set; } + + public HslLanternSimple HslCaiJi { get; set; } + //daybin1 public HslLanternSimple DayBin1 { get; set; } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 677bc3b..fad46a3 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -416,6 +416,20 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl + + + var hslCaiji = HslLanternSimpleE.HslCaiJi; + var b = UserJudge.IsSettingNormalUser; + if (b) + { + hslCaiji.LanternBackground = Color.Lime; + } + else + { + hslCaiji.LanternBackground = Color.Gray; + } + + SetHslLanternSimple9(HslLanternSimpleE.DayBin1, dB2108.Daybin1); SetHslLanternSimple9(HslLanternSimpleE.DayBin2, dB2108.Daybin2); SetHslLanternSimple9(HslLanternSimpleE.DayBin3, dB2108.Daybin3); diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs index 2689cb0..c5b9b5a 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Util/UserJudge.cs @@ -27,8 +27,10 @@ namespace Mesnac.Action.ChemicalWeighing.Util return false; } } + - + + // public static bool IsSettingNormalUser diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index de1ef87..6362bf7 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -1,6 +1,32 @@ + + 1871, 55 + HslCaiJi + 15, 17 + + + + + Red + DarkGray + + + False + + + + None + True + True + 报表采集指示灯 + 宋体, 9pt + ButtonHighlight + 1808, 37 + MCLabel267 + 89, 12 + @@ -7629,7 +7655,7 @@ 46, 872 AlarmMoveText - 1735, 28 + 1742, 28 1764, 800 diff --git a/Main/MCRun/App.config b/Main/MCRun/App.config index 3e0d4fd..fe23815 100644 --- a/Main/MCRun/App.config +++ b/Main/MCRun/App.config @@ -4,9 +4,7 @@
- - - +