Explorar el Código

111

样式分支
fyf hace 2 años
padre
commit
2ba28db6ac
Se han modificado 3 ficheros con 24 adiciones y 8 borrados
  1. +1
    -1
      BPASmartClient.SCADAControl/NewConveyorBelt.xaml.cs
  2. +21
    -5
      BPASmartClient.SCADAControl/Silos.xaml.cs
  3. +2
    -2
      SCADA.Test/MainWindow.xaml.cs

+ 1
- 1
BPASmartClient.SCADAControl/NewConveyorBelt.xaml.cs Ver fichero

@@ -283,7 +283,7 @@ namespace BPASmartClient.SCADAControl
{
if (EventRunName != MessageNameEnum.Null)
{
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventRunName.ToString()+ Text, "EventRunNameHandler");
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventRunName.ToString(), "EventRunNameHandler");
}
}



+ 21
- 5
BPASmartClient.SCADAControl/Silos.xaml.cs Ver fichero

@@ -41,9 +41,9 @@ namespace BPASmartClient.SCADAControl
this.DataContext = this;
Width = 180;
Height = 270;
Value = "25.23";
Title = "香料";
Text = "1";
//Value = "25.23";
//Title = "香料";
//Text = "1";
this.SizeChanged += Silos_SizeChanged; ;
}
@@ -131,6 +131,22 @@ namespace BPASmartClient.SCADAControl
#endregion

#region 属性
//private string _变量;
//public string ym_value
//{
// get
// {
// return _变量;
// }
// set
// {
// if (_变量 == value)
// return;
// _变量 = value;
// OnPropertyChanged("ym_value");
// }
//}

[Category("值设定")]
public string Value
{
@@ -240,8 +256,8 @@ namespace BPASmartClient.SCADAControl
{
if (EventRunName != MessageNameEnum.Null)
{
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventRunName.ToString()+ Text, "EventRunNameHandler");
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventDataName.ToString() + Text, "EventDataNameHandler");
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventRunName.ToString(), "EventRunNameHandler");
Class_InnerMessageBus.GetInstance().ListenMessage(this, EventDataName.ToString(), "EventDataNameHandler");
}
}



+ 2
- 2
SCADA.Test/MainWindow.xaml.cs Ver fichero

@@ -93,7 +93,7 @@ namespace SCADA.Test
RunEnumModel runEnumModel = new RunEnumModel();
runEnumModel.Run = ToEnumValue<RunEnum>(xx.Text);
runEnumModel.ID = hm.Text;
Class_InnerMessageBus.GetInstance().PostMessage(this, mlname.Text+ runEnumModel.ID, runEnumModel);
Class_InnerMessageBus.GetInstance().PostMessage(this, mlname.Text, runEnumModel);
}

/// <summary>
@@ -130,7 +130,7 @@ namespace SCADA.Test
silosMessage.id= ch.Text;
silosMessage.Value = zl.Text;
silosMessage.Title = bt.Text;
Class_InnerMessageBus.GetInstance().PostMessage(this, xxnc.Text+ ch.Text, silosMessage);
Class_InnerMessageBus.GetInstance().PostMessage(this, xxnc.Text, silosMessage);

}
}


Cargando…
Cancelar
Guardar