水位预警折线图更新接口

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -30200,7 +30200,7 @@ RectTransform:
   m_GameObject: {fileID: 2246175357863787059}
   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: 2217816529420374952}
@@ -30484,7 +30484,7 @@ RectTransform:
   m_GameObject: {fileID: 2300679869464258242}
   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: 498209178527190446}
@@ -34343,11 +34343,9 @@ MonoBehaviour:
   m_Value: 0
   m_Options:
     m_Options:
-    - m_Text: "\u6700\u8FD16\u4E2A\u6708"
-      m_Image: {fileID: 0}
-    - m_Text: "\u6700\u8FD16\u5929"
+    - m_Text: "\u6700\u8FD1\u4E00\u4E2A\u6708"
       m_Image: {fileID: 0}
-    - m_Text: "\u6700\u8FD16\u5C0F\u65F6"
+    - m_Text: "\u6700\u8FD1\u4E00\u5468"
       m_Image: {fileID: 0}
   m_OnValueChanged:
     m_PersistentCalls:
@@ -35981,7 +35979,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 36, y: 20}
+  m_SizeDelta: {x: 40, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2592763949974780393
 CanvasRenderer:
@@ -36012,8 +36010,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -36024,7 +36022,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u5355\u4F4D"
+  m_Text: "\u6C34\u4F4D/m"
 --- !u!1 &4605638633781669104
 GameObject:
   m_ObjectHideFlags: 0
@@ -37052,7 +37050,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u6700\u8FD16\u4E2A\u6708"
+  m_Text: "\u6700\u8FD1\u4E00\u4E2A\u6708"
 --- !u!1 &4997425589850933997
 GameObject:
   m_ObjectHideFlags: 0
@@ -37559,7 +37557,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -156, y: 112.799995}
-  m_SizeDelta: {x: 40, y: 20}
+  m_SizeDelta: {x: 44, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4265498902650086066
 CanvasRenderer:
@@ -40978,7 +40976,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &838781682490093017
 RectTransform:
   m_ObjectHideFlags: 0
@@ -42763,7 +42761,7 @@ RectTransform:
   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: -28, y: 0}
+  m_AnchoredPosition: {x: -30, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &856650948779893772
@@ -44192,7 +44190,7 @@ MonoBehaviour:
           serializedVersion: 2
           rgba: 0
     m_AxisName:
-      m_Show: 1
+      m_Show: 0
       m_Name: axisName
       m_OnZero: 0
       m_LabelStyle:
@@ -44511,7 +44509,7 @@ MonoBehaviour:
           rgba: 0
     m_AxisName:
       m_Show: 1
-      m_Name: "\u5355\u4F4D"
+      m_Name: "\u6C34\u4F4D/m"
       m_OnZero: 0
       m_LabelStyle:
         m_Show: 1
@@ -44552,13 +44550,13 @@ MonoBehaviour:
           m_Bottom: 0
         m_TextStyle:
           m_Show: 1
-          m_Font: {fileID: 0}
+          m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
           m_AutoWrap: 0
           m_AutoAlign: 1
           m_Rotate: 0
           m_AutoColor: 0
           m_Color: {r: 1, g: 1, b: 1, a: 1}
-          m_FontSize: 0
+          m_FontSize: 12
           m_FontStyle: 0
           m_LineSpacing: 1
           m_Alignment: 4
@@ -44778,347 +44776,7 @@ MonoBehaviour:
   m_Parallels: []
   m_ParallelAxes: []
   m_Comments: []
-  m_SerieBars:
-  - m_Index: 0
-    m_Show: 1
-    m_CoordSystem: GridCoord
-    m_SerieType: Bar
-    m_SerieName: serie0
-    m_State: 0
-    m_ColorBy: 1
-    m_Stack: 
-    m_XAxisIndex: 0
-    m_YAxisIndex: 0
-    m_RadarIndex: 0
-    m_VesselIndex: 0
-    m_PolarIndex: 0
-    m_SingleAxisIndex: 0
-    m_ParallelIndex: 0
-    m_GridIndex: -1
-    m_MinShow: 0
-    m_MaxShow: 0
-    m_MaxCache: 0
-    m_SampleDist: 0
-    m_SampleType: 1
-    m_SampleAverage: 0
-    m_LineType: 0
-    m_SmoothLimit: 0
-    m_BarType: 0
-    m_BarPercentStack: 0
-    m_BarWidth: 0.2
-    m_BarMaxWidth: 0
-    m_BarGap: 0.1
-    m_BarZebraWidth: 4
-    m_BarZebraGap: 2
-    m_Min: 0
-    m_Max: 0
-    m_MinSize: 0
-    m_MaxSize: 1
-    m_StartAngle: 0
-    m_EndAngle: 0
-    m_MinAngle: 0
-    m_Clockwise: 1
-    m_RoundCap: 0
-    m_SplitNumber: 0
-    m_ClickOffset: 1
-    m_RoseType: 0
-    m_Gap: 0
-    m_Center:
-    - 0.5
-    - 0.46
-    m_Radius:
-    - 0
-    - 0.28
-    m_MinRadius: 0
-    m_MinShowLabel: 0
-    m_MinShowLabelValue: 0
-    m_ShowDataDimension: 2
-    m_ShowDataName: 0
-    m_Clip: 0
-    m_Ignore: 0
-    m_IgnoreValue: 0
-    m_IgnoreLineBreak: 0
-    m_ShowAsPositiveNumber: 0
-    m_Large: 1
-    m_LargeThreshold: 200
-    m_AvoidLabelOverlap: 0
-    m_RadarType: 0
-    m_PlaceHolder: 0
-    m_DataSortType: 2
-    m_Orient: 1
-    m_Align: 0
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-    m_InsertDataToHead: 0
-    m_LineStyle:
-      m_Show: 1
-      m_Type: 0
-      m_Color:
-        serializedVersion: 2
-        rgba: 0
-      m_ToColor:
-        serializedVersion: 2
-        rgba: 0
-      m_ToColor2:
-        serializedVersion: 2
-        rgba: 0
-      m_Width: 0
-      m_Length: 0
-      m_Opacity: 1
-      m_DashLength: 4
-      m_DotLength: 2
-      m_GapLength: 2
-    m_Symbol:
-      m_Show: 0
-      m_Type: 3
-      m_Size: 0
-      m_Gap: 0
-      m_Width: 0
-      m_Height: 0
-      m_Offset: {x: 0, y: 0}
-      m_Image: {fileID: 0}
-      m_ImageType: 0
-      m_Color:
-        serializedVersion: 2
-        rgba: 0
-      m_SizeType: 0
-      m_DataIndex: 1
-      m_DataScale: 1
-      m_StartIndex: 0
-      m_Interval: 0
-      m_ForceShowLast: 0
-      m_Repeat: 0
-      m_MinSize: 0
-      m_MaxSize: 0
-    m_Animation:
-      m_Enable: 1
-      m_Type: 0
-      m_Easting: 0
-      m_Threshold: 2000
-      m_UnscaledTime: 0
-      m_FadeIn:
-        m_Enable: 1
-        m_Reverse: 0
-        m_Delay: 0
-        m_Duration: 1000
-      m_FadeOut:
-        m_Enable: 1
-        m_Reverse: 1
-        m_Delay: 0
-        m_Duration: 1000
-      m_Change:
-        m_Enable: 1
-        m_Reverse: 0
-        m_Delay: 0
-        m_Duration: 500
-      m_Addition:
-        m_Enable: 1
-        m_Reverse: 0
-        m_Delay: 0
-        m_Duration: 500
-      m_Hiding:
-        m_Enable: 1
-        m_Reverse: 0
-        m_Delay: 0
-        m_Duration: 500
-      m_Interaction:
-        m_Enable: 1
-        m_Reverse: 0
-        m_Delay: 0
-        m_Duration: 250
-        m_Width:
-          m_Type: 0
-          m_Value: 1.1
-        m_Radius:
-          m_Type: 0
-          m_Value: 1.1
-        m_Offset:
-          m_Type: 1
-          m_Value: 5
-    m_ItemStyle:
-      m_Show: 1
-      m_Color:
-        serializedVersion: 2
-        rgba: 3433589007
-      m_Color0:
-        serializedVersion: 2
-        rgba: 0
-      m_ToColor:
-        serializedVersion: 2
-        rgba: 4294959402
-      m_ToColor2:
-        serializedVersion: 2
-        rgba: 0
-      m_MarkColor:
-        serializedVersion: 2
-        rgba: 0
-      m_BackgroundColor:
-        serializedVersion: 2
-        rgba: 0
-      m_BackgroundWidth: 0
-      m_CenterColor:
-        serializedVersion: 2
-        rgba: 0
-      m_CenterGap: 0
-      m_BorderWidth: 0
-      m_BorderGap: 0
-      m_BorderColor:
-        serializedVersion: 2
-        rgba: 0
-      m_BorderColor0:
-        serializedVersion: 2
-        rgba: 0
-      m_BorderToColor:
-        serializedVersion: 2
-        rgba: 0
-      m_Opacity: 1
-      m_ItemMarker: 
-      m_ItemFormatter: 
-      m_NumericFormatter: 
-      m_CornerRadius:
-      - 50
-      - 50
-      - 0
-      - 0
-    m_Data:
-    - m_Index: 0
-      m_Name: "\u4E00\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 0
-      - 52
-    - m_Index: 1
-      m_Name: "\u4E8C\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 1
-      - 76
-    - m_Index: 2
-      m_Name: "\u4E09\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 2
-      - 35
-    - m_Index: 3
-      m_Name: "\u4E00\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 3
-      - 36
-    - m_Index: 4
-      m_Name: "\u4E00\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 4
-      - 34
-    - m_Index: 5
-      m_Name: "\u4E00\u6708"
-      m_Id: 
-      m_ParentId: 
-      m_Ignore: 0
-      m_Selected: 0
-      m_Radius: 0
-      m_State: 4
-      m_ItemStyles: []
-      m_Labels: []
-      m_LabelLines: []
-      m_Symbols: []
-      m_LineStyles: []
-      m_AreaStyles: []
-      m_TitleStyles: []
-      m_EmphasisStyles: []
-      m_BlurStyles: []
-      m_SelectStyles: []
-      m_Data:
-      - 5
-      - 34
-    m_Links: []
-    m_Labels: []
-    m_LabelLines: []
-    m_EndLabels: []
-    m_LineArrows: []
-    m_AreaStyles: []
-    m_TitleStyles: []
-    m_EmphasisStyles: []
-    m_BlurStyles: []
-    m_SelectStyles: []
+  m_SerieBars: []
   m_SerieCandlesticks: []
   m_SerieEffectScatters: []
   m_SerieHeatmaps: []
@@ -45129,11 +44787,11 @@ MonoBehaviour:
   m_SerieScatters: []
   m_SerieParallels: []
   m_SerieSimplifiedLines:
-  - m_Index: 1
+  - m_Index: 0
     m_Show: 1
     m_CoordSystem: GridCoord
     m_SerieType: SimplifiedLine
-    m_SerieName: serie1
+    m_SerieName: "\u6C34\u4F4D/m"
     m_State: 0
     m_ColorBy: 0
     m_Stack: 
@@ -45207,7 +44865,7 @@ MonoBehaviour:
       m_Type: 0
       m_Color:
         serializedVersion: 2
-        rgba: 0
+        rgba: 4294965022
       m_ToColor:
         serializedVersion: 2
         rgba: 0
@@ -45243,7 +44901,7 @@ MonoBehaviour:
       m_MinSize: 0
       m_MaxSize: 0
     m_Animation:
-      m_Enable: 1
+      m_Enable: 0
       m_Type: 0
       m_Easting: 0
       m_Threshold: 2000

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -91,11 +91,7 @@ public class SWYJLayer : YZTRootLayer
 
     //水位变化与统计
     private BarChart shuiWeiBianHua;
-
-    [Header("工程安全监测-水位变化与统计数据")] public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Month;
-    public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Day;
-    public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Hour;
-
+    
     private Dropdown shuiWeiBarChartDropdown;
 
     //异常警告
@@ -533,13 +529,10 @@ public class SWYJLayer : YZTRootLayer
             switch (value)
             {
                 case 0:
-                    SetShuiWeiTongJiBarChart(GlobalData.buYuanShuiWei_month);
+                    SetShuiWeiTongJiBarChart("61017800",0);
                     break;
                 case 1:
-                    SetShuiWeiTongJiBarChart(GlobalData.buYuanShuiWei_day);
-                    break;
-                case 2:
-                    SetShuiWeiTongJiBarChart(GlobalData.buYuanShuiWei_hour);
+                    SetShuiWeiTongJiBarChart("61017800",1);
                     break;
             }
         }
@@ -548,52 +541,67 @@ public class SWYJLayer : YZTRootLayer
             switch (value)
             {
                 case 0:
-                    SetShuiWeiTongJiBarChart(GlobalData.taoKouShuiWei_month);
+                    SetShuiWeiTongJiBarChart("61017810",0);
                     break;
                 case 1:
-                    SetShuiWeiTongJiBarChart(GlobalData.taoKouShuiWei_day);
-                    break;
-                case 2:
-                    SetShuiWeiTongJiBarChart(GlobalData.taoKouShuiWei_hour);
+                    SetShuiWeiTongJiBarChart("61017810",1);
                     break;
             }
         }
     }
-
-    public void SetShuiWeiTongJiBarChart(ShuiWeiBianHuaData shuiWeiBianHuaData)
+    
+    //0 一个月 1 一周
+    public async void SetShuiWeiTongJiBarChart(string _stcd,int timeType)
     {
-        shuiWeiBianHuaData.InverseAllData();
-        string yearTitle = shuiWeiBianHuaData.GetYearRange();
-        if (shuiWeiBianHuaData != null)
+        var startDateStr = "";
+        var endDateStr = "";
+        DateTime today = DateTime.Today;
+        if (timeType == 0)
+        {
+            DateTime startDate = today.AddMonths(-1);
+            startDateStr = startDate.ToString("yyyy-MM-dd");
+        }
+        else
+        {
+            DateTime startDate = today.AddDays(-7);
+            startDateStr = startDate.ToString("yyyy-MM-dd");
+        }
+        endDateStr = today.ToString("yyyy-MM-dd");
+        
+        var chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(_stcd, startDateStr, endDateStr);
+        WaterTrendData_Chart tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_Chart>(chartJsonStr);
+        
+        if (tempData != null)
         {
-            var x_chart = shuiWeiBianHua.GetChartComponent<XAxis>();
-            x_chart.data.Clear();
-            for (int i = 0; i < shuiWeiBianHuaData.name.Length; i++)
+            tempData.data.Reverse();
+            XAxis tempXaxis = shuiWeiBianHua.GetChartComponent<XAxis>();
+            tempXaxis.data.Clear();
+            for (int i = 0; i < tempData.data.Count; i++)
             {
-                string name = shuiWeiBianHuaData.name[i];
-                DateTime date = DateTime.ParseExact(name, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
-                string monthDay = date.ToString("MM-dd"); // 结果为"03-30"
-                x_chart.data.Add(monthDay);
+                tempXaxis.AddData(tempData.data[i].time);
             }
 
-            x_chart.axisName.name = yearTitle;
-            x_chart.refreshComponent?.Invoke();
-            
-            var y_chart=shuiWeiBianHua.GetChartComponent<YAxis>();
-            y_chart.axisName.name = "水位/m";
-
             var tempSeries = shuiWeiBianHua.series;
-            tempSeries[0].serieName = "水位/m";
-            tempSeries[0].ClearData();
-            SerieData[] serieDatas = new SerieData[shuiWeiBianHuaData.value.Length];
-            for (int i = 0; i < shuiWeiBianHuaData.value.Length; i++)
+            tempSeries[0].serieName = "水位(m)";
+            SerieData[] tempDatas = new SerieData[tempData.data.Count];
+            for (int i = 0; i < tempDatas.Length; i++)
             {
-                serieDatas[i] = new SerieData();
-                serieDatas[i].data = new List<double>();
-                serieDatas[i].data.Add(i);
-                serieDatas[i].data.Add(shuiWeiBianHuaData.value[i]);
+                tempDatas[i] = new SerieData();
+                tempDatas[i].data = new List<double>();
+                tempDatas[i].data.Add(i);
+                string valueTex = tempData.data[i].value;
+                if (valueTex == "-") {
+                    valueTex = "-1";
+                }
+                double tempValue = double.Parse(float.Parse(valueTex).ToString("0.00"));
+                //if (tempValue < 0) {
+                //    tempValue = 24.99f;
+                //}
+                tempDatas[i].data.Add(tempValue);
             }
-            tempSeries[0].data.AddRange(serieDatas);
+
+            tempSeries[0].data.Clear();
+            tempSeries[0].data.AddRange(tempDatas);
         }
     }
 

Assets/Scripts/UI/UIView/YZT/WaterTrendPanel.cs

@@ -211,6 +211,7 @@ public class WaterTrendPanel : MonoBehaviour
             typeTitle.text = "站点降雨趋势";
         }
         currentStcd = stcd;
+        Debug.Log(stcd);
         currentName = name;
         ChangePanel(0);
         name = name.Replace(" ", "");