Browse Source

调整实时 chart不展示数据问题

jiangjy 3 weeks ago
parent
commit
94e092fd88

+ 22 - 6
FrameworkLocal/UIClient/CenterViews/Operations/RealTime/RealTimeViewModel.cs

@@ -49,7 +49,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
         #endregion
 
         #region Constructors
-
+        private static Dictionary<string, string> _displayDic { get; set; } = new Dictionary<string, string>();
         public RealtimeViewModel()
         {
             DisplayName = "Realtime";
@@ -62,7 +62,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
 
             ParameterNodes.ChildNodes.AddRange(_provider.GetTreeNodeParameters());
             ParameterNodes.TerminalNodeSelectionChanged += OnNodeSelectionChanged;
-
+            _displayDic = _provider.GetTreeNameDict();
             IntervalSaved = true;
             TrendInterval = 500;
             TimeSpanSaved = true;
@@ -139,10 +139,16 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
         {
             try
             {
-                Dictionary<string, object> data = null;
-                if (!IsHold&&SelectedData.Count > 0)
+                Dictionary<string, object> data = new Dictionary<string, object>();
+                if (!IsHold && SelectedData.Count > 0)
                 {
-                    data = QueryDataClient.Instance.Service.PollData(SelectedData.Select(r => (r as FastLineSeries)?.DataName).ToList());
+                    var rtData = QueryDataClient.Instance.Service.PollData(SelectedData.Select(r => FindKeyByValue(_displayDic, (r as FastLineSeries)?.DataName)).ToList());
+
+                    foreach (var item in rtData)
+                    {
+                        var uiName = _displayDic[item.Key];
+                        data.Add(uiName, item.Value);
+                    }
                     AppendData(data);
                 }
                 for (var j = 0; j < ParameterNodes.ChildNodes.Count; j++)
@@ -158,7 +164,17 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.RealTime
 
             return true;
         }
-
+        static string FindKeyByValue(Dictionary<string, string> dictionary, string value)
+        {
+            foreach (var pair in dictionary)
+            {
+                if (pair.Value == value)
+                {
+                    return pair.Key;
+                }
+            }
+            return null; // Return null if the value is not found
+        }
         public void AppendData(Dictionary<string, object> data)
         {
             if (data == null)

+ 9 - 8
Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -429,9 +429,10 @@
 					doFIMS2Interlock="DO_WaferRobotFIMS2Interlock"
 					doBoatRotateInterlock="DO_WaferRobotBoatRotaryInterlock"
 					doBoatBottomInterlock="DO_WaferRobotBoatBottomInterlock"
-					
-					scRootPath=""
-	    />
+			        aoRobotActionCommand="AO_WaferRobotActionCommand"
+			        aiRobotActionCommand="AI_WaferRobotActionCommand"
+			scRootPath=""
+			/>
 	</IoWaferRobots>
 	<IoCarrierRobots classType="FurnaceRT.Devices.IoCarrierRobot" assembly="FurnaceRT">
 		<IoCarrierRobot id="IoCarrierRobot" display="IoCarrierRobot" schematicId="IoCarrierRobot" unit=""
@@ -447,21 +448,21 @@
 					diRobotPowerOn="DI_FOUPRobotFoupOnRobotCheck"
 					diAlarm="DI_FOUPRobotAlarmSignal"
 					diBlade1WaferPresent="DI_FOUPRobotEachHandWaferStatus"
-				 
 					diZAxisHomePosition="DI_FOUPRobotAxisZHomePosition"
 					diYAxisHomePosition="DI_FOUPRobotAxisYHomePosition"
 					diRAxisHomePosition="DI_FOUPRobotAxisRHomePosition"
 					diRunning="DI_FOUPRobotRunning"
-
 					doAlarmReset="DO_FOUPRobotAlarmReset"
 					doActionHold="DO_FOUPRobotActionHold"
 					doTPEnable="DO_FOUPRobotTPEnable"
 					doFIMS1Interlock="DO_FOUPRobotFIMS1Interlock"
 					doFIMS2Interlock="DO_FOUPRobotFIMS2Interlock"
 					doStockerInterlock="DO_FOUPRobotBufferInterlock"
-					
-					scRootPath=""
-	    />
+				    aoRobotActionCommand="AO_FOUPRobotActionCommand"
+				    aiRobotActionCommand="AI_FOUPRobotActionCommand"
+
+			scRootPath=""
+			/>
 	</IoCarrierRobots>
 
 	<IoStockers classType="FurnaceRT.Devices.IoStocker" assembly="FurnaceRT">