提交解决的冲突

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -40702,7 +40702,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 177.9, y: -11.99999}
-  m_SizeDelta: {x: 50, y: 24}
+  m_SizeDelta: {x: 63.84, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6111454611668711069
 CanvasRenderer:
@@ -40745,7 +40745,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5DE5\u7A0B\u540D\u79F0"
+  m_Text: "\u8BBE\u5907\u540D\u79F0"
 --- !u!1 &8186875839409469777
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/ZhanDian.prefab

@@ -80,6 +80,127 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
+--- !u!1 &1684113002523488084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8984180592570387658}
+  - component: {fileID: 8967287704650353085}
+  - component: {fileID: 1661803381410761961}
+  - component: {fileID: 482644116564408142}
+  m_Layer: 5
+  m_Name: Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8984180592570387658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1684113002523488084}
+  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: 8828487746713744763}
+  m_RootOrder: 2
+  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.0000076293945, y: 0}
+  m_SizeDelta: {x: 172, y: 84}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8967287704650353085
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1684113002523488084}
+  m_CullTransparentMesh: 1
+--- !u!114 &1661803381410761961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1684113002523488084}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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!114 &482644116564408142
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1684113002523488084}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.13333334}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.21960784}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.105882354}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1661803381410761961}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4089601786532735096
 GameObject:
   m_ObjectHideFlags: 0
@@ -192,6 +313,7 @@ RectTransform:
   m_Children:
   - {fileID: 7072228678429717004}
   - {fileID: 8821829153516425849}
+  - {fileID: 8984180592570387658}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@@ -140,10 +140,13 @@ public class SWYJLayer : YZTRootLayer
     public Text title;
 
     public Dropdown dropdown;
+
+    public WaterTrendPanel waterTrendPanel;
     private void Awake()
     {
         Init();
         dropdown.ClearOptions();
+        waterTrendPanel.Init();
         BuYuanDataButton = this.transform.Find("Main/BuYuanButton").GetComponent<Button>();
         BuYuanDataButton.onClick.AddListener(() =>
         {
@@ -609,9 +612,14 @@ public class SWYJLayer : YZTRootLayer
             {
                 GameObject obj = Instantiate(zdpmPrefab);
                 zdpmObjs.Add(obj);
+                string stcd = stationDatas[i].stcd;
+                string name = stationDatas[i].stnm;
+                obj.GetComponentInChildren<Button>().onClick.AddListener(() =>
+                {
+                    waterTrendPanel.ShowTrend(stcd, name,0);
+                });
                 obj.transform.SetParent(zdpmParent.transform);
                 obj.transform.localScale = Vector3.one;
-                string name = stationDatas[i].stnm;
                 obj.transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
                 float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
                 //if (i == 0)

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

@@ -66,7 +66,10 @@ public class WaterTrendPanel : MonoBehaviour
         listRoot = this.transform.Find("linePanel/ScrollView/Viewport/Content").transform;
         closeButton = this.transform.Find("CloseButton").GetComponent<Button>();
         nameText = this.transform.Find("nameText").GetComponent<Text>();
-        closeButton.onClick.AddListener(() => { Hide(); });
+        closeButton.onClick.AddListener(() => {
+            print(111);
+            Hide(); 
+        });
     }
 
     private void Awake()
@@ -213,7 +216,6 @@ public class WaterTrendPanel : MonoBehaviour
         name = name.Replace(" ", "");
         nameText.text = $"站点：{name}";
         this.gameObject.SetActive(true);
-
         string chartJsonStr = "";
         if (type == 0) {
             _LineChart.GetChartComponent<YAxis>().axisName.name = "水位(m)";
@@ -232,7 +234,6 @@ public class WaterTrendPanel : MonoBehaviour
             bythreePanel.gameObject.SetActive(false);
             taokouthreePanel.gameObject.SetActive(true);
         }
-        //Debug.Log(chartJsonStr);
         SetChartLine(chartJsonStr);
         StartCoroutine(CreatList(chartJsonStr));
     }
@@ -304,7 +305,11 @@ public class WaterTrendPanel : MonoBehaviour
             tempDatas[i] = new SerieData();
             tempDatas[i].data = new List<double>();
             tempDatas[i].data.Add(i);
-            double tempValue = double.Parse(float.Parse(tempData.data[i].value).ToString("0.00"));
+            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;
             //}