先提交再说

Assets/Prefabs/UI/SWHeightUnit.prefab

@@ -394,7 +394,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.585451, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -676,7 +676,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.585451, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Prefabs/UI/WeatherUnit.prefab

@@ -35,8 +35,8 @@ 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: 0, y: 42.3}
-  m_SizeDelta: {x: 83.8706, y: 19.7249}
+  m_AnchoredPosition: {x: 2.5, y: -56.822}
+  m_SizeDelta: {x: 83.8706, y: 25.6447}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &884583675277709012
 CanvasRenderer:
@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 16
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -193,6 +193,8 @@ RectTransform:
   - {fileID: 8952086227079448025}
   - {fileID: 7243983524319404826}
   - {fileID: 4184643251971361741}
+  - {fileID: 3606001553948560959}
+  - {fileID: 7452667661508691300}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -222,14 +224,25 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nameText: {fileID: 8036006287103540530}
-  weatherText: {fileID: 5786029107628702619}
-  image: {fileID: 761141317568502569}
+  dropText: {fileID: 5786029107628702619}
+  image: {fileID: 3646330872439128782}
   weatherSprite:
   - {fileID: 2315898452501122060}
   - {fileID: 1996766199902518574}
   - {fileID: 2438958083520001057}
   - {fileID: 8222575806890781699}
   - {fileID: 8222575806890781699}
+  sprites:
+  - {fileID: 21300000, guid: 7104bffb926376d42a0de38b165bc5ac, type: 3}
+  - {fileID: 21300000, guid: 434918e23cfb4c64781a797919c4fa5e, type: 3}
+  - {fileID: 21300000, guid: a961c21f86309464f8ceb2ad86d33d2e, type: 3}
+  - {fileID: 21300000, guid: 43a46db7010cd794da77482afd4b8d64, type: 3}
+  - {fileID: 21300000, guid: f7f89cfb95826134bb53b9890b13e7fc, type: 3}
+  - {fileID: 21300000, guid: 7a08e1448f357444bbeeec163b00c958, type: 3}
+  - {fileID: 21300000, guid: 1a994e2a6ece267409a83da5c96a1461, type: 3}
+  - {fileID: 21300000, guid: 7f78ee9a29e3b5c479c75a04b968940e, type: 3}
+  - {fileID: 21300000, guid: 4bbfa9ca615bc164d9753aeb573918e8, type: 3}
+  - {fileID: 21300000, guid: 95fea9c5c33887c44a4e1e831ccd109c, type: 3}
   bingObj: {fileID: 0}
 --- !u!1 &1996766199902518574
 GameObject:
@@ -347,7 +360,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6973471841746315743
 RectTransform:
   m_ObjectHideFlags: 0
@@ -396,7 +409,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 1266d905ec87330489160d2c2a050a52, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -542,7 +555,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5484191645523972304
 RectTransform:
   m_ObjectHideFlags: 0
@@ -560,8 +573,8 @@ 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: 29.709, y: 20.5}
-  m_SizeDelta: {x: 59.418, y: 33.1814}
+  m_AnchoredPosition: {x: -2.1, y: -35.097}
+  m_SizeDelta: {x: 58.8205, y: 34.3764}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1796557245521567741
 CanvasRenderer:
@@ -605,6 +618,164 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 22
+--- !u!1 &5996874691342472911
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7452667661508691300}
+  - component: {fileID: 795234649238899699}
+  - component: {fileID: 3646330872439128782}
+  m_Layer: 5
+  m_Name: DropImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7452667661508691300
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5996874691342472911}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1232816447255914944}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 28.065, y: -15.749}
+  m_SizeDelta: {x: 24, y: 107.79}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &795234649238899699
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5996874691342472911}
+  m_CullTransparentMesh: 1
+--- !u!114 &3646330872439128782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5996874691342472911}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.89289975, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 95fea9c5c33887c44a4e1e831ccd109c, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6416301043337060414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3606001553948560959}
+  - component: {fileID: 5884602237235386261}
+  - component: {fileID: 6969761191428409214}
+  m_Layer: 5
+  m_Name: Unity
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3606001553948560959
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6416301043337060414}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1232816447255914944}
+  m_RootOrder: 7
+  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.369, y: -35.097}
+  m_SizeDelta: {x: 56.7385, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5884602237235386261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6416301043337060414}
+  m_CullTransparentMesh: 1
+--- !u!114 &6969761191428409214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6416301043337060414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 15
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'mm
+
+'
 --- !u!1 &8222575806890781699
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -7318,7 +7318,7 @@ RectTransform:
   m_GameObject: {fileID: 617089497}
   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:
   - {fileID: 1998208835}
@@ -7328,7 +7328,7 @@ RectTransform:
   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: -920, y: 243.6}
+  m_AnchoredPosition: {x: -920, y: 174}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &617089500
@@ -9122,7 +9122,7 @@ RectTransform:
   m_GameObject: {fileID: 819927368}
   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:
   - {fileID: 176894274}
@@ -14901,7 +14901,7 @@ RectTransform:
   m_GameObject: {fileID: 1209135816}
   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:
   - {fileID: 1851203696}
@@ -14911,7 +14911,7 @@ RectTransform:
   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: -920, y: 243.6}
+  m_AnchoredPosition: {x: -920, y: 104.400024}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1209135819
@@ -28841,7 +28841,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 18587a7f1754a804aacadc5efd21b858, type: 3}
   - {fileID: 21300000, guid: ef4a8427bee96a24aa96432ccc41248d, type: 3}
   - {fileID: 21300000, guid: 7d577dada64b78949a0d1270179aaec8, type: 3}
-  - {fileID: 21300000, guid: 4afa5df9bbfa6d44ab63b5a5dbf1ab76, type: 3}
+  - {fileID: 21300000, guid: 9a188e54118420e4f80923ebcbf4afd9, type: 3}
   layerBtnPrefab: {fileID: 8799306973542105704, guid: 3fc5d8cc22a8f5543a2c8826c1a3e67f, type: 3}
   secLayerBtnPrefab: {fileID: 707166769807136026, guid: c77f059ab873cdf48a5d3013ed330006, type: 3}
   layerDatas:
@@ -28889,6 +28889,7 @@ MonoBehaviour:
   - {fileID: 913032233633673168}
   - {fileID: 5681608577501327801}
   - {fileID: 4456591826763596238}
+  - {fileID: 8763529351266769493}
   cancelLayer: 
   sprites:
   - {fileID: 21300000, guid: 2e2b18e73fe3f044fb538a6cbe9064b0, type: 3}
@@ -66452,7 +66453,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f30f883a2062cc4419a1157f03e6b51a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9a188e54118420e4f80923ebcbf4afd9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -72162,15 +72163,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: -18.807
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 499685754693853157, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -72184,6 +72185,22 @@ PrefabInstance:
       propertyPath: m_FontData.m_FontSize
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 983379433238813497, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 102
+      objectReference: {fileID: 0}
+    - target: {fileID: 983379433238813497, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 983379433238813497, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 983379433238813497, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1383460009076738757, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 14
@@ -72280,6 +72297,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -257.6
       objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_YAxes.Array.data[0].m_Min
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_YAxes.Array.data[0].m_Interval
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_XAxes.Array.data[0].m_Data.Array.size
       value: 20
@@ -72768,6 +72793,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2066964053770644601, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 20
@@ -72864,6 +72893,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -4.7122
       objectReference: {fileID: 0}
+    - target: {fileID: 3285100310582314590, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 101
+      objectReference: {fileID: 0}
+    - target: {fileID: 3285100310582314590, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3285100310582314590, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3285100310582314590, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
@@ -72914,15 +72959,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: -18.807
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3810294204129436098, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
@@ -73056,6 +73101,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: infoBtn
+      value: 
+      objectReference: {fileID: 7008879374328883820}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: infoPanel
+      value: 
+      objectReference: {fileID: 7476094150489753651}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: typeTitle
+      value: 
+      objectReference: {fileID: 387498243553135059}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: lineChartBtn
+      value: 
+      objectReference: {fileID: 6523913072739403562}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: lineChartPanel
+      value: 
+      objectReference: {fileID: 743271226993744917}
     - target: {fileID: 5033510405257207482, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
       value: 35
@@ -73144,6 +73209,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -257.6
       objectReference: {fileID: 0}
+    - target: {fileID: 6550958005440900506, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6550958005440900506, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6550958005440900506, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6550958005440900506, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6629825323659450963, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -25.5
@@ -73178,15 +73259,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
-      value: -3
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6900245865505881427, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
@@ -73224,13 +73305,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -257.6
       objectReference: {fileID: 0}
+    - target: {fileID: 7197362812983651002, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Alpha
+      value: 0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 7357958510519679404, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7357958510519679404, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7436440575482265988, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.y
@@ -73394,6 +73479,22 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+--- !u!114 &387498243553135059 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 104096724824055452, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &743271226993744917 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1027341661149252442, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1686690605450790000 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1403202070640317247, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
@@ -73409,3 +73510,30 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 4780098280845563496, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
   m_PrefabInstance: {fileID: 293148431658637135}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &6523913072739403562 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6816445073305178213, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &7008879374328883820 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7302008839263927587, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7476094150489753651 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7192553131315076988, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}

Assets/Prefabs/UI/ZhanDian.prefab

@@ -115,8 +115,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 20.132006, y: -20.131992}
-  m_SizeDelta: {x: 40.263, y: 40.263}
+  m_AnchoredPosition: {x: 14.905, y: -14.597}
+  m_SizeDelta: {x: 29.81, y: 29.193}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &402433400722566893
 CanvasRenderer:
@@ -274,8 +274,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104.04651, y: -30.5}
-  m_SizeDelta: {x: 97.9524, y: 29.1938}
+  m_AnchoredPosition: {x: 113.20898, y: -30.5}
+  m_SizeDelta: {x: 117.582, y: 29.1938}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3930887372748340453
 CanvasRenderer:
@@ -309,7 +309,7 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 16
     m_FontStyle: 0
-    m_BestFit: 1
+    m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
     m_Alignment: 3
@@ -355,8 +355,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 26.342186, y: -36.035175}
-  m_SizeDelta: {x: 40.2635, y: 40.2635}
+  m_AnchoredPosition: {x: 27.05, y: -30.5}
+  m_SizeDelta: {x: 29.8101, y: 29.193}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2235333794585569348
 CanvasRenderer:

Assets/Scripts/HttpHelper.cs

@@ -1026,47 +1026,47 @@ public class HttpHelper : MonoBehaviour
     public async Task InitGCJKData()
     {
         bool successInternet = true;
-        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetGeQXZData);
-        requestData.timeout = timeOut;
-        await requestData.SendWebRequest();
-        try
-        {
-            if (requestData.result != UnityWebRequest.Result.Success)
-            {
-                Debug.LogWarning("水文站联网不成功,原因:返request不成功");
-                successInternet = false;
-            }
-            else
-            {
-                string postResult = requestData.downloadHandler.text;
-                if (useAes)
-                {
-                    postResult = AESCrypto.Decrypt(postResult);
-
-                }
-                JObject jsonObject = JObject.Parse(postResult);
-
-                // 提取data字段的值
-                JToken dataToken = jsonObject["data"];
-                JToken codeToken = jsonObject["code"];
-                if (codeToken.ToString() == "200")
-                {
-                    GlobalData.qXZDatas = JsonConvert.DeserializeObject<List<QXZData>>(dataToken.ToString());
-                }
-                else
-                {
-                    Debug.LogWarning("水文站联网不成功,原因:返序列化失败");
-                    successInternet = false;
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            successInternet = false;
-            Debug.LogWarning("水文站联网不成功,原因:" + e.ToString());
-        }
+        //UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetGeQXZData);
+        //requestData.timeout = timeOut;
+        //await requestData.SendWebRequest();
+        //try
+        //{
+        //    if (requestData.result != UnityWebRequest.Result.Success)
+        //    {
+        //        Debug.LogWarning("水文站联网不成功,原因:返request不成功");
+        //        successInternet = false;
+        //    }
+        //    else
+        //    {
+        //        string postResult = requestData.downloadHandler.text;
+        //        if (useAes)
+        //        {
+        //            postResult = AESCrypto.Decrypt(postResult);
+
+        //        }
+        //        JObject jsonObject = JObject.Parse(postResult);
+
+        //        // 提取data字段的值
+        //        JToken dataToken = jsonObject["data"];
+        //        JToken codeToken = jsonObject["code"];
+        //        if (codeToken.ToString() == "200")
+        //        {
+        //            GlobalData.qXZDatas = JsonConvert.DeserializeObject<List<QXZData>>(dataToken.ToString());
+        //        }
+        //        else
+        //        {
+        //            Debug.LogWarning("水文站联网不成功,原因:返序列化失败");
+        //            successInternet = false;
+        //        }
+        //    }
+        //}
+        //catch (Exception e)
+        //{
+        //    successInternet = false;
+        //    Debug.LogWarning("水文站联网不成功,原因:" + e.ToString());
+        //}
 
-        requestData.Dispose();
+        //requestData.Dispose();
 
         successInternet = true;
         UnityWebRequest requestData1 = UnityWebRequest.Get(ServerAddress.APIGetGeSWZData);
@@ -1539,7 +1539,7 @@ public class HttpHelper : MonoBehaviour
                     //Debug.LogError(GlobalData.swDatas.Count);
                     for (int i = 0; i < GlobalData.swDatas.Count; i++)
                     {
-                        GlobalData.swDatas[i].stnm = GlobalData.swDatas[i].stnm.Replace("（闸下）", "(下)").Replace("（闸上）", "(上)").Replace("(闸上)", "上").Replace("(闸下)", "下");
+                        GlobalData.swDatas[i].stnm = GlobalData.swDatas[i].stnm.Replace("（", "(").Replace("）", ")");
                     }
                 }
                 else
@@ -2060,13 +2060,29 @@ public class HttpHelper : MonoBehaviour
 
 
     /// <summary>
-    /// 获取站点水位信息
+    /// 获取站点水位图表
     /// </summary>
     /// <param name="stcd"></param>
     /// <returns></returns>
-    public async Task<string> GetWaterTrend_Chart(string stcd)
+    public async Task<string> GetWaterTrend_Chart(string stcd,string startDate,string endDate)
+    {
+        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_GetWaterTrend_chart + stcd + "&startDate=" + startDate + "&endDate=" + endDate, "Get");
+        www.downloadHandler = new DownloadHandlerBuffer();
+        www.SetRequestHeader("Content-Type", "application/json");
+        await www.SendWebRequest();
+        if (www.result != UnityWebRequest.Result.Success)
+        {
+            Debug.LogWarning($"获取stcd:{stcd},水位统计信息数据不成功,原因:返request不成功:" + www.downloadHandler.text);
+        }
+
+        string result = www.downloadHandler.text;
+        www.Dispose();
+        return result;
+    }
+
+    public async Task<string> GetDropTrend_Chart(string stcd, string startDate, string endDate)
     {
-        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_GetWaterTrend_chart + stcd, "Get");
+        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_GetDropTrend_chart + stcd + "&startDate=" + startDate + "&endDate=" + endDate, "Get");
         www.downloadHandler = new DownloadHandlerBuffer();
         www.SetRequestHeader("Content-Type", "application/json");
         await www.SendWebRequest();
@@ -2080,9 +2096,9 @@ public class HttpHelper : MonoBehaviour
         return result;
     }
 
-    public async Task<string> GetWaterTrend_List(string stcd)
+    public async Task<string> GetWaterTrend_Info(string stcd)
     {
-        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_GetWaterTrend_list + stcd, "Get");
+        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_GetWaterTrend_info + stcd, "Get");
         www.downloadHandler = new DownloadHandlerBuffer();
         www.SetRequestHeader("Content-Type", "application/json");
         await www.SendWebRequest();

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -130,8 +130,9 @@ public class ServerAddress
     /// <summary>
     /// 获取站点水位信息(折线图和信息列表)
     /// </summary>
-    public static string API_GetWaterTrend_chart = YZTServerAddress + "/open/water1?stcd=";
-    public static string API_GetWaterTrend_list = YZTServerAddress + "/open/water2?stcd=";
+    public static string API_GetWaterTrend_chart = YZTServerAddress + "/open/waterByDateRange?stcd=";
+    public static string API_GetDropTrend_chart = YZTServerAddress + "/open/rainfallByDateRange?stcd=";
+    public static string API_GetWaterTrend_info = YZTServerAddress + "/open/water2?stcd=";
     public static string API_GetWaterData = YZTServerAddress + "/open/water3";
 
     //  http://111.4.141.191:9081/open/dataStatis 

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

@@ -504,25 +504,32 @@ public class GCJKLayer : YZTRootLayer
             main.gameObject.SetActive(true);
         });
 
-        qxDataBtn.onClick.AddListener(() =>
-        {
-            miniMapQXContent.gameObject.SetActive(true);
-            miniMapSWContent.gameObject.SetActive(false);
-            qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
-            swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
-            dropToggle.gameObject.SetActive(true);
-            weatherToggle.gameObject.SetActive(false);
-        });
-
-        swDataBtn.onClick.AddListener(() =>
-        {
-            miniMapQXContent.gameObject.SetActive(false);
-            miniMapSWContent.gameObject.SetActive(true);
-            swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
-            qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
-            dropToggle.gameObject.SetActive(false);
-            weatherToggle.gameObject.SetActive(true);
-        });
+        //qxDataBtn.onClick.AddListener(() =>
+        //{
+        //    miniMapQXContent.gameObject.SetActive(true);
+        //    miniMapSWContent.gameObject.SetActive(false);
+        //    qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
+        //    swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
+        //    dropToggle.gameObject.SetActive(true);
+        //    weatherToggle.gameObject.SetActive(false);
+        //});
+
+        //swDataBtn.onClick.AddListener(() =>
+        //{
+        //    miniMapQXContent.gameObject.SetActive(false);
+        //    miniMapSWContent.gameObject.SetActive(true);
+        //    swDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
+        //    qxDataBtn.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
+        //    dropToggle.gameObject.SetActive(false);
+        //    weatherToggle.gameObject.SetActive(true);
+        //});
+
+        miniMapQXContent.gameObject.SetActive(false);
+        miniMapSWContent.gameObject.SetActive(true);
+        swDataBtn.gameObject.SetActive(false);
+        qxDataBtn.gameObject.SetActive(false);
+        dropToggle.gameObject.SetActive(false);
+        weatherToggle.gameObject.SetActive(false);
 
         dropToggle.onValueChanged.AddListener((active) =>
         {
@@ -543,70 +550,12 @@ public class GCJKLayer : YZTRootLayer
 
     public async void OnGlobalWeatherClick()
     {
-        if (GlobalData.qXZDatas.Count < 1 || GlobalData.sWZDatas.Count < 1)
+        if (GlobalData.sWZDatas.Count < 1)
             await HttpHelper._Instance.InitGCJKData();
 
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
         CameraManager.SwitchCamera(1);
-        if (dropUnits.Count <= 0)
-        {
-            viewMode = ViewMode.miniMap;
-            dropUnits = new List<DropUnit>();
-            weatherUnits = new List<WeatherUnit>();
-            for (int i = 0; i < GlobalData.qXZDatas.Count; i++)
-            {
-                GameObject gameObject = Instantiate(dropUnitPrefab);
-                DropUnit dropUnit = gameObject.GetComponent<DropUnit>();
-                dropUnit.transform.SetParent(miniMapQXContent.transform);
-                dropUnit.Init(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD, GlobalData.qXZDatas[i].STNM,
-                    GlobalData.qXZDatas[i].dropSum6.ToString());
-                dropUnits.Add(dropUnit);
-
-                dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(9));
-                dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
-                dropUnit.bingObj.transform.localScale = Vector3.one;
-                dropUnit.bingObj.transform.localPosition =
-                    CoordinateConverter.GeoToUGUISmall(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD);
-                dropUnit.bingObj.name = GlobalData.qXZDatas[i].STNM;
-            }
-
-            //for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
-            //{
-            //    GameObject gameObject = Instantiate(dropUnitPrefab);
-            //    DropUnit dropUnit = gameObject.GetComponent<DropUnit>();
-            //    dropUnit.transform.SetParent(miniMapSWContent.transform);
-            //    dropUnit.Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD, GlobalData.sWZDatas[i].STNM,
-            //        GlobalData.sWZDatas[i].dropSum6.ToString());
-            //    dropUnits.Add(dropUnit);
-
-            //    dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-            //    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(10));
-            //    dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
-            //    dropUnit.bingObj.transform.localScale = Vector3.one;
-            //    dropUnit.bingObj.transform.localPosition =
-            //        CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
-            //    dropUnit.bingObj.name = GlobalData.sWZDatas[i].STNM;
-            //}
-        }
-        else
-        {
-            viewMode = ViewMode.miniMap;
-            int index = 0;
-            for (int i = 0; i < GlobalData.qXZDatas.Count; i++)
-            {
-                dropUnits[i].Init(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD, GlobalData.qXZDatas[i].STNM,
-                    GlobalData.qXZDatas[i].dropSum6.ToString());
-                index++;
-            }
-
-            //for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
-            //{
-            //    dropUnits[i + index].Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD,
-            //        GlobalData.sWZDatas[i].STNM, GlobalData.sWZDatas[i].dropSum6.ToString());
-            //}
-        }
-
+       
         if (weatherUnits.Count <= 0)
         {
             for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
@@ -615,7 +564,7 @@ public class GCJKLayer : YZTRootLayer
                 WeatherUnit weatherUnit = gameObject.GetComponent<WeatherUnit>();
                 weatherUnit.transform.SetParent(miniMapSWContent.transform);
                 weatherUnit.Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD, GlobalData.sWZDatas[i].STNM,
-                    GlobalData.sWZDatas[i].wth);
+                    GlobalData.sWZDatas[i].wth, GlobalData.sWZDatas[i].dropSum6);
                 weatherUnit.transform.localScale = Vector3.one * 1.1f;
                 weatherUnits.Add(weatherUnit);
 
@@ -633,7 +582,7 @@ public class GCJKLayer : YZTRootLayer
             for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
             {
                 weatherUnits[i].Init(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD,
-                    GlobalData.sWZDatas[i].STNM, GlobalData.sWZDatas[i].wth);
+                    GlobalData.sWZDatas[i].STNM, GlobalData.sWZDatas[i].wth, GlobalData.sWZDatas[i].dropSum6);
             }
         }
 
@@ -683,12 +632,12 @@ public class GCJKLayer : YZTRootLayer
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                if (GlobalData.swDatas[i].stnm == "补元(上)")
+                if (GlobalData.swDatas[i].stnm == "补元(闸上)")
                 {
                     swUp = GlobalData.swDatas[i].upz;
                     swUpName = GlobalData.swDatas[i].stnm;
                 }
-                if (GlobalData.swDatas[i].stnm == "补元(下)")
+                if (GlobalData.swDatas[i].stnm == "补元(闸下)")
                 {
                      swDown = GlobalData.swDatas[i].dwz;
                      swDownName = GlobalData.swDatas[i].stnm;
@@ -735,12 +684,12 @@ public class GCJKLayer : YZTRootLayer
             string swDownName="";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                if (GlobalData.swDatas[i].stnm == "套口(上)")
+                if (GlobalData.swDatas[i].stnm == "套口(闸上)")
                 {
                     swUp = GlobalData.swDatas[i].upz;
                     swUpName = GlobalData.swDatas[i].stnm;
                 }
-                if (GlobalData.swDatas[i].stnm == "套口(下)")
+                if (GlobalData.swDatas[i].stnm == "套口(闸下)")
                 {
                     swDown = GlobalData.swDatas[i].dwz;
                     swDownName = GlobalData.swDatas[i].stnm;

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -6,45 +7,46 @@ using UnityEngine.UI;
 public class WeatherUnit : MonoBehaviour
 {
     public Text nameText;
-    public Text weatherText;
+    public Text dropText;
     public Image image;
 
     public GameObject[] weatherSprite;
-
+    public Sprite[] sprites;
     public GameObject bingObj;
+
+    private int index = 0;
+    private float currentIndex = 0;
     // Start is called before the first frame update
     void Start()
     {
         
     }
-    public void Init(double lgtd, double lttd, string na, string we)
+    public void Init(double lgtd, double lttd, string na, string we,float drop)
     {
         for (int i = 0; i < weatherSprite.Length; i++) {
             weatherSprite[i].gameObject.SetActive(false);
         }
+        dropText.text = drop.ToString();
         Vector3 temp = CoordinateConverter.GeoToUGUISmall(lgtd, lttd);
         this.GetComponent<RectTransform>().anchoredPosition3D = temp;
         nameText.text = na.Trim();
-        //digitText.text = di;
+        image.sprite = sprites[0];
+        currentIndex = 0;
+        index = (int)Mathf.Clamp(Mathf.Round(drop / 2.0f), 0, 9);
         switch (we) {
             case "9":
-                weatherText.text = "晴天";
                 weatherSprite[0].gameObject.SetActive(true);
                 break;
             case "8":
-                weatherText.text = "阴天";
                 weatherSprite[1].gameObject.SetActive(true);
                 break;
             case "7":
-                weatherText.text = "雨天";
                 weatherSprite[2].gameObject.SetActive(true);
                 break;
             case "6":
-                weatherText.text = "雨夹雪";
                 weatherSprite[3].gameObject.SetActive(true);
                 break;
             case "5":
-                weatherText.text = "雪天";
                 weatherSprite[4].gameObject.SetActive(true);
                 break;
 
@@ -54,5 +56,11 @@ public class WeatherUnit : MonoBehaviour
     void Update()
     {
         this.GetComponent<RectTransform>().anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(bingObj.transform.position) * 1920.0f / Screen.width;
+        if (index > currentIndex)
+        {
+            //Debug.Log((int)(currentIndex));
+            currentIndex += Time.deltaTime;
+            image.sprite = sprites[(int)(currentIndex)];
+        }
     }
 }

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

@@ -43,13 +43,13 @@ public class StationData : IComparable
         if (obj is not StationData other)
             return 1; // 或抛异常 throw new ArgumentException("Invalid comparison");
 
-        float thisMax = MathF.Max(dwz ?? 0, upz ?? 0);
-        float otherMax = MathF.Max(other.dwz ?? 0, other.upz ?? 0);
-
+       // float thisMax = MathF.Max(dwz ?? 0, upz ?? 0);
+      //  float otherMax = MathF.Max(other.dwz ?? 0, other.upz ?? 0);
+            
         // 降序：最大值排前面
-        if (thisMax > otherMax)
+        if (stnm[0] > other.stnm[0])
             return -1;
-        else if (thisMax < otherMax)
+        else if (stnm[0] < other.stnm[0])
             return 1;
         else
             return 0;
@@ -309,13 +309,13 @@ public class SWYJLayer : YZTRootLayer
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                if (GlobalData.swDatas[i].stnm == "补元(上)")
+                if (GlobalData.swDatas[i].stnm == "补元(闸上)")
                 {
                     swUp = GlobalData.swDatas[i].upz;
                     swUpName = GlobalData.swDatas[i].stnm;
                 }
 
-                if (GlobalData.swDatas[i].stnm == "补元(下)")
+                if (GlobalData.swDatas[i].stnm == "补元(闸下)")
                 {
                     swDown = GlobalData.swDatas[i].dwz;
                     swDownName = GlobalData.swDatas[i].stnm;
@@ -344,13 +344,13 @@ public class SWYJLayer : YZTRootLayer
             string swDownName = "";
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                if (GlobalData.swDatas[i].stnm == "套口(上)")
+                if (GlobalData.swDatas[i].stnm == "套口(闸上)")
                 {
                     swUp = GlobalData.swDatas[i].upz;
                     swUpName = GlobalData.swDatas[i].stnm;
                 }
 
-                if (GlobalData.swDatas[i].stnm == "套口(下)")
+                if (GlobalData.swDatas[i].stnm == "套口(闸下)")
                 {
                     swDown = GlobalData.swDatas[i].dwz;
                     swDownName = GlobalData.swDatas[i].stnm;
@@ -459,7 +459,7 @@ public class SWYJLayer : YZTRootLayer
 
         for (int i = 0; i < GlobalData.swDatas.Count; i++)
         {
-            string keyName = GlobalData.swDatas[i].stnm.Replace("上", "").Replace("下", "").Replace("(", "").Replace(")", "");
+            string keyName = GlobalData.swDatas[i].stnm.Replace("闸上", "").Replace("闸下", "").Replace("(", "").Replace(")", "");
             if (stationDataLib.ContainsKey(keyName))
             {
                 if (GlobalData.swDatas[i].stnm.Contains("上"))

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

@@ -159,6 +159,7 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
         {
             if (Time.time - lastTime < 0.5f)
             {
+                isOver = false;
                 onPointClick?.Invoke();
             }
 

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

@@ -2,6 +2,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Best.HTTP.JSON;
+using Best.HTTP.SecureProtocol.Org.BouncyCastle.Asn1.Crmf;
 using Bitsplash.DatePicker;
 using Newtonsoft.Json;
 using UnityEngine;
@@ -16,15 +18,43 @@ public class WaterTrendPanel : MonoBehaviour
     public List<GameObject> listObj = new List<GameObject>();
     public Button closeButton;
     public string currentStcd;
+    public string currentName;
     public Transform listRoot;
 
     public DatePickerDropDownTextMeshPro DatePicker_Start;
     public DatePickerDropDownTextMeshPro DatePicker_End;
 
-    public string startDateStr="";
-    public string endDateStr="";
+    public string startDateStr = "";
+    public string endDateStr = "";
 
+    public Button lineChartBtn;
+    public Button infoBtn;
 
+    public RectTransform lineChartPanel;
+    public RectTransform infoPanel;
+
+    public int currentType;
+    public Text typeTitle;
+
+    public Text idText;
+    public Text stnmText;
+    public Text stcdText;
+    public Text stlcText;
+    public Text sttpText;
+
+    public Text addvcdText;
+    public Text bsnmText;
+    public Text hnnmText;
+    public Text rvnmText;
+    public Text lgtdText;
+    public Text lttdText;
+    public Text dtmnmText;
+    public Text dtmelText;
+
+    public Text atcunitText;
+    public Text localityText;
+    public Text frgrdText;
+    public Text usflText;
 
     public void Init()
     {
@@ -35,11 +65,43 @@ public class WaterTrendPanel : MonoBehaviour
         closeButton.onClick.AddListener(() => { Hide(); });
     }
 
-    
-    private void Start()
+    private void Awake()
     {
+        // Get today's date
+        DateTime today = DateTime.Today;
+
+        // Get the date 3 months ago
+        DateTime startDate = today.AddMonths(-3);
+
+        // Format the dates to string
+        startDateStr = startDate.ToString("yyyy-MM-dd");
+        endDateStr = today.ToString("yyyy-MM-dd");
+
         DatePicker_Start = this.transform.Find("linePanel/DatePicker_Start").GetComponent<DatePickerDropDownTextMeshPro>();
         DatePicker_End = this.transform.Find("linePanel/DatePicker_End").GetComponent<DatePickerDropDownTextMeshPro>();
+        DatePicker_Start.SetLabelText(startDateStr);
+        DatePicker_End.SetLabelText(endDateStr);
+
+        lineChartBtn.onClick.AddListener(() =>
+        {
+            if (lineChartBtn.GetComponent<CanvasGroup>().alpha < 1)
+            {
+                ChangePanel(0);
+                ShowTrend(currentStcd, currentName,currentType);
+            }
+        });
+        infoBtn.onClick.AddListener(() =>
+        {
+            if (infoBtn.GetComponent<CanvasGroup>().alpha < 1)
+            {
+                ChangePanel(1);
+                ShowInfo();
+            }
+        });
+    }
+
+    private void Start()
+    {
         DatePicker_Start.GetDateString += (string dateStr) =>
         {
             startDateStr = dateStr;
@@ -55,14 +117,14 @@ public class WaterTrendPanel : MonoBehaviour
     {
         if (!startDateStr.Equals("") && !endDateStr.Equals(""))
         {
-           var startD=DateTime.ParseExact(startDateStr,"yyyy-MM-dd",null);
-           var endD= DateTime.ParseExact(endDateStr,"yyyy-MM-dd",null);
-           var disD = endD - startD;
-           Debug.Log(disD.TotalDays);
-           if (disD.TotalDays > 183)
-           {
-               Debug.Log("时间间隔大于6个月");
-           }
+            var startD = DateTime.ParseExact(startDateStr, "yyyy-MM-dd", null);
+            var endD = DateTime.ParseExact(endDateStr, "yyyy-MM-dd", null);
+            var disD = endD - startD;
+            Debug.Log(disD.TotalDays);
+            if (disD.TotalDays > 183)
+            {
+                Debug.Log("时间间隔大于6个月");
+            }
         }
     }
     /// <summary>
@@ -73,12 +135,12 @@ public class WaterTrendPanel : MonoBehaviour
     /// <param name="sid"></param>
     /// <param name="startTime"></param>
     /// <param name="endTime"></param>
-    public async Task GetTrend(int type,string gid,string sid,string startTime,string endTime)
+    public async Task GetTrend(int type, string gid, string sid)
     {
-        string getJsonStr= await HttpHelper._Instance.GetDeviceTrend(type,gid,sid,startTime,endTime);
+        string getJsonStr = await HttpHelper._Instance.GetDeviceTrend(type, gid, sid, startDateStr, endDateStr);
         try
         {
-            Debug.Log("GetTrend requestData:"+getJsonStr);
+            Debug.Log("GetTrend requestData:" + getJsonStr);
             DeviceTrendRequest requestData = JsonConvert.DeserializeObject<DeviceTrendRequest>(getJsonStr);
             XAxis tempXaxis = _LineChart.GetChartComponent<XAxis>();
             tempXaxis.data.Clear();
@@ -97,7 +159,7 @@ public class WaterTrendPanel : MonoBehaviour
             }
             tempSeries[0].data.Clear();
             tempSeries[0].data.AddRange(tempDatas);
-            
+
         }
         catch (Exception e)
         {
@@ -105,17 +167,92 @@ public class WaterTrendPanel : MonoBehaviour
             throw;
         }
     }
-    
-    public async Task Show(string stcd, string name)
+
+    public void ChangePanel(int panelIndex = 0)
     {
+        if (panelIndex == 0)
+        {
+            lineChartPanel.gameObject.SetActive(true);
+            infoPanel.gameObject.SetActive(false);
+            lineChartBtn.GetComponent<CanvasGroup>().alpha = 1;
+            infoBtn.GetComponent<CanvasGroup>().alpha = 0.5f;
+        }
+        else
+        {
+            lineChartPanel.gameObject.SetActive(false);
+            infoPanel.gameObject.SetActive(true);
+            lineChartBtn.GetComponent<CanvasGroup>().alpha = 0.5f;
+            infoBtn.GetComponent<CanvasGroup>().alpha = 1;
+        }
+    }
+
+    public async Task ShowTrend(string stcd, string name,int type)
+    {
+        currentType = type;
+        if (type == 0)
+        {
+            typeTitle.text = "站点水位趋势";
+        }
+        else {
+            typeTitle.text = "站点降雨趋势";
+        }
         currentStcd = stcd;
+        currentName = name;
+        ChangePanel(0);
         name = name.Replace(" ", "");
         nameText.text = $"站点：{name}";
         this.gameObject.SetActive(true);
-        string chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(stcd);
+
+        string chartJsonStr = "";
+        if (type == 0) {
+            chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(stcd, startDateStr, endDateStr);
+        }
+        else{
+            chartJsonStr = await HttpHelper._Instance.GetDropTrend_Chart(stcd, startDateStr, endDateStr);
+        }
         SetChartLine(chartJsonStr);
-        string listJsonStr = await HttpHelper._Instance.GetWaterTrend_List(stcd);
-        StartCoroutine(CreatList(listJsonStr));
+        StartCoroutine(CreatList(chartJsonStr));
+    }
+
+    public async Task ShowInfo()
+    {
+        idText.text = "-";
+        stnmText.text = "-";
+        stcdText.text = "-";
+        stlcText.text = "-";
+        sttpText.text = "-";
+        addvcdText.text = "-";
+        bsnmText.text = "-";
+        hnnmText.text = "-";
+        rvnmText.text = "-";
+        lgtdText.text = "-";
+        lttdText.text = "-";
+        dtmnmText.text = "-";
+        dtmelText.text = "-";
+        atcunitText.text = "-";
+        localityText.text = "-";
+        frgrdText.text = "-";
+        usflText.text = "-";
+
+        string infoJsonStr = await HttpHelper._Instance.GetWaterTrend_Info(currentStcd);
+        WaterTrendData_Info waterTrendData_Info = JsonConvert.DeserializeObject<WaterTrendData_Info>(infoJsonStr);
+        idText.text = waterTrendData_Info.data[0].id;
+        stnmText.text = waterTrendData_Info.data[0].stnm;
+        stcdText.text = waterTrendData_Info.data[0].stcd;
+        stlcText.text = waterTrendData_Info.data[0].stlc;
+        sttpText.text = waterTrendData_Info.data[0].sttp;
+        addvcdText.text = waterTrendData_Info.data[0].addvcd;
+        bsnmText.text = waterTrendData_Info.data[0].bsnm;
+        hnnmText.text = waterTrendData_Info.data[0].hnnm;
+        rvnmText.text = waterTrendData_Info.data[0].rvnm;
+        lgtdText.text = waterTrendData_Info.data[0].lgtd;
+        lttdText.text = waterTrendData_Info.data[0].lttd;
+        dtmnmText.text = waterTrendData_Info.data[0].dtmnm;
+        dtmelText.text = waterTrendData_Info.data[0].dtmel;
+        atcunitText.text = waterTrendData_Info.data[0].atcunit;
+        localityText.text = waterTrendData_Info.data[0].locality;
+        frgrdText.text = waterTrendData_Info.data[0].frgrd;
+        usflText.text = waterTrendData_Info.data[0].usfl;
     }
 
     public void Hide()
@@ -125,13 +262,13 @@ public class WaterTrendPanel : MonoBehaviour
 
     public void SetChartLine(string jsonData)
     {
-        Debug.Log(jsonData);
         WaterTrendData_Chart tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_Chart>(jsonData);
+        tempData.data.Reverse();
         XAxis tempXaxis = _LineChart.GetChartComponent<XAxis>();
         tempXaxis.data.Clear();
         for (int i = 0; i < tempData.data.Count; i++)
         {
-            tempXaxis.AddData(tempData.data[i].key);
+            tempXaxis.AddData(tempData.data[i].time);
         }
 
         var tempSeries = _LineChart.series;
@@ -152,9 +289,8 @@ public class WaterTrendPanel : MonoBehaviour
 
     IEnumerator CreatList(string jsonData)
     {
-        Debug.Log(jsonData);
         var wait = new WaitForEndOfFrame();
-        WaterTrendData_List tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_List>(jsonData);
+        WaterTrendData_Chart tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_Chart>(jsonData);
 
         if (listObj.Count > 0)
         {
@@ -167,36 +303,32 @@ public class WaterTrendPanel : MonoBehaviour
 
         listObj.Clear();
         int creatCount = 0;
-        float lastWaterValue = 0;
         for (int i = 0; i < tempData.data.Count; i++)
         {
             GameObject tempObj = Instantiate(listItemOri, listRoot);
             tempObj.transform.Find("id").GetComponent<Text>().text = $"{i + 1}";
-            tempObj.transform.Find("time").GetComponent<Text>().text = $"{tempData.data[i].updateTime}";
-            tempObj.transform.Find("value").GetComponent<Text>().text = $"{tempData.data[i].dwz}";
+            tempObj.transform.Find("time").GetComponent<Text>().text = $"{tempData.data[i].time}";
+            tempObj.transform.Find("value").GetComponent<Text>().text = $"{tempData.data[i].value}";
             string dirStr = "-";
-            if (i == 0)
+            if (tempData.data[i].trend == 1)
+            {
+                dirStr = "↑";
+                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.red;
+            }
+            else if (tempData.data[i].trend == 2)
             {
                 dirStr = "→";
-                lastWaterValue = float.Parse(tempData.data[i].dwz);
+                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.blue;
+            }
+            else if (tempData.data[i].trend == 3)
+            {
+                dirStr = "↓";
+                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.green;
             }
             else
             {
-                float currentWaterValue = float.Parse(tempData.data[i].dwz);
-                if (currentWaterValue > lastWaterValue)
-                {
-                    dirStr = "↑";
-                }
-                else if (currentWaterValue < lastWaterValue)
-                {
-                    dirStr = "↓";
-                }
-                else
-                {
-                    dirStr = "→";
-                }
-
-                lastWaterValue = currentWaterValue;
+                dirStr = "-";
+                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.white;
             }
 
             tempObj.transform.Find("trend").GetComponent<Text>().text = $"{dirStr}";
@@ -214,25 +346,64 @@ public class WaterTrendPanel : MonoBehaviour
 [Serializable]
 public class WaterTrendData_Chart
 {
+    public int code;
+    public string msg;
     public List<WaterCharData> data;
 }
 
 [Serializable]
 public class WaterCharData
 {
-    public string key;
+    public string time;
+    public int trend;
     public string value;
 }
 
 [Serializable]
-public class WaterTrendData_List
+public class WaterTrendData_Info
 {
-    public List<WaterTrendData> data;
+    public int code;
+    public string msg;
+    public List<WaterInfoData> data;
 }
 
 [Serializable]
-public class WaterTrendData
+public class WaterInfoData
 {
-    public string updateTime;
-    public string dwz;
+    public string createBy { get; set; }
+    public string createTime { get; set; }
+    public string updateBy { get; set; }
+    public string updateTime { get; set; }
+    public string id { get; set; }
+    public string addvcd { get; set; }
+    public string admauth { get; set; }
+    public string atcunit { get; set; }
+    public string bgfrym { get; set; }
+    public string bsnm { get; set; }
+    public object comments { get; set; }
+    public object drna { get; set; }
+    public int dstrvm { get; set; }
+    public string dtmel { get; set; }
+    public string dtmnm { get; set; }
+    public int dtpr { get; set; }
+    public string esstym { get; set; }
+    public string frgrd { get; set; }
+    public string hnnm { get; set; }
+    public string lgtd { get; set; }
+    public string locality { get; set; }
+    public string lttd { get; set; }
+    public string phcd { get; set; }
+    public string rvnm { get; set; }
+    public object stazt { get; set; }
+    public string stbk { get; set; }
+    public string stcd { get; set; }
+    public string stlc { get; set; }
+    public string stnm { get; set; }
+    public string sttp { get; set; }
+    public string usfl { get; set; }
+    public string delFlag { get; set; }
+    public string dwz { get; set; }
+    public string upz { get; set; }
+    public string tgtq { get; set; }
+    public string measureTime { get; set; }
 }

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

@@ -312,8 +312,8 @@ public class YZTLayer : YZTRootLayer
         //    value2 = value2 / 100.0f;
         //}
 
-        int index1 = FindIndexByHotPointName("套口(上)");
-        int index2 = FindIndexByHotPointName("套口(下)");
+        int index1 = FindIndexByHotPointName("套口(闸上)");
+        int index2 = FindIndexByHotPointName("套口(闸下)");
         float value1 = GlobalData.swDatas[index1].upz ?? 0;
         float value2 = GlobalData.swDatas[index1].dwz ?? 0;
         //Debug.Log("777");
@@ -384,12 +384,6 @@ public class YZTLayer : YZTRootLayer
                 sWStationRecordData.dir = 0;
                 sWStationRecordData.name = GlobalData.swDatas[i].stnm;
                 sWStationRecordData.value = ((GlobalData.swDatas[i].upz ?? 0) > (GlobalData.swDatas[i].dwz ?? 0)) ? GlobalData.swDatas[i].upz ?? 0 : GlobalData.swDatas[i].dwz ?? 0;
-                //Debug.Log(sWStationRecordData.name);
-                //Debug.Log(sWStationRecordData.value);
-                //Debug.Log(GlobalData.swDatas[i].upz);
-                //Debug.Log(GlobalData.swDatas[i].dwz);
-                //Debug.Log(GlobalData.swDatas[i].upz ?? 0);
-                //Debug.Log(GlobalData.swDatas[i].dwz ?? 0);
                 sWStationRecordData.time = DateTime.Now.ToString("MM/dd HH:mm");
                 sWStationRecordData.stcd = GlobalData.swDatas[i].stcd;
                 rescordSWStationData.Add(sWStationRecordData);
@@ -408,7 +402,7 @@ public class YZTLayer : YZTRootLayer
                 string rescordSW_stcd = rescordSWStationData[i].stcd;
                 obj.transform.GetComponent<Button>().onClick.AddListener(() =>
                 {
-                    _waterTrendPanel.Show(rescordSW_stcd, rescordSW_name);
+                    _waterTrendPanel.ShowTrend(rescordSW_stcd, rescordSW_name,0);
                 });
                 if (rescordSWStationData[i].dir == 0)
                 {
@@ -866,15 +860,16 @@ public class YZTLayer : YZTRootLayer
 
     public static int FindIndexByHotPointName(string name)
     {
-        string newName = name.Replace("（闸下）", "(下)").Replace("（闸上）", "(上)").Replace("(闸上)", "上").Replace("(闸下)", "下");
+
+        string newName = name.Replace("（闸下）", "(闸下)").Replace("（闸上）", "(闸上)");
         newName = newName.TrimEnd();
         if (newName.Contains("补元"))
         {
-            newName = "补元(上)";
+            newName = "补元(闸上)";
         }
         else if (newName.Contains("套口"))
         {
-            newName = "套口(上)";
+            newName = "套口(闸上)";
         }
         //Debug.Log(newName);
         for (int i = 0; i < GlobalData.swDatas.Count; i++)
@@ -888,6 +883,30 @@ public class YZTLayer : YZTRootLayer
         return -1;
     }
 
+    public static int FindIndexBySWName(string name)
+    {
+        //string newName = name.Replace("（闸下）", "(下)").Replace("（闸上）", "(上)").Replace("(闸上)", "上").Replace("(闸下)", "下");
+        //newName = newName.TrimEnd();
+        //if (newName.Contains("补元"))
+        //{
+        //    newName = "补元(上)";
+        //}
+        //else if (newName.Contains("套口"))
+        //{
+        //    newName = "套口(上)";
+        //}
+        //Debug.Log(newName);
+        for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
+        {
+            //Debug.Log(GlobalData.swDatas[i].stnm);
+            if (GlobalData.sWZDatas[i].STNM.Trim() == name.Trim())
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+
 
     void OnNewPointClick(HotPointData temp, RuntimePoint newPoint)
     {
@@ -895,8 +914,13 @@ public class YZTLayer : YZTRootLayer
         if ((int)temp.type == 4)
         {
             int index = FindIndexByHotPointName(temp.name);
+            Debug.Log(GlobalData.swDatas[index].stcd);
+            _waterTrendPanel.ShowTrend(GlobalData.swDatas[index].stcd, GlobalData.swDatas[index].stnm,0);
+        }
+        else if ((int)temp.type == 2) {
+            int index = FindIndexBySWName(temp.name);
             Debug.Log(index);
-            _waterTrendPanel.Show(GlobalData.swDatas[index].stcd, GlobalData.swDatas[index].stnm);
+            _waterTrendPanel.ShowTrend(GlobalData.sWZDatas[index].STCD, GlobalData.sWZDatas[index].STNM,1);
         }
         else if ((int)temp.type >= 6 || newPoint.layerIDs.Count > 4)
         {