部分折线图排序反过来，闸门弹窗同步一下

Assets/Prefabs/UI/Item/DeviceTrendPanel.prefab

@@ -3155,11 +3155,11 @@ RectTransform:
   m_Father: {fileID: 1667840818708620048}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &1200496234482989066
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3195,7 +3195,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 5
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -3823,7 +3823,7 @@ RectTransform:
   m_GameObject: {fileID: 1949346720573991501}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8765299047464430318}
@@ -5802,11 +5802,11 @@ RectTransform:
   m_Father: {fileID: 9031848740383064243}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180, y: -109.87065}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7769289343970041079
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -7373,7 +7373,7 @@ RectTransform:
   m_GameObject: {fileID: 4956254469385737896}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 242317745922137852}
@@ -7681,11 +7681,11 @@ RectTransform:
   m_Father: {fileID: 9031848740383064243}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -180, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180, y: -109.87065}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &2259597018190685148
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -8349,7 +8349,7 @@ RectTransform:
   m_GameObject: {fileID: 5864689829131116043}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1968064417834059485}
@@ -8433,11 +8433,11 @@ RectTransform:
   m_Father: {fileID: 2501551284222487091}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &3864669163318432857
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -8473,7 +8473,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -12061,7 +12061,7 @@ RectTransform:
   m_GameObject: {fileID: 8023459192314746382}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2368783322193023375}
@@ -14408,7 +14408,7 @@ RectTransform:
   m_GameObject: {fileID: 8625008902916210074}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7596304292849934902}

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -339,7 +339,7 @@ RectTransform:
   m_GameObject: {fileID: 98101704439024986}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2011568505392299253}
@@ -1434,8 +1434,8 @@ RectTransform:
   - {fileID: 4539934134062061705}
   - {fileID: 5407130569746109302}
   - {fileID: 7283287963694846449}
-  - {fileID: 8336476060578467582}
   - {fileID: 7201364651131919843}
+  - {fileID: 8336476060578467582}
   m_Father: {fileID: 4159492196613629441}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4017,7 +4017,7 @@ RectTransform:
   m_GameObject: {fileID: 1018682726332086638}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2363521364382220086}
@@ -4558,7 +4558,7 @@ RectTransform:
   m_Children:
   - {fileID: 2192685393456587442}
   m_Father: {fileID: 184164574530300879}
-  m_RootOrder: 20
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -4668,7 +4668,7 @@ RectTransform:
   m_GameObject: {fileID: 1291370068834373772}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3186687545242049668}
@@ -6132,7 +6132,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4959076554689168451
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8376,7 +8376,7 @@ RectTransform:
   - {fileID: 3208634214516498791}
   - {fileID: 1471674276014129706}
   m_Father: {fileID: 184164574530300879}
-  m_RootOrder: 21
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13501,7 +13501,7 @@ RectTransform:
   m_GameObject: {fileID: 4915846186393515745}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4763920802070784054}
@@ -21157,7 +21157,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 7625981591886958950}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.81333333
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -22281,7 +22281,7 @@ RectTransform:
   m_GameObject: {fileID: 8132931347846840738}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4241239324658988237}
@@ -22527,7 +22527,7 @@ RectTransform:
   m_GameObject: {fileID: 8206171681512820080}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3521426109737389425}
@@ -22614,7 +22614,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0.81333333}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Scripts/UI/UIView/3D/ZMJKLayer.cs

@@ -210,23 +210,31 @@ public class ZMJKLayer : MonoBehaviour
 
         var shuiweiData = type == 0 ? GlobalData.floorGateData.swzxtBY : GlobalData.floorGateData.swzxtTK;
 
+        var finalData = new CharData_water[shuiweiData.Length]; 
+        
+        for (int i = 0; i < shuiweiData.Length; i++)
+        {
+            finalData[i] = shuiweiData[shuiweiData.Length - 1 - i];
+        }
+
+        
         XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
         tempXaxis.data.Clear();
-        for (int i = 0; i < shuiweiData.Length; i++)
+        for (int i = 0; i < finalData.Length; i++)
         {
-            tempXaxis.AddData(shuiweiData[i].key);
+            tempXaxis.AddData(finalData[i].key);
         }
 
         var tempSeries = shuiweiChart.series;
         tempSeries[0].serieName = "水位/m";
-        SerieData[] tempDatas = new SerieData[shuiweiData.Length];
+        SerieData[] tempDatas = new SerieData[finalData.Length];
         for (int i = 0; i < tempDatas.Length; i++)
         {
             tempDatas[i] = new SerieData();
             tempDatas[i].data = new List<double>();
             tempDatas[i].data.Add(i);
-            string value = shuiweiData[i].value;
-            if (shuiweiData[i].value == "-") {
+            string value = finalData[i].value;
+            if (finalData[i].value == "-") {
                 value = "-1";
             }
             tempDatas[i].data.Add(float.Parse(value));

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

@@ -193,15 +193,22 @@ public class DeviceTrendPanel : MonoBehaviour
             DeviceTrendRequest requestData = JsonConvert.DeserializeObject<DeviceTrendRequest>(jsonStr);
             XAxis tempXaxis = _LineChart.GetChartComponent<XAxis>();
             tempXaxis.data.Clear();
-            for (int i = 0; i < requestData.data.Length; i++)
+
+            var finalData = new DeviceTrendData[requestData.data.Length];
+            for (int i = 0; i < finalData.Length; i++)
+            {
+                finalData[i] = requestData.data[requestData.data.Length - 1 - i];
+            }
+            
+            for (int i = 0; i < finalData.Length; i++)
             {
-                var tempTimeDate = DateTime.ParseExact(requestData.data[i].timeGroup, "yyyy-MM-dd HH:mm:ss",
+                var tempTimeDate = DateTime.ParseExact(finalData[i].timeGroup, "yyyy-MM-dd HH:mm:ss",
                     CultureInfo.InvariantCulture);
                 tempXaxis.AddData(tempTimeDate.ToString("MM-dd"));
             }
             
             var tempSeries = _LineChart.series;
-            SerieData[] tempDatas = new SerieData[requestData.data.Length];
+            SerieData[] tempDatas = new SerieData[finalData.Length];
             
             string typeText = "";
             switch (currentGongChengType)
@@ -253,7 +260,7 @@ public class DeviceTrendPanel : MonoBehaviour
                 tempDatas[i].data = new List<double>();
                 tempDatas[i].data.Add(i);
                 //Debug.Log(requestData.data[i].r1);
-                double tempValue = double.Parse(float.Parse(requestData.data[i].r1).ToString("0.00"));
+                double tempValue = double.Parse(float.Parse(finalData[i].r1).ToString("0.00"));
                 
                 //Debug.Log(tempValue * 100);
                 tempDatas[i].data.Add(tempValue);

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

@@ -1808,22 +1808,29 @@ public class GCJKLayer : YZTRootLayer
 
         var shuiweiData = currentDataType == 0 ? GlobalData.floorGateData.swzxtBY : GlobalData.floorGateData.swzxtTK;
 
+        var finalData = new CharData_water[shuiweiData.Length]; 
+        
+        for (int i = 0; i < shuiweiData.Length; i++)
+        {
+            finalData[i] = shuiweiData[shuiweiData.Length - 1 - i];
+        }
+        
         XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
         tempXaxis.data.Clear();
-        for (int i = 0; i < shuiweiData.Length; i++)
+        for (int i = 0; i < finalData.Length; i++)
         {
-            tempXaxis.AddData(shuiweiData[i].key);
+            tempXaxis.AddData(finalData[i].key);
         }
 
         var tempSeries = shuiweiChart.series;
         tempSeries[0].serieName = "水位";
-        SerieData[] tempDatas = new SerieData[shuiweiData.Length];
+        SerieData[] tempDatas = new SerieData[finalData.Length];
         for (int i = 0; i < tempDatas.Length; i++)
         {
             tempDatas[i] = new SerieData();
             tempDatas[i].data = new List<double>();
             tempDatas[i].data.Add(i);
-            string value = shuiweiData[i].value;
+            string value = finalData[i].value;
             if (value == "-") {
                 value = "-1";
             }