提交提交

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -352,6 +352,7 @@ public class GCJKLayer : YZTRootLayer
     {
         currentDataType = 2;
         SetCurrentDataToEmpty(namePri);
+        SetGongChengLieBiaoData();
         SetZhaZhanJianKongData();
     }
 
@@ -952,7 +953,7 @@ public class GCJKLayer : YZTRootLayer
             tempSensorData = GlobalData.taoKouSensorData.data;
         }
 
-        Debug.Log(tempSensorData.Count);
+        //Debug.Log(tempSensorData.Count);
         for (int i = 0; i < tempSensorData.Count; i++)
         {
             datas.Add(new ZhaZhanJianKongData()
@@ -1027,7 +1028,18 @@ public class GCJKLayer : YZTRootLayer
     {
         _DevivesDatas.Clear();
 
-        string stationName = currentDataType == 0 ? "补元" : "套口";
+        string stationName = "";
+        if (currentDataType == 0)
+        {
+            stationName = "补元";
+        }
+        else if (currentDataType == 1)
+        {
+            stationName = "套口";
+        }
+        else {
+            stationName = "";
+        }
         foreach (var devicesData in GlobalData._devicesIdDatas.Values)
         {
             if (devicesData.stationName.Equals(stationName))
@@ -1079,17 +1091,20 @@ public class GCJKLayer : YZTRootLayer
                 _DevivesDatas.Add(tempLieBiaoData);
             }
         }
-        
-        //监控
-        foreach (var tempData in currentDataType == 0 ? GlobalData.obsDatas_by : GlobalData.obsDatas_tk)
-        {
-            GongChengLieBiaoData tempLieBiaoData = new GongChengLieBiaoData();
-            tempLieBiaoData.name = tempData.name;
-            tempLieBiaoData.type = GongChengType.shiPin;
-            tempLieBiaoData.state = tempData.status ? GongChengState.normal : GongChengState.warning;
-            tempLieBiaoData.sid = "";
-            tempLieBiaoData.gid = ""; //监控没有这玩意
-            _DevivesDatas.Add(tempLieBiaoData);
+
+        if (currentDataType < 2)
+        {
+            //监控
+            foreach (var tempData in currentDataType == 0 ? GlobalData.obsDatas_by : GlobalData.obsDatas_tk)
+            {
+                GongChengLieBiaoData tempLieBiaoData = new GongChengLieBiaoData();
+                tempLieBiaoData.name = tempData.name;
+                tempLieBiaoData.type = GongChengType.shiPin;
+                tempLieBiaoData.state = tempData.status ? GongChengState.normal : GongChengState.warning;
+                tempLieBiaoData.sid = "";
+                tempLieBiaoData.gid = ""; //监控没有这玩意
+                _DevivesDatas.Add(tempLieBiaoData);
+            }
         }
 
         GClist_QuanBuButton.GetComponentInChildren<Text>().color = Color.white;