巡检两个问题

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -2153,7 +2153,7 @@ MonoBehaviour:
       m_Opacity: 1
       m_ItemMarker: 
       m_ItemFormatter: 
-      m_NumericFormatter: 
+      m_NumericFormatter: 0.00
       m_CornerRadius:
       - 0
       - 0
@@ -19100,7 +19100,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 7625981591886958950}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.81333333
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -4746,7 +4746,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4449008148277711001
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4956,7 +4956,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 198.5, y: -108.00903}
+  m_AnchoredPosition: {x: 200, y: -53}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390109443813693614
@@ -6355,8 +6355,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -348.5733}
-  m_SizeDelta: {x: 374, y: 457.1266}
+  m_AnchoredPosition: {x: 0, y: -321.07}
+  m_SizeDelta: {x: 374, y: 512.14}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5929286935601914745
 CanvasRenderer:
@@ -10447,7 +10447,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &252656590667301376
 RectTransform:
   m_ObjectHideFlags: 0
@@ -15646,7 +15646,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8209747834125775395
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26153,7 +26153,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4403327642199857703
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26275,7 +26275,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1673002594449356042
 RectTransform:
   m_ObjectHideFlags: 0
@@ -33008,7 +33008,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6504405168712864162
 RectTransform:
   m_ObjectHideFlags: 0
@@ -43371,7 +43371,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1765636839580353836}
   m_HandleRect: {fileID: 4013672342170617248}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -50230,7 +50230,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9052107157716564033
 RectTransform:
   m_ObjectHideFlags: 0
@@ -50389,6 +50389,7 @@ MonoBehaviour:
   nextItem: {fileID: 8634235543523159781}
   task_items: []
   currentIndex: 0
+  dateText: {fileID: 7027562595760644759}
 --- !u!1 &8800537368483757876
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -32694,7 +32694,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2060663034614906384}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.81333333
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -45323,7 +45323,7 @@ MonoBehaviour:
       m_Opacity: 1
       m_ItemMarker: 
       m_ItemFormatter: 
-      m_NumericFormatter: 
+      m_NumericFormatter: 0.00
       m_CornerRadius:
       - 0
       - 0

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

@@ -214,7 +214,7 @@ public class ZMJKLayer : MonoBehaviour
         }
 
         var tempSeries = shuiweiChart.series;
-        tempSeries[0].serieName = "水位";
+        tempSeries[0].serieName = "水位/m";
         SerieData[] tempDatas = new SerieData[shuiweiData.Length];
         for (int i = 0; i < tempDatas.Length; i++)
         {

Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -361,7 +361,7 @@ public class GCYWLayer : YZTRootLayer
 
     public void OpenTaskListPanel(int type)
     {
-        taskListPanel.SetData(this);
+        taskListPanel.SetData(this,type);
         TaskListPanelObj.SetActive(true);
     }
 

Assets/Scripts/UI/UIView/GCYW/TaskListPanel.cs

@@ -15,39 +15,36 @@ public class TaskListPanel : MonoBehaviour
 
 
     public GameObject taskItemPrefab;
-    
+
     public Transform itemContent;
-    
+
     public List<B08_TaskListItem> taskItemList = new List<B08_TaskListItem>();
 
     public GCYWLayer gcywLayer;
 
     private void Awake()
     {
-        
     }
 
-    public void SetData(GCYWLayer baseLayer)
+    public void SetData(GCYWLayer baseLayer, int type)
     {
         gcywLayer = baseLayer;
         for (int i = 0; i < taskItemList.Count; i++)
         {
             Destroy(taskItemList[i].gameObject);
         }
+
         taskItemList.Clear();
-        for (int i = 0; i < GlobalData.B08TaskListInfos.Length; i++)
+        var taskInfoList = GlobalData.B08TaskListInfos[type].data;
+        if (taskInfoList != null)
         {
-            var taskInfoList = GlobalData.B08TaskListInfos[i].data;
-            if (taskInfoList != null)
+            for (int j = 0; j < taskInfoList.Length; j++)
             {
-                for (int j = 0; j < taskInfoList.Length; j++)
-                {
-                    B08_TaskListItem tempItem = Instantiate(taskItemPrefab, itemContent).GetComponent<B08_TaskListItem>();
-                    tempItem.Init();
-                    tempItem.SetData(gcywLayer,taskInfoList[j],i);
-                    taskItemList.Add(tempItem);
-                }
+                B08_TaskListItem tempItem = Instantiate(taskItemPrefab, itemContent).GetComponent<B08_TaskListItem>();
+                tempItem.Init();
+                tempItem.SetData(gcywLayer, taskInfoList[j], type);
+                taskItemList.Add(tempItem);
             }
         }
     }
-}
+}

Assets/Scripts/UI/UIView/GCYW/TaskPhotoPanel.cs

@@ -16,6 +16,8 @@ public class TaskPhotoPanel : MonoBehaviour
     public B08_TaskItems[] task_items;
     public int currentIndex = 0;
 
+    public Text dateText;
+
     private void Awake()
     {
         lastItem.onClick.AddListener(Last);
@@ -52,8 +54,10 @@ public class TaskPhotoPanel : MonoBehaviour
         var currentData = task_items[pageIndex];
         string path ="http://58.19.230.46:9180/prod-api/uploads/"+currentData.files[0].filePath;
         TextureLoadHelp._Instance.LoadTexFromUrl(path, img);
+        Debug.Log(currentData.faItemName+" "+currentData.startTime+" "+currentData.finishedTime);
         posText.text = currentData.faItemName;
         messageText.text = currentData.faItemName;
         pageText.text = $"{pageIndex + 1}/{task_items.Length}";
+        dateText.text = currentData.startTime;
     }
 }